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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-11-13 18:21:43 +0000 (Sun, 13 Nov 2011)
New Revision: 3579

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/shadow-man-pages.pot
   upstream/trunk/man/po/sv.po
   upstream/trunk/man/po/zh_CN.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/shadow.pot
   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/shadow.pot, man/po/shadow-man-pages.pot: Regenerated.
	* po/*.po, man/po/*.po: Updated PO files.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/ChangeLog	2011-11-13 18:21:43 UTC (rev 3579)
@@ -1,3 +1,8 @@
+2011-11-13  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* po/shadow.pot, man/po/shadow-man-pages.pot: Regenerated.
+	* po/*.po, man/po/*.po: Updated PO files.
+
 2011-11-12  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* src/chage.c, src/chfn.c, src/chgpasswd.c, src/chpasswd.c,

Modified: upstream/trunk/man/po/de.po
===================================================================
--- upstream/trunk/man/po/de.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/man/po/de.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow-man-pages\n"
-"POT-Creation-Date: 2010-08-29 17:54+0200\n"
+"POT-Creation-Date: 2011-11-13 18:43+0100\n"
 "PO-Revision-Date: 2011-05-27 16:07+0200\n"
 "Last-Translator: Simon Brandmair <sbrandmair at gmx.net>\n"
 "Language-Team: debian-l10n-german <http://lists.debian.org/debian-l10n-"
@@ -15,77 +15,106 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: vipw.8.xml:39(refentrytitle) vipw.8.xml:44(refname) vipw.8.xml:53(command)
-#: login.defs.5.xml:477(term)
+#: vipw.8.xml:40(refentrytitle) vipw.8.xml:47(refname) vipw.8.xml:56(command)
+#: login.defs.5.xml:480(term)
 msgid "vipw"
 msgstr "vipw"
 
-#: vipw.8.xml:40(manvolnum) usermod.8.xml:42(manvolnum)
-#: userdel.8.xml:44(manvolnum) userdel.8.xml:203(replaceable)
-#: useradd.8.xml:53(manvolnum) pwconv.8.xml:44(manvolnum)
-#: pwck.8.xml:44(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:130(replaceable)
-#: groupadd.8.xml:42(manvolnum) faillog.8.xml:35(manvolnum)
-#: faillog.5.xml:86(manvolnum) chpasswd.8.xml:42(manvolnum)
-#: chgpasswd.8.xml:43(manvolnum)
+#: vipw.8.xml:41(manvolnum) usermod.8.xml:43(manvolnum)
+#: userdel.8.xml:45(manvolnum) userdel.8.xml:219(replaceable)
+#: useradd.8.xml:54(manvolnum) pwconv.8.xml:45(manvolnum)
+#: pwck.8.xml:45(manvolnum) nologin.8.xml:39(manvolnum)
+#: newusers.8.xml:52(manvolnum) logoutd.8.xml:39(manvolnum)
+#: lastlog.8.xml:40(manvolnum) grpck.8.xml:40(manvolnum)
+#: groupmod.8.xml:40(manvolnum) groupmems.8.xml:40(manvolnum)
+#: groupdel.8.xml:40(manvolnum) groupdel.8.xml:163(replaceable)
+#: groupadd.8.xml:42(manvolnum) faillog.8.xml:39(manvolnum)
+#: faillog.5.xml:92(manvolnum) chpasswd.8.xml:43(manvolnum)
+#: chgpasswd.8.xml:44(manvolnum)
 msgid "8"
 msgstr "8"
 
-#: vipw.8.xml:41(refmiscinfo) usermod.8.xml:43(refmiscinfo)
-#: userdel.8.xml:45(refmiscinfo) useradd.8.xml:54(refmiscinfo)
-#: pwconv.8.xml:45(refmiscinfo) pwck.8.xml:45(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:43(refmiscinfo) faillog.8.xml:36(refmiscinfo)
-#: chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
+#: vipw.8.xml:42(refmiscinfo) usermod.8.xml:44(refmiscinfo)
+#: userdel.8.xml:46(refmiscinfo) useradd.8.xml:55(refmiscinfo)
+#: pwconv.8.xml:46(refmiscinfo) pwck.8.xml:46(refmiscinfo)
+#: nologin.8.xml:40(refmiscinfo) newusers.8.xml:53(refmiscinfo)
+#: logoutd.8.xml:40(refmiscinfo) lastlog.8.xml:41(refmiscinfo)
+#: grpck.8.xml:41(refmiscinfo) groupmod.8.xml:41(refmiscinfo)
+#: groupmems.8.xml:41(refmiscinfo) groupdel.8.xml:41(refmiscinfo)
+#: groupadd.8.xml:43(refmiscinfo) faillog.8.xml:40(refmiscinfo)
+#: chpasswd.8.xml:44(refmiscinfo) chgpasswd.8.xml:45(refmiscinfo)
 msgid "System Management Commands"
 msgstr "Befehle zur Systemverwaltung"
 
-#: vipw.8.xml:45(refname) vipw.8.xml:59(command)
+#: vipw.8.xml:43(refmiscinfo) usermod.8.xml:45(refmiscinfo)
+#: userdel.8.xml:47(refmiscinfo) useradd.8.xml:56(refmiscinfo)
+#: suauth.5.xml:41(refmiscinfo) su.1.xml:58(refmiscinfo)
+#: sg.1.xml:42(refmiscinfo) shadow.5.xml:41(refmiscinfo)
+#: shadow.3.xml:41(refmiscinfo) pwconv.8.xml:47(refmiscinfo)
+#: pwck.8.xml:47(refmiscinfo) porttime.5.xml:41(refmiscinfo)
+#: passwd.5.xml:41(refmiscinfo) passwd.1.xml:48(refmiscinfo)
+#: nologin.8.xml:41(refmiscinfo) newusers.8.xml:54(refmiscinfo)
+#: newgrp.1.xml:42(refmiscinfo) logoutd.8.xml:41(refmiscinfo)
+#: login.defs.5.xml:104(refmiscinfo) login.access.5.xml:42(refmiscinfo)
+#: login.1.xml:74(refmiscinfo) limits.5.xml:42(refmiscinfo)
+#: lastlog.8.xml:42(refmiscinfo) gshadow.5.xml:40(refmiscinfo)
+#: grpck.8.xml:42(refmiscinfo) groups.1.xml:41(refmiscinfo)
+#: groupmod.8.xml:42(refmiscinfo) groupmems.8.xml:42(refmiscinfo)
+#: groupdel.8.xml:42(refmiscinfo) groupadd.8.xml:44(refmiscinfo)
+#: gpasswd.1.xml:46(refmiscinfo) faillog.8.xml:41(refmiscinfo)
+#: faillog.5.xml:41(refmiscinfo) expiry.1.xml:45(refmiscinfo)
+#: chsh.1.xml:44(refmiscinfo) chpasswd.8.xml:45(refmiscinfo)
+#: chgpasswd.8.xml:46(refmiscinfo) chfn.1.xml:44(refmiscinfo)
+#: chage.1.xml:42(refmiscinfo)
+#, fuzzy
+#| msgid "shadow"
+msgid "shadow-utils"
+msgstr "shadow"
+
+#: vipw.8.xml:48(refname) vipw.8.xml:62(command)
 msgid "vigr"
 msgstr "vigr"
 
-#: vipw.8.xml:46(refpurpose)
+#: vipw.8.xml:49(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:55(replaceable) vipw.8.xml:61(replaceable)
-#: usermod.8.xml:54(replaceable) userdel.8.xml:54(arg)
-#: useradd.8.xml:64(replaceable) useradd.8.xml:76(replaceable)
-#: su.1.xml:66(replaceable) passwd.1.xml:57(replaceable)
-#: newusers.8.xml:63(replaceable) lastlog.8.xml:48(replaceable)
-#: groupmod.8.xml:51(replaceable) groupadd.8.xml:54(replaceable)
-#: faillog.8.xml:47(replaceable) chsh.1.xml:53(replaceable)
-#: chpasswd.8.xml:54(replaceable) chgpasswd.8.xml:55(replaceable)
-#: chage.1.xml:50(replaceable)
+#: vipw.8.xml:58(replaceable) vipw.8.xml:64(replaceable)
+#: usermod.8.xml:57(replaceable) userdel.8.xml:57(arg)
+#: useradd.8.xml:67(replaceable) useradd.8.xml:79(replaceable)
+#: su.1.xml:69(replaceable) pwconv.8.xml:62(replaceable)
+#: pwconv.8.xml:68(replaceable) pwconv.8.xml:74(replaceable)
+#: pwconv.8.xml:80(replaceable) pwck.8.xml:58(arg)
+#: passwd.1.xml:60(replaceable) newusers.8.xml:66(replaceable)
+#: lastlog.8.xml:54(replaceable) grpck.8.xml:53(arg)
+#: groupmod.8.xml:54(replaceable) groupdel.8.xml:54(replaceable)
+#: groupadd.8.xml:56(replaceable) faillog.8.xml:53(replaceable)
+#: chsh.1.xml:56(replaceable) chpasswd.8.xml:57(replaceable)
+#: chgpasswd.8.xml:58(replaceable) chfn.1.xml:56(replaceable)
+#: chage.1.xml:53(replaceable)
 msgid "options"
 msgstr "Optionen"
 
-#: vipw.8.xml:67(title) usermod.8.xml:61(title) userdel.8.xml:62(title)
-#: useradd.8.xml:82(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:71(title) pwck.8.xml:86(title)
-#: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
-#: nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title)
-#: logoutd.8.xml:50(title) login.defs.5.xml:110(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:63(title) gpasswd.1.xml:72(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:59(title)
+#: vipw.8.xml:70(title) usermod.8.xml:64(title) userdel.8.xml:65(title)
+#: useradd.8.xml:85(title) suauth.5.xml:56(title) su.1.xml:80(title)
+#: sg.1.xml:62(title) shadow.5.xml:50(title) shadow.3.xml:99(title)
+#: shadow.3.xml:155(title) pwconv.8.xml:86(title) pwck.8.xml:73(title)
+#: porttime.5.xml:50(title) passwd.5.xml:50(title) passwd.1.xml:69(title)
+#: nologin.8.xml:56(title) newusers.8.xml:75(title) newgrp.1.xml:58(title)
+#: logoutd.8.xml:56(title) login.defs.5.xml:113(title)
+#: login.access.5.xml:51(title) login.1.xml:106(title) limits.5.xml:52(title)
+#: lastlog.8.xml:60(title) gshadow.5.xml:49(title) grpck.8.xml:64(title)
+#: groups.1.xml:59(title) groupmod.8.xml:61(title) groupmems.8.xml:63(title)
+#: groupdel.8.xml:61(title) groupadd.8.xml:65(title) gpasswd.1.xml:75(title)
+#: faillog.8.xml:59(title) faillog.5.xml:50(title) expiry.1.xml:63(title)
+#: chsh.1.xml:65(title) chpasswd.8.xml:63(title) chgpasswd.8.xml:64(title)
+#: chfn.1.xml:65(title) chage.1.xml:62(title)
 msgid "DESCRIPTION"
 msgstr "BESCHREIBUNG"
 
-#: vipw.8.xml:68(para)
+#: vipw.8.xml:71(para)
 msgid ""
 "The <command>vipw</command> and <command>vigr</command> commands edits the "
 "files <filename>/etc/passwd</filename> and <filename>/etc/group</filename>, "
@@ -109,17 +138,18 @@
 "Zuletzt wird der Standard-Editor <citerefentry><refentrytitle>vi</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> verwendet."
 
-#: vipw.8.xml:85(title) usermod.8.xml:69(title) userdel.8.xml:71(title)
-#: useradd.8.xml:100(title) su.1.xml:123(title) pwck.8.xml:170(title)
-#: passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title)
-#: lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title)
-#: groupmems.8.xml:75(title) groupadd.8.xml:72(title) gpasswd.1.xml:112(title)
-#: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:108(title)
-#: chgpasswd.8.xml:88(title) chage.1.xml:69(title)
+#: vipw.8.xml:88(title) usermod.8.xml:72(title) userdel.8.xml:74(title)
+#: useradd.8.xml:103(title) su.1.xml:126(title) pwconv.8.xml:168(title)
+#: pwck.8.xml:157(title) passwd.1.xml:155(title) newusers.8.xml:244(title)
+#: login.1.xml:191(title) lastlog.8.xml:72(title) grpck.8.xml:128(title)
+#: groupmod.8.xml:70(title) groupmems.8.xml:78(title) groupdel.8.xml:69(title)
+#: groupadd.8.xml:74(title) gpasswd.1.xml:115(title) faillog.8.xml:70(title)
+#: expiry.1.xml:72(title) chsh.1.xml:76(title) chpasswd.8.xml:111(title)
+#: chgpasswd.8.xml:91(title) chfn.1.xml:92(title) chage.1.xml:72(title)
 msgid "OPTIONS"
 msgstr "OPTIONEN"
 
-#: vipw.8.xml:86(para)
+#: vipw.8.xml:89(para)
 msgid ""
 "The options which apply to the <command>vipw</command> and <command>vigr</"
 "command> commands are:"
@@ -127,81 +157,122 @@
 "Die Optionen, die von den Befehlen <command>vipw</command> und "
 "<command>vigr</command> unterstützt werden, sind:"
 
-#: vipw.8.xml:92(term)
+#: vipw.8.xml:95(term)
 msgid "<option>-g</option>, <option>--group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: vipw.8.xml:94(para)
+#: vipw.8.xml:97(para)
 msgid "Edit group database."
 msgstr "bearbeitet die Gruppendatenbank"
 
-#: vipw.8.xml:98(term) userdel.8.xml:101(term) useradd.8.xml:250(term)
-#: passwd.1.xml:192(term) newusers.8.xml:257(term) lastlog.8.xml:82(term)
-#: groupmod.8.xml:98(term) groupmems.8.xml:117(term) groupadd.8.xml:107(term)
-#: gpasswd.1.xml:151(term) faillog.8.xml:97(term) chsh.1.xml:79(term)
-#: chpasswd.8.xml:150(term) chgpasswd.8.xml:114(term) chage.1.xml:107(term)
+#: vipw.8.xml:101(term) userdel.8.xml:104(term) useradd.8.xml:253(term)
+#: pwconv.8.xml:176(term) pwck.8.xml:167(term) passwd.1.xml:195(term)
+#: newusers.8.xml:262(term) lastlog.8.xml:88(term) grpck.8.xml:138(term)
+#: groupmod.8.xml:105(term) groupmems.8.xml:120(term) groupdel.8.xml:76(term)
+#: groupadd.8.xml:109(term) gpasswd.1.xml:154(term) faillog.8.xml:103(term)
+#: expiry.1.xml:93(term) chsh.1.xml:82(term) chpasswd.8.xml:153(term)
+#: chgpasswd.8.xml:117(term) chage.1.xml:110(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
-#: vipw.8.xml:100(para) userdel.8.xml:103(para) useradd.8.xml:252(para)
-#: passwd.1.xml:194(para) newusers.8.xml:259(para) lastlog.8.xml:86(para)
-#: groupmod.8.xml:100(para) groupmems.8.xml:119(para) groupadd.8.xml:109(para)
-#: gpasswd.1.xml:153(para) faillog.8.xml:99(para) chsh.1.xml:81(para)
-#: chpasswd.8.xml:152(para) chgpasswd.8.xml:116(para) chage.1.xml:109(para)
+#: vipw.8.xml:103(para) userdel.8.xml:106(para) useradd.8.xml:255(para)
+#: pwconv.8.xml:178(para) pwck.8.xml:169(para) passwd.1.xml:197(para)
+#: newusers.8.xml:264(para) lastlog.8.xml:92(para) grpck.8.xml:140(para)
+#: groupmod.8.xml:107(para) groupmems.8.xml:122(para) groupdel.8.xml:78(para)
+#: groupadd.8.xml:111(para) gpasswd.1.xml:156(para) faillog.8.xml:105(para)
+#: expiry.1.xml:95(para) chsh.1.xml:84(para) chpasswd.8.xml:155(para)
+#: chgpasswd.8.xml:119(para) chfn.1.xml:151(para) chage.1.xml:112(para)
 msgid "Display help message and exit."
 msgstr "zeigt die Hilfe an und beendet das Programm"
 
-#: vipw.8.xml:104(term)
+#: vipw.8.xml:107(term)
 msgid "<option>-p</option>, <option>--passwd</option>"
 msgstr "<option>-p</option>, <option>--passwd</option>"
 
-#: vipw.8.xml:106(para)
+#: vipw.8.xml:109(para)
 msgid "Edit passwd database."
 msgstr "bearbeitet die Passwd-Datenbank"
 
-#: vipw.8.xml:110(term) passwd.1.xml:259(term)
+#: vipw.8.xml:113(term) pwck.8.xml:173(term) passwd.1.xml:262(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:112(para) passwd.1.xml:263(para)
+#: vipw.8.xml:115(para) passwd.1.xml:266(para)
 msgid "Quiet mode."
 msgstr "stiller Modus"
 
-#: vipw.8.xml:116(term)
+#: vipw.8.xml:119(term) usermod.8.xml:298(term) userdel.8.xml:127(term)
+#: useradd.8.xml:438(term) pwconv.8.xml:182(term) pwck.8.xml:190(term)
+#: passwd.1.xml:282(term) newusers.8.xml:287(term) lastlog.8.xml:96(term)
+#: grpck.8.xml:154(term) groupmod.8.xml:156(term) groupmems.8.xml:143(term)
+#: groupdel.8.xml:82(term) groupadd.8.xml:184(term) faillog.8.xml:163(term)
+#: chsh.1.xml:88(term) chpasswd.8.xml:170(term) chgpasswd.8.xml:132(term)
+#: chfn.1.xml:134(term) chage.1.xml:178(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-R</option>, <option>--root</option><replaceable>CHROOT_DIR</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HOME_VERZ</"
+"replaceable>"
+
+#: vipw.8.xml:124(para) usermod.8.xml:303(para) userdel.8.xml:132(para)
+#: useradd.8.xml:443(para) pwconv.8.xml:187(para) pwck.8.xml:195(para)
+#: passwd.1.xml:287(para) newusers.8.xml:292(para) lastlog.8.xml:101(para)
+#: grpck.8.xml:159(para) groupmod.8.xml:161(para) groupmems.8.xml:148(para)
+#: groupdel.8.xml:87(para) groupadd.8.xml:189(para) gpasswd.1.xml:167(para)
+#: faillog.8.xml:168(para) chsh.1.xml:93(para) chpasswd.8.xml:175(para)
+#: chgpasswd.8.xml:137(para) chfn.1.xml:139(para) chage.1.xml:183(para)
+#, fuzzy
+#| msgid ""
+#| "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
+#| "replaceable>."
+msgid ""
+"Apply changes in the <replaceable>CHROOT_DIR</replaceable> directory and use "
+"the configuration files from the <replaceable>CHROOT_DIR</replaceable> "
+"directory."
+msgstr ""
+"Fügt den <replaceable>Benutzer</replaceable> der bezeichneten "
+"<replaceable>Gruppe</replaceable> zu."
+
+#: vipw.8.xml:132(term)
 msgid "<option>-s</option>, <option>--shadow</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: vipw.8.xml:118(para)
+#: vipw.8.xml:134(para)
 msgid "Edit shadow or gshadow database."
 msgstr "bearbeitet die Shadow- oder Gshadow-Datenbank"
 
-#: vipw.8.xml:122(term)
+#: vipw.8.xml:138(term)
 msgid "<option>-u</option>, <option>--user</option>"
 msgstr "<option>-u</option>, <option>--user</option>"
 
-#: vipw.8.xml:124(para)
+#: vipw.8.xml:140(para)
 msgid "Indicates which user's tcb shadow file to edit."
 msgstr "bestimmt, welche Tcb-Shadow-Datei des Benutzers bearbeitet werden soll"
 
-#: vipw.8.xml:131(title) usermod.8.xml:374(title) userdel.8.xml:127(title)
-#: useradd.8.xml:629(title) su.1.xml:310(title) sg.1.xml:76(title)
-#: pwconv.8.xml:164(title) pwck.8.xml:230(title) passwd.1.xml:356(title)
-#: newusers.8.xml:324(title) newgrp.1.xml:87(title) login.1.xml:272(title)
-#: grpck.8.xml:173(title) groupmod.8.xml:152(title) groupmems.8.xml:162(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:185(title) gpasswd.1.xml:226(title)
-#: chsh.1.xml:120(title) chpasswd.8.xml:207(title) chgpasswd.8.xml:169(title)
-#: chfn.1.xml:99(title) chage.1.xml:210(title)
+#: vipw.8.xml:147(title) usermod.8.xml:404(title) userdel.8.xml:143(title)
+#: useradd.8.xml:645(title) su.1.xml:320(title) sg.1.xml:79(title)
+#: pwconv.8.xml:209(title) pwck.8.xml:234(title) passwd.1.xml:372(title)
+#: newusers.8.xml:342(title) newgrp.1.xml:90(title) login.1.xml:275(title)
+#: grpck.8.xml:191(title) groupmod.8.xml:172(title) groupmems.8.xml:178(title)
+#: groupdel.8.xml:110(title) groupadd.8.xml:200(title)
+#: gpasswd.1.xml:244(title) chsh.1.xml:136(title) chpasswd.8.xml:223(title)
+#: chgpasswd.8.xml:185(title) chfn.1.xml:175(title) chage.1.xml:226(title)
 msgid "CONFIGURATION"
 msgstr "KONFIGURATION"
 
-#: vipw.8.xml:132(para) usermod.8.xml:375(para) userdel.8.xml:128(para)
-#: useradd.8.xml:630(para) su.1.xml:311(para) sg.1.xml:77(para)
-#: pwck.8.xml:231(para) passwd.1.xml:357(para) newusers.8.xml:325(para)
-#: newgrp.1.xml:88(para) login.1.xml:273(para) grpck.8.xml:174(para)
-#: groupmod.8.xml:153(para) groupmems.8.xml:163(para) groupdel.8.xml:78(para)
-#: groupadd.8.xml:186(para) gpasswd.1.xml:227(para) chsh.1.xml:121(para)
-#: chpasswd.8.xml:208(para) chgpasswd.8.xml:170(para) chfn.1.xml:100(para)
-#: chage.1.xml:211(para)
+#: vipw.8.xml:148(para) usermod.8.xml:405(para) userdel.8.xml:144(para)
+#: useradd.8.xml:646(para) su.1.xml:321(para) sg.1.xml:80(para)
+#: pwck.8.xml:235(para) passwd.1.xml:373(para) newusers.8.xml:343(para)
+#: newgrp.1.xml:91(para) login.1.xml:276(para) grpck.8.xml:192(para)
+#: groupmod.8.xml:173(para) groupmems.8.xml:179(para) groupdel.8.xml:111(para)
+#: groupadd.8.xml:201(para) gpasswd.1.xml:245(para) chsh.1.xml:137(para)
+#: chpasswd.8.xml:224(para) chgpasswd.8.xml:186(para) chfn.1.xml:176(para)
+#: chage.1.xml:227(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of this tool:"
@@ -227,145 +298,147 @@
 "<citerefentry><refentrytitle>tcb</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>-Passwort-Shadowing-Schema verwendet."
 
-#: vipw.8.xml:143(title)
+#: vipw.8.xml:159(title)
 msgid "ENVIRONMENT"
 msgstr "UMGEBUNG"
 
-#: vipw.8.xml:146(option)
+#: vipw.8.xml:162(option)
 msgid "VISUAL"
 msgstr "VISUAL"
 
-#: vipw.8.xml:148(para)
+#: vipw.8.xml:164(para)
 msgid "Editor to be used."
 msgstr "der verwendete Editor"
 
-#: vipw.8.xml:152(option)
+#: vipw.8.xml:168(option)
 msgid "EDITOR"
 msgstr "EDITOR"
 
-#: vipw.8.xml:154(para)
+#: vipw.8.xml:170(para)
 msgid "Editor to be used if <option>VISUAL</option> is not set."
 msgstr "der verwendete Editor, wenn <option>VISUAL</option> nicht gesetzt ist"
 
-#: vipw.8.xml:161(title) usermod.8.xml:389(title) userdel.8.xml:144(title)
-#: useradd.8.xml:655(title) suauth.5.xml:168(title) su.1.xml:338(title)
-#: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
-#: pwconv.8.xml:187(title) pwck.8.xml:247(title) porttime.5.xml:105(title)
-#: passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(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:170(title) lastlog.8.xml:147(title)
-#: gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title)
-#: groupmod.8.xml:164(title) groupmems.8.xml:174(title)
-#: groupdel.8.xml:89(title) groupadd.8.xml:199(title) gpasswd.1.xml:241(title)
-#: faillog.8.xml:210(title) faillog.5.xml:71(title) expiry.1.xml:68(title)
-#: chsh.1.xml:133(title) chpasswd.8.xml:223(title) chgpasswd.8.xml:184(title)
-#: chfn.1.xml:113(title) chage.1.xml:222(title)
+#: vipw.8.xml:177(title) usermod.8.xml:419(title) userdel.8.xml:160(title)
+#: useradd.8.xml:671(title) suauth.5.xml:174(title) su.1.xml:348(title)
+#: sg.1.xml:91(title) shadow.5.xml:236(title) shadow.3.xml:207(title)
+#: pwconv.8.xml:232(title) pwck.8.xml:251(title) porttime.5.xml:111(title)
+#: passwd.5.xml:122(title) passwd.1.xml:390(title) newusers.8.xml:375(title)
+#: newgrp.1.xml:102(title) logoutd.8.xml:70(title)
+#: login.access.5.xml:102(title) login.1.xml:319(title)
+#: limits.5.xml:176(title) lastlog.8.xml:166(title) gshadow.5.xml:147(title)
+#: grpck.8.xml:203(title) groups.1.xml:81(title) groupmod.8.xml:184(title)
+#: groupmems.8.xml:190(title) groupdel.8.xml:122(title)
+#: groupadd.8.xml:214(title) gpasswd.1.xml:259(title) faillog.8.xml:229(title)
+#: faillog.5.xml:77(title) expiry.1.xml:102(title) chsh.1.xml:149(title)
+#: chpasswd.8.xml:239(title) chgpasswd.8.xml:200(title) chfn.1.xml:189(title)
+#: chage.1.xml:238(title)
 msgid "FILES"
 msgstr "DATEIEN"
 
-#: vipw.8.xml:164(filename) usermod.8.xml:392(filename)
-#: userdel.8.xml:147(filename) useradd.8.xml:670(filename)
-#: sg.1.xml:103(filename) pwck.8.xml:250(filename)
-#: newusers.8.xml:372(filename) newgrp.1.xml:114(filename)
-#: gshadow.5.xml:144(filename) grpck.8.xml:188(filename)
-#: groups.1.xml:78(filename) groupmod.8.xml:167(filename)
-#: groupmems.8.xml:177(filename) groupdel.8.xml:92(filename)
-#: groupadd.8.xml:202(filename) gpasswd.1.xml:50(filename)
-#: gpasswd.1.xml:53(filename) gpasswd.1.xml:244(filename)
-#: chgpasswd.8.xml:187(filename)
+#: vipw.8.xml:180(filename) usermod.8.xml:422(filename)
+#: userdel.8.xml:163(filename) useradd.8.xml:686(filename)
+#: sg.1.xml:106(filename) pwck.8.xml:254(filename)
+#: newusers.8.xml:390(filename) newgrp.1.xml:117(filename)
+#: gshadow.5.xml:150(filename) grpck.8.xml:206(filename)
+#: groups.1.xml:84(filename) groupmod.8.xml:187(filename)
+#: groupmems.8.xml:193(filename) groupdel.8.xml:125(filename)
+#: groupadd.8.xml:217(filename) gpasswd.1.xml:53(filename)
+#: gpasswd.1.xml:56(filename) gpasswd.1.xml:262(filename)
+#: chgpasswd.8.xml:203(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
-#: vipw.8.xml:166(para) usermod.8.xml:394(para) userdel.8.xml:149(para)
-#: useradd.8.xml:672(para) sg.1.xml:105(para) pwck.8.xml:252(para)
-#: newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para)
-#: grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
-#: groupmems.8.xml:179(para) groupdel.8.xml:94(para) groupadd.8.xml:204(para)
-#: gpasswd.1.xml:246(para) chgpasswd.8.xml:189(para)
+#: vipw.8.xml:182(para) usermod.8.xml:424(para) userdel.8.xml:165(para)
+#: useradd.8.xml:688(para) sg.1.xml:108(para) pwck.8.xml:256(para)
+#: newusers.8.xml:392(para) newgrp.1.xml:119(para) gshadow.5.xml:152(para)
+#: grpck.8.xml:208(para) groups.1.xml:86(para) groupmod.8.xml:189(para)
+#: groupmems.8.xml:195(para) groupdel.8.xml:127(para) groupadd.8.xml:219(para)
+#: gpasswd.1.xml:264(para) chgpasswd.8.xml:205(para)
 msgid "Group account information."
 msgstr "Informationen zu den Gruppenkonten"
 
-#: vipw.8.xml:170(filename) usermod.8.xml:398(filename)
-#: useradd.8.xml:676(filename) sg.1.xml:109(filename)
-#: newusers.8.xml:378(filename) newgrp.1.xml:120(filename)
-#: gshadow.5.xml:150(filename) grpck.8.xml:194(filename)
-#: groupmod.8.xml:173(filename) groupmems.8.xml:183(filename)
-#: groupdel.8.xml:98(filename) groupadd.8.xml:208(filename)
-#: gpasswd.1.xml:54(filename) gpasswd.1.xml:250(filename)
-#: chgpasswd.8.xml:193(filename)
+#: vipw.8.xml:186(filename) usermod.8.xml:428(filename)
+#: useradd.8.xml:692(filename) sg.1.xml:112(filename)
+#: newusers.8.xml:396(filename) newgrp.1.xml:123(filename)
+#: gshadow.5.xml:156(filename) grpck.8.xml:212(filename)
+#: groupmod.8.xml:193(filename) groupmems.8.xml:199(filename)
+#: groupdel.8.xml:131(filename) groupadd.8.xml:223(filename)
+#: gpasswd.1.xml:57(filename) gpasswd.1.xml:268(filename)
+#: chgpasswd.8.xml:209(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
 # type: Plain text
-#: vipw.8.xml:172(para) usermod.8.xml:400(para) useradd.8.xml:678(para)
-#: sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para)
-#: gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para)
-#: groupdel.8.xml:100(para) groupadd.8.xml:210(para) gpasswd.1.xml:252(para)
-#: chgpasswd.8.xml:195(para)
+#: vipw.8.xml:188(para) usermod.8.xml:430(para) useradd.8.xml:694(para)
+#: sg.1.xml:114(para) newusers.8.xml:398(para) newgrp.1.xml:125(para)
+#: gshadow.5.xml:158(para) grpck.8.xml:214(para) groupmod.8.xml:195(para)
+#: groupdel.8.xml:133(para) groupadd.8.xml:225(para) gpasswd.1.xml:270(para)
+#: chgpasswd.8.xml:211(para)
 msgid "Secure group account information."
 msgstr "sichere Informationen zu den Gruppenkonten"
 
-#: vipw.8.xml:176(filename) usermod.8.xml:404(filename)
-#: userdel.8.xml:159(filename) useradd.8.xml:658(filename)
-#: su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
-#: pwck.8.xml:256(filename) passwd.5.xml:119(filename)
-#: passwd.1.xml:377(filename) newusers.8.xml:360(filename)
-#: newgrp.1.xml:102(filename) login.1.xml:331(filename)
-#: grpck.8.xml:200(filename) expiry.1.xml:71(filename)
-#: chsh.1.xml:136(filename) chpasswd.8.xml:226(filename)
-#: chfn.1.xml:122(filename) chage.1.xml:226(filename)
+#: vipw.8.xml:192(filename) usermod.8.xml:434(filename)
+#: userdel.8.xml:175(filename) useradd.8.xml:674(filename)
+#: su.1.xml:351(filename) sg.1.xml:94(filename) shadow.5.xml:239(filename)
+#: pwck.8.xml:260(filename) passwd.5.xml:125(filename)
+#: passwd.1.xml:393(filename) newusers.8.xml:378(filename)
+#: newgrp.1.xml:105(filename) login.1.xml:334(filename)
+#: grpck.8.xml:218(filename) groupmod.8.xml:199(filename)
+#: expiry.1.xml:105(filename) chsh.1.xml:152(filename)
+#: chpasswd.8.xml:242(filename) chfn.1.xml:198(filename)
+#: chage.1.xml:242(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
-#: vipw.8.xml:178(para) usermod.8.xml:406(para) userdel.8.xml:161(para)
-#: useradd.8.xml:660(para) su.1.xml:343(para) sg.1.xml:93(para)
-#: shadow.5.xml:235(para) pwck.8.xml:258(para) passwd.5.xml:121(para)
-#: passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
-#: login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para)
-#: chsh.1.xml:138(para) chpasswd.8.xml:228(para) chfn.1.xml:124(para)
-#: chage.1.xml:229(para)
+#: vipw.8.xml:194(para) usermod.8.xml:436(para) userdel.8.xml:177(para)
+#: useradd.8.xml:676(para) su.1.xml:353(para) sg.1.xml:96(para)
+#: shadow.5.xml:241(para) pwck.8.xml:262(para) passwd.5.xml:127(para)
+#: passwd.1.xml:395(para) newusers.8.xml:380(para) newgrp.1.xml:107(para)
+#: login.1.xml:336(para) grpck.8.xml:220(para) groupmod.8.xml:201(para)
+#: expiry.1.xml:107(para) chsh.1.xml:154(para) chpasswd.8.xml:244(para)
+#: chfn.1.xml:200(para) chage.1.xml:245(para)
 msgid "User account information."
 msgstr "Informationen zu den Benutzerkonten"
 
-#: vipw.8.xml:182(filename) usermod.8.xml:410(filename)
-#: userdel.8.xml:165(filename) useradd.8.xml:664(filename)
-#: su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
-#: shadow.3.xml:204(filename) pwck.8.xml:262(filename)
-#: passwd.5.xml:125(filename) passwd.1.xml:383(filename)
-#: newusers.8.xml:366(filename) newgrp.1.xml:108(filename)
-#: login.1.xml:337(filename) expiry.1.xml:77(filename)
-#: chpasswd.8.xml:232(filename) chage.1.xml:234(filename)
+#: vipw.8.xml:198(filename) usermod.8.xml:440(filename)
+#: userdel.8.xml:181(filename) useradd.8.xml:680(filename)
+#: su.1.xml:357(filename) sg.1.xml:100(filename) shadow.5.xml:245(filename)
+#: shadow.3.xml:210(filename) pwck.8.xml:266(filename)
+#: passwd.5.xml:131(filename) passwd.1.xml:399(filename)
+#: newusers.8.xml:384(filename) newgrp.1.xml:111(filename)
+#: login.1.xml:340(filename) expiry.1.xml:111(filename)
+#: chpasswd.8.xml:248(filename) chage.1.xml:250(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
 # type: Plain text
-#: vipw.8.xml:184(para) usermod.8.xml:412(para) userdel.8.xml:167(para)
-#: useradd.8.xml:666(para) su.1.xml:349(para) sg.1.xml:99(para)
-#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:264(para)
-#: passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
-#: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:234(para)
-#: chage.1.xml:237(para)
+#: vipw.8.xml:200(para) usermod.8.xml:442(para) userdel.8.xml:183(para)
+#: useradd.8.xml:682(para) su.1.xml:359(para) sg.1.xml:102(para)
+#: shadow.5.xml:247(para) shadow.3.xml:212(para) pwck.8.xml:268(para)
+#: passwd.1.xml:401(para) newusers.8.xml:386(para) newgrp.1.xml:113(para)
+#: login.1.xml:342(para) expiry.1.xml:113(para) chpasswd.8.xml:250(para)
+#: chage.1.xml:253(para)
 msgid "Secure user account information."
 msgstr "verschlüsselte Informationen zu den Benutzerkonten"
 
-#: vipw.8.xml:191(title) usermod.8.xml:419(title) userdel.8.xml:252(title)
-#: useradd.8.xml:772(title) suauth.5.xml:197(title) su.1.xml:409(title)
-#: sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title)
-#: pwconv.8.xml:199(title) pwck.8.xml:322(title) porttime.5.xml:117(title)
-#: passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title)
-#: newusers.8.xml:399(title) newgrp.1.xml:129(title)
-#: login.defs.5.xml:504(title) login.access.5.xml:108(title)
-#: login.1.xml:376(title) limits.5.xml:180(title) gshadow.5.xml:159(title)
-#: grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
-#: groupmems.8.xml:192(title) groupdel.8.xml:146(title)
-#: groupadd.8.xml:290(title) gpasswd.1.xml:259(title) faillog.8.xml:222(title)
-#: faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
-#: chpasswd.8.xml:253(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title)
-#: chage.1.xml:277(title)
+#: vipw.8.xml:207(title) usermod.8.xml:449(title) userdel.8.xml:268(title)
+#: useradd.8.xml:788(title) suauth.5.xml:203(title) su.1.xml:419(title)
+#: sg.1.xml:121(title) shadow.5.xml:264(title) shadow.3.xml:219(title)
+#: pwconv.8.xml:244(title) pwck.8.xml:326(title) porttime.5.xml:123(title)
+#: passwd.5.xml:150(title) passwd.1.xml:471(title) nologin.8.xml:70(title)
+#: newusers.8.xml:417(title) newgrp.1.xml:132(title)
+#: login.defs.5.xml:507(title) login.access.5.xml:114(title)
+#: login.1.xml:379(title) limits.5.xml:186(title) gshadow.5.xml:165(title)
+#: grpck.8.xml:272(title) groups.1.xml:93(title) groupmod.8.xml:259(title)
+#: groupmems.8.xml:208(title) groupdel.8.xml:179(title)
+#: groupadd.8.xml:305(title) gpasswd.1.xml:277(title) faillog.8.xml:241(title)
+#: faillog.5.xml:89(title) expiry.1.xml:120(title) chsh.1.xml:173(title)
+#: chpasswd.8.xml:269(title) chgpasswd.8.xml:224(title) chfn.1.xml:207(title)
+#: chage.1.xml:293(title)
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
-#: vipw.8.xml:192(para)
+#: vipw.8.xml:208(para)
 msgid ""
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -391,22 +464,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: usermod.8.xml:41(refentrytitle) usermod.8.xml:46(refname)
-#: usermod.8.xml:52(command) login.defs.5.xml:468(term)
+#: usermod.8.xml:42(refentrytitle) usermod.8.xml:49(refname)
+#: usermod.8.xml:55(command) login.defs.5.xml:471(term)
 msgid "usermod"
 msgstr "usermod"
 
-#: usermod.8.xml:47(refpurpose)
+#: usermod.8.xml:50(refpurpose)
 msgid "modify a user account"
 msgstr "verändert ein Benutzerkonto"
 
-#: usermod.8.xml:56(replaceable) userdel.8.xml:56(replaceable)
-#: useradd.8.xml:66(replaceable) passwd.1.xml:60(replaceable)
-#: chsh.1.xml:56(replaceable) chage.1.xml:53(replaceable)
+#: usermod.8.xml:59(replaceable) userdel.8.xml:59(replaceable)
+#: useradd.8.xml:69(replaceable) passwd.1.xml:63(replaceable)
+#: chsh.1.xml:59(replaceable) chfn.1.xml:59(replaceable)
+#: chage.1.xml:56(replaceable)
 msgid "LOGIN"
 msgstr "ANMELDENAME"
 
-#: usermod.8.xml:62(para)
+#: usermod.8.xml:65(para)
 msgid ""
 "The <command>usermod</command> command modifies the system account files to "
 "reflect the changes that are specified on the command line."
@@ -415,17 +489,17 @@
 "Systems, so dass sie die Änderungen enthalten, die in der Befehlszeile "
 "eingegeben wurden."
 
-#: usermod.8.xml:70(para)
+#: usermod.8.xml:73(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:76(term)
+#: usermod.8.xml:79(term)
 msgid "<option>-a</option>, <option>--append</option>"
 msgstr "<option>-a</option>, <option>--append</option>"
 
-#: usermod.8.xml:80(para)
+#: usermod.8.xml:83(para)
 msgid ""
 "Add the user to the supplementary group(s). Use only with the <option>-G</"
 "option> option."
@@ -433,7 +507,7 @@
 "Fügt den Benutzer weiteren Gruppen hinzu. Kann nur zusammen mit der Option "
 "<option>-G</option> verwendet werden."
 
-#: usermod.8.xml:87(term) useradd.8.xml:128(term)
+#: usermod.8.xml:90(term) useradd.8.xml:131(term)
 msgid ""
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
@@ -441,7 +515,7 @@
 "<option>-c</option>, <option>--comment</option><replaceable>KOMMENTAR</"
 "replaceable>"
 
-#: usermod.8.xml:92(para)
+#: usermod.8.xml:95(para)
 msgid ""
 "The new value of the user's password file comment field. It is normally "
 "modified using the <citerefentry><refentrytitle>chfn</"
@@ -451,7 +525,7 @@
 "normalerweise mit dem Werkzeug <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> verändert."
 
-#: usermod.8.xml:101(term) useradd.8.xml:141(term)
+#: usermod.8.xml:104(term) useradd.8.xml:144(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -459,11 +533,11 @@
 "<option>-d</option>, <option>--home</option><replaceable>HOME_VERZ</"
 "replaceable>"
 
-#: usermod.8.xml:106(para)
+#: usermod.8.xml:109(para)
 msgid "The user's new login directory."
 msgstr "das neue Home-Verzeichnis des Benutzers"
 
-#: usermod.8.xml:109(para)
+#: usermod.8.xml:112(para)
 msgid ""
 "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 "
@@ -473,7 +547,7 @@
 "aktuellen Home-Verzeichnisses in das neue Home-Verzeichnis verschoben. Falls "
 "dieses nicht existiert, wird es angelegt."
 
-#: usermod.8.xml:118(term) useradd.8.xml:168(term) useradd.8.xml:526(term)
+#: usermod.8.xml:121(term) useradd.8.xml:171(term) useradd.8.xml:542(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -481,7 +555,7 @@
 "<option>-e</option>, <option>--expiredate</"
 "option><replaceable>VERFALLS_DATUM</replaceable>"
 
-#: usermod.8.xml:123(para) useradd.8.xml:173(para)
+#: usermod.8.xml:126(para) useradd.8.xml:176(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>."
@@ -489,15 +563,34 @@
 "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:130(term) useradd.8.xml:186(term) useradd.8.xml:539(term)
+#: usermod.8.xml:130(para)
 msgid ""
+"An empty <replaceable>EXPIRE_DATE</replaceable> argument will disable the "
+"expiration of the account."
+msgstr ""
+
+#: usermod.8.xml:134(para) usermod.8.xml:156(para)
+#, fuzzy
+#| 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."
+msgid ""
+"This option requires a <filename>/etc/shadow</filename> file. A <filename>/"
+"etc/shadow</filename> entry will be created if there were none."
+msgstr ""
+"Wenn die Datei <filename>/etc/gshadow</filename> vorhanden ist, die Gruppe "
+"darin aber keinen Eintrag hat, wird ein solcher erstellt."
+
+#: usermod.8.xml:142(term) useradd.8.xml:189(term) useradd.8.xml:555(term)
+msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 msgstr ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INAKTIV</"
 "replaceable>"
 
-#: usermod.8.xml:135(para)
+#: usermod.8.xml:147(para)
 msgid ""
 "The number of days after a password expires until the account is permanently "
 "disabled."
@@ -505,7 +598,7 @@
 "Die Anzahl von Tagen, nach denen ein Passwort abgelaufen ist, bis das Konto "
 "deaktiviert wird."
 
-#: usermod.8.xml:139(para)
+#: usermod.8.xml:151(para)
 msgid ""
 "A value of 0 disables the account as soon as the password has expired, and a "
 "value of -1 disables the feature."
@@ -513,13 +606,13 @@
 "Ein Wert von 0 deaktiviert das Konto, sobald das Passwort abläuft. Ein Wert "
 "von -1 schaltet diese Funktion ab."
 
-#: usermod.8.xml:147(term) useradd.8.xml:206(term) useradd.8.xml:555(term)
+#: usermod.8.xml:164(term) useradd.8.xml:209(term) useradd.8.xml:571(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GRUPPE</replaceable>"
 
-#: usermod.8.xml:152(para)
+#: usermod.8.xml:169(para)
 msgid ""
 "The group name or number of the user's new initial login group. The group "
 "must exist."
@@ -527,7 +620,7 @@
 "Der Name oder die Zahl der anfänglichen Anmeldegruppe eines neuen Benutzers. "
 "Der Gruppenname muss existieren."
 
-#: usermod.8.xml:156(para)
+#: usermod.8.xml:173(para)
 msgid ""
 "Any file from the user's home directory owned by the previous primary group "
 "of the user will be owned by this new group."
@@ -535,7 +628,7 @@
 "Jede Datei im Home-Verzeichnis des Benutzers, die der alten Hauptgruppe des "
 "Benutzers gehörte, wird dieser neuen Gruppe gehören."
 
-#: usermod.8.xml:160(para)
+#: usermod.8.xml:177(para)
 msgid ""
 "The group ownership of files outside of the user's home directory must be "
 "fixed manually."
@@ -543,7 +636,7 @@
 "Die Gruppenzugehörigkeit von Dateien außerhalb des Home-Verzeichnisses des "
 "Benutzers muss per Hand angepasst werden."
 
-#: usermod.8.xml:167(term) useradd.8.xml:234(term)
+#: usermod.8.xml:184(term) useradd.8.xml:237(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -553,7 +646,7 @@
 "replaceable>[<emphasis remap=\"I\">,GRUPPE_2, ...</emphasis>[<emphasis remap="
 "\"I\">,GRUPPE_N</emphasis>]]]"
 
-#: usermod.8.xml:172(para)
+#: usermod.8.xml:189(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. "
@@ -565,7 +658,7 @@
 "Gruppen unterliegen denselben Beschränkungen wie die Gruppe, die mit der "
 "Option <option>-g</option> bestimmt wurde."
 
-#: usermod.8.xml:179(para)
+#: usermod.8.xml:196(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 "
@@ -577,7 +670,7 @@
 "Option <option>-a</option> abgeschaltet werden. Damit wird der Benutzer nur "
 "den angegebenen Gruppen hinzugefügt, ohne aus den übrigen gelöscht zu werden."
 
-#: usermod.8.xml:188(term)
+#: usermod.8.xml:205(term)
 msgid ""
 "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
 "replaceable>"
@@ -585,12 +678,18 @@
 "<option>-l</option>, <option>--login</option><replaceable>NEUER_ANMELDENAME</"
 "replaceable>"
 
-#: usermod.8.xml:193(para)
+#: usermod.8.xml:210(para)
+#, fuzzy
+#| msgid ""
+#| "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."
 msgid ""
 "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."
+"particular, the user's home directory or mail spool should probably be "
+"renamed manually to reflect the new login name."
 msgstr ""
 "Der Benutzername wird von <replaceable>LOGIN</replaceable> zu "
 "<replaceable>NEUER_ANMELDENAME</replaceable> verändert. Andere Veränderungen "
@@ -598,11 +697,11 @@
 "Verzeichnisses des Benutzers per Hand geändert werden, um dem neuen "
 "Anmeldenamen Rechnung zu tragen."
 
-#: usermod.8.xml:203(term)
+#: usermod.8.xml:220(term)
 msgid "<option>-L</option>, <option>--lock</option>"
 msgstr "<option>-L</option>, <option>--lock</option>"
 
-#: usermod.8.xml:207(para)
+#: usermod.8.xml:224(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>-"
@@ -613,7 +712,7 @@
 "abgeschaltet wird. Sie können diese Option nicht mit <option>-p</option> "
 "oder <option>-U</option> verwenden."
 
-#: usermod.8.xml:213(para)
+#: usermod.8.xml:230(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 "
@@ -623,17 +722,17 @@
 "einem Passwort), müssen Sie auch das <replaceable>VERFALLSDATUM</"
 "replaceable> auf <replaceable>1</replaceable> setzen."
 
-#: usermod.8.xml:222(term)
+#: usermod.8.xml:239(term)
 msgid "<option>-m</option>, <option>--move-home</option>"
 msgstr "<option>-m</option>, <option>--move-home</option>"
 
-#: usermod.8.xml:226(para)
+#: usermod.8.xml:243(para)
 msgid "Move the content of the user's home directory to the new location."
 msgstr ""
 "verschiebt den Inhalt des Home-Verzeichnisses eines Benutzers zu dem neuen "
 "Ziel"
 
-#: usermod.8.xml:230(para)
+#: usermod.8.xml:247(para)
 msgid ""
 "This option is only valid in combination with the <option>-d</option> (or "
 "<option>--home</option>) option."
@@ -641,7 +740,7 @@
 "Diese Option ist nur in Verbindung mit der Option <option>-d</option> (oder "
 "<option>--home</option>) zulässig."
 
-#: usermod.8.xml:234(para)
+#: usermod.8.xml:251(para)
 msgid ""
 "<command>usermod</command> will try to adapt the ownership of the files and "
 "to copy the modes, ACL and extended attributes, but manual changes might be "
@@ -651,13 +750,13 @@
 "und die Rechte, ACL und erweiterten Attribute zu übernehmen, aber "
 "Anpassungen per Hand können dennoch notwendig sein."
 
-#: usermod.8.xml:242(term) useradd.8.xml:374(term) groupmod.8.xml:116(term)
-#: groupadd.8.xml:134(term)
+#: usermod.8.xml:259(term) useradd.8.xml:377(term) groupmod.8.xml:123(term)
+#: groupadd.8.xml:136(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:246(para)
+#: usermod.8.xml:263(para)
 msgid ""
 "When used with the <option>-u</option> option, this option allows to change "
 "the user ID to a non-unique value."
@@ -666,8 +765,8 @@
 "Option der Wert der Benutzer-ID auf einen nicht eindeutigen Wert gesetzt "
 "werden."
 
-#: usermod.8.xml:253(term) useradd.8.xml:386(term) groupmod.8.xml:127(term)
-#: groupadd.8.xml:144(term)
+#: usermod.8.xml:270(term) useradd.8.xml:389(term) groupmod.8.xml:134(term)
+#: groupadd.8.xml:146(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -675,7 +774,7 @@
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORT</"
 "replaceable>"
 
-#: usermod.8.xml:258(para) groupmod.8.xml:132(para)
+#: usermod.8.xml:275(para) groupmod.8.xml:139(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
@@ -683,8 +782,8 @@
 "das verschlüsselte Passwort, wie es von <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> zurückgegeben wird"
 
-#: usermod.8.xml:263(para) useradd.8.xml:396(para) groupmod.8.xml:137(para)
-#: groupadd.8.xml:154(para)
+#: usermod.8.xml:280(para) useradd.8.xml:399(para) groupmod.8.xml:144(para)
+#: groupadd.8.xml:156(para)
 msgid ""
 "<emphasis role=\"bold\">Note:</emphasis> This option is not recommended "
 "because the password (or encrypted password) will be visible by users "
@@ -694,7 +793,7 @@
 "empfehlenswert, weil das Passwort (auch wenn es verschlüsselt ist) für "
 "Benutzer sichtbar ist, die sich den Prozess anzeigen lassen."
 
-#: usermod.8.xml:268(para)
+#: usermod.8.xml:285(para)
 msgid ""
 "The password will be written in the local <filename>/etc/passwd</filename> "
 "or <filename>/etc/shadow</filename> file. This might differ from the "
@@ -704,22 +803,22 @@
 "<filename>/etc/shadow</filename> geschrieben. Dies könnte von der Passwort-"
 "Datenbank abweichen, die Sie für PAM konfiguriert haben."
 
-#: usermod.8.xml:274(para) useradd.8.xml:401(para) groupmod.8.xml:142(para)
-#: groupadd.8.xml:159(para)
+#: usermod.8.xml:291(para) useradd.8.xml:404(para) groupmod.8.xml:149(para)
+#: groupadd.8.xml:161(para)
 msgid ""
 "You should make sure the password respects the system's password policy."
 msgstr ""
 "Sie sollten sicherstellen, dass das Passwort den Passwortrichtlinien des "
 "Systems entspricht."
 
-#: usermod.8.xml:281(term) useradd.8.xml:435(term) useradd.8.xml:576(term)
-#: su.1.xml:157(term) chsh.1.xml:85(term)
+#: usermod.8.xml:311(term) useradd.8.xml:451(term) useradd.8.xml:592(term)
+#: su.1.xml:167(term) chsh.1.xml:101(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 
-#: usermod.8.xml:286(para) chsh.1.xml:89(para)
+#: usermod.8.xml:316(para) chsh.1.xml:105(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."
@@ -727,17 +826,17 @@
 "Der Name der neuen Anmelde-Shell des Benutzers. Falls dieses Feld leer "
 "gelassen wird, verwendet das System die Standard-Anmelde-Shell."
 
-#: usermod.8.xml:293(term) useradd.8.xml:450(term)
+#: usermod.8.xml:323(term) useradd.8.xml:466(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: usermod.8.xml:298(para)
+#: usermod.8.xml:328(para)
 msgid "The new numerical value of the user's ID."
 msgstr "der neue numerische Wert der UID des Benutzers"
 
-#: usermod.8.xml:301(para)
+#: usermod.8.xml:331(para)
 msgid ""
 "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 "
@@ -747,7 +846,7 @@
 "verwendet wird. Der Wert darf nicht negativ sein. Typischerweise sind Werte "
 "zwischen 0 und 999 für Systemkonten reserviert."
 
-#: usermod.8.xml:307(para)
+#: usermod.8.xml:337(para)
 msgid ""
 "The user's mailbox, and any files which the user owns and which are located "
 "in the user's home directory will have the file user ID changed "
@@ -757,7 +856,7 @@
 "seinem Home-Verzeichnis befinden, wird die ID des Eigentümers automatisch "
 "angepasst."
 
-#: usermod.8.xml:312(para)
+#: usermod.8.xml:342(para)
 msgid ""
 "The ownership of files outside of the user's home directory must be fixed "
 "manually."
@@ -765,11 +864,11 @@
 "Der Eigentümer von Dateien außerhalb des Home-Verzeichnisses des Benutzers "
 "muss per Hand angepasst werden."
 
-#: usermod.8.xml:319(term)
+#: usermod.8.xml:349(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:323(para)
+#: usermod.8.xml:353(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</"
@@ -779,7 +878,7 @@
 "verschlüsselten Passwort. Sie können diese Option nicht mit <option>-p</"
 "option> oder <option>-U</option> verwenden."
 
-#: usermod.8.xml:328(para)
+#: usermod.8.xml:358(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 "
@@ -792,7 +891,7 @@
 "oder den Wert von <option>EXPIRE</option> aus <filename>/etc/default/"
 "useradd</filename> setzen)."
 
-#: usermod.8.xml:339(term) useradd.8.xml:482(term)
+#: usermod.8.xml:369(term) useradd.8.xml:498(term)
 msgid ""
 "<option>-Z</option>, <option>--selinux-user</option><replaceable>SEUSER</"
 "replaceable>"
@@ -800,7 +899,7 @@
 "<option>-Z</option>, <option>--selinux-user</option><replaceable>SEUSER</"
 "replaceable>"
 
-#: usermod.8.xml:344(para)
+#: usermod.8.xml:374(para)
 msgid ""
 "The SELinux user for the user's login. The default is to leave this field "
 "the blank, which causes the system to select the default SELinux user."
@@ -809,16 +908,16 @@
 "bleibt dieses Feld leer und es wird dem System überlassen, den SELinux-"
 "Benutzer zu bestimmen."
 
-#: usermod.8.xml:355(title) userdel.8.xml:225(title) useradd.8.xml:605(title)
-#: su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
-#: newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title)
-#: groupdel.8.xml:65(title) groupadd.8.xml:223(title) gpasswd.1.xml:214(title)
-#: faillog.8.xml:199(title) chpasswd.8.xml:199(title)
-#: chgpasswd.8.xml:157(title)
+#: usermod.8.xml:385(title) userdel.8.xml:241(title) useradd.8.xml:621(title)
+#: su.1.xml:312(title) shadow.3.xml:199(title) passwd.1.xml:354(title)
+#: newusers.8.xml:330(title) login.1.xml:241(title) lastlog.8.xml:178(title)
+#: groupdel.8.xml:98(title) groupadd.8.xml:238(title) gpasswd.1.xml:232(title)
+#: faillog.8.xml:218(title) chpasswd.8.xml:215(title)
+#: chgpasswd.8.xml:173(title)
 msgid "CAVEATS"
 msgstr "WARNUNGEN"
 
-#: usermod.8.xml:356(para)
+#: usermod.8.xml:386(para)
 msgid ""
 "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, the "
@@ -832,7 +931,7 @@
 "<command>usermod</command> sicher, auf anderen Architekturen überprüft es "
 "nur, ob der Benutzer laut utmp eingeloggt ist."
 
-#: usermod.8.xml:364(para)
+#: usermod.8.xml:394(para)
 msgid ""
 "You must change the owner of any <command>crontab</command> files or "
 "<command>at</command> jobs manually."
@@ -840,7 +939,7 @@
 "Sie müssen den Eigentümer von <command>crontab</command>-Dateien oder "
 "<command>at</command>-Aufträgen per Hand ändern."
 
-#: usermod.8.xml:368(para)
+#: usermod.8.xml:398(para)
 msgid "You must make any changes involving NIS on the NIS server."
 msgstr ""
 "Sie müssen alle Änderung in Bezug auf NIS auf dem NIS-Server vornehmen."
@@ -1024,7 +1123,7 @@
 "nach dem folgenden Algorithmus aus der UID des Benutzers errechnet: "
 "<placeholder-1/>"
 
-#: usermod.8.xml:420(para)
+#: usermod.8.xml:450(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1062,16 +1161,16 @@
 "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: userdel.8.xml:43(refentrytitle) userdel.8.xml:48(refname)
-#: userdel.8.xml:53(command) login.defs.5.xml:458(term)
+#: userdel.8.xml:44(refentrytitle) userdel.8.xml:51(refname)
+#: userdel.8.xml:56(command) login.defs.5.xml:461(term)
 msgid "userdel"
 msgstr "userdel"
 
-#: userdel.8.xml:49(refpurpose)
+#: userdel.8.xml:52(refpurpose)
 msgid "delete a user account and related files"
 msgstr "löscht ein Benutzerkonto und die dazugehörigen Dateien"
 
-#: userdel.8.xml:63(para)
+#: userdel.8.xml:66(para)
 msgid ""
 "The <command>userdel</command> command modifies the system account files, "
 "deleting all entries that refer to the user name <emphasis remap=\"I"
@@ -1082,17 +1181,17 @@
 "\">ANMELDENAMEN</emphasis> verweisen. Der bezeichnete Benutzer muss "
 "existieren."
 
-#: userdel.8.xml:72(para)
+#: userdel.8.xml:75(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:77(term) groupadd.8.xml:79(term)
+#: userdel.8.xml:80(term) groupadd.8.xml:81(term) expiry.1.xml:84(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option"
 
-#: userdel.8.xml:81(para)
+#: userdel.8.xml:84(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 "
@@ -1113,7 +1212,7 @@
 "Benutzer vorhanden ist, wird auch diese Gruppe entfernt, selbst wenn sie die "
 "Hauptgruppe anderer Benutzer ist."
 
-#: userdel.8.xml:94(para)
+#: userdel.8.xml:97(para)
 msgid ""
 "<emphasis>Note:</emphasis> This option is dangerous and may leave your "
 "system in an inconsistent state."
@@ -1121,11 +1220,11 @@
 "<emphasis>Hinweis:</emphasis> Diese Option ist gefährlich und kann dazu "
 "führen, dass Ihr System nicht mehr ordnungsgemäß funktioniert."
 
-#: userdel.8.xml:107(term)
+#: userdel.8.xml:110(term)
 msgid "<option>-r</option>, <option>--remove</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
-#: userdel.8.xml:111(para)
+#: userdel.8.xml:114(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 "
@@ -1136,7 +1235,7 @@
 "des Home-Verzeichnisses befinden, müssen per Hand gesucht und gelöscht "
 "werden."
 
-#: userdel.8.xml:117(para)
+#: userdel.8.xml:120(para)
 msgid ""
 "The mail spool is defined by the <option>MAIL_DIR</option> variable in the "
 "<filename>login.defs</filename> file."
@@ -1254,109 +1353,109 @@
 "hat, und <command>useradd</command> wird standardmäßig eine Gruppe mit dem "
 "Namen des Benutzers erstellen."
 
-#: userdel.8.xml:153(filename) useradd.8.xml:694(filename)
-#: su.1.xml:353(filename) pwconv.8.xml:190(filename)
-#: passwd.1.xml:389(filename) newusers.8.xml:384(filename)
-#: login.access.5.xml:99(filename) login.1.xml:367(filename)
-#: groupadd.8.xml:214(filename) chsh.1.xml:148(filename)
-#: chpasswd.8.xml:238(filename) chgpasswd.8.xml:199(filename)
-#: chfn.1.xml:116(filename)
+#: userdel.8.xml:169(filename) useradd.8.xml:710(filename)
+#: su.1.xml:363(filename) pwconv.8.xml:235(filename)
+#: passwd.1.xml:405(filename) newusers.8.xml:402(filename)
+#: login.access.5.xml:105(filename) login.1.xml:370(filename)
+#: groupadd.8.xml:229(filename) chsh.1.xml:164(filename)
+#: chpasswd.8.xml:254(filename) chgpasswd.8.xml:215(filename)
+#: chfn.1.xml:192(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:155(para) useradd.8.xml:696(para) su.1.xml:355(para)
-#: pwconv.8.xml:192(para) passwd.1.xml:391(para) newusers.8.xml:386(para)
-#: login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:216(para)
-#: chsh.1.xml:150(para) chpasswd.8.xml:240(para) chgpasswd.8.xml:201(para)
-#: chfn.1.xml:118(para)
+#: userdel.8.xml:171(para) useradd.8.xml:712(para) su.1.xml:365(para)
+#: pwconv.8.xml:237(para) passwd.1.xml:407(para) newusers.8.xml:404(para)
+#: login.access.5.xml:107(para) login.1.xml:372(para) groupadd.8.xml:231(para)
+#: chsh.1.xml:166(para) chpasswd.8.xml:256(para) chgpasswd.8.xml:217(para)
+#: chfn.1.xml:194(para)
 msgid "Shadow password suite configuration."
 msgstr "Konfiguration der Shadow-Passwort-Werkzeugsammlung"
 
-#: userdel.8.xml:174(title) useradd.8.xml:703(title) su.1.xml:362(title)
-#: pwck.8.xml:271(title) passwd.1.xml:404(title) grpck.8.xml:209(title)
-#: groupmod.8.xml:182(title) groupdel.8.xml:107(title)
-#: groupadd.8.xml:245(title) chage.1.xml:244(title)
+#: userdel.8.xml:190(title) useradd.8.xml:719(title) su.1.xml:372(title)
+#: pwck.8.xml:275(title) passwd.1.xml:420(title) grpck.8.xml:227(title)
+#: groupmod.8.xml:208(title) groupdel.8.xml:140(title)
+#: groupadd.8.xml:260(title) chage.1.xml:260(title)
 msgid "EXIT VALUES"
 msgstr "RÜCKGABEWERTE"
 
-#: userdel.8.xml:179(replaceable) useradd.8.xml:708(replaceable)
-#: su.1.xml:381(replaceable) pwck.8.xml:276(replaceable)
-#: passwd.1.xml:409(replaceable) grpck.8.xml:214(replaceable)
-#: groupmod.8.xml:187(replaceable) groupdel.8.xml:112(replaceable)
-#: groupadd.8.xml:250(replaceable) chage.1.xml:249(replaceable)
+#: userdel.8.xml:195(replaceable) useradd.8.xml:724(replaceable)
+#: su.1.xml:391(replaceable) pwck.8.xml:280(replaceable)
+#: passwd.1.xml:425(replaceable) grpck.8.xml:232(replaceable)
+#: groupmod.8.xml:213(replaceable) groupdel.8.xml:145(replaceable)
+#: groupadd.8.xml:265(replaceable) chage.1.xml:265(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:181(para) useradd.8.xml:710(para) pwck.8.xml:278(para)
-#: passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para)
-#: groupdel.8.xml:114(para) groupadd.8.xml:252(para) chage.1.xml:251(para)
+#: userdel.8.xml:197(para) useradd.8.xml:726(para) pwck.8.xml:282(para)
+#: passwd.1.xml:427(para) grpck.8.xml:234(para) groupmod.8.xml:215(para)
+#: groupdel.8.xml:147(para) groupadd.8.xml:267(para) chage.1.xml:267(para)
 msgid "success"
 msgstr "Erfolg"
 
-#: userdel.8.xml:185(replaceable) useradd.8.xml:714(replaceable)
-#: su.1.xml:55(manvolnum) su.1.xml:387(replaceable) sg.1.xml:39(manvolnum)
-#: pwck.8.xml:282(replaceable) passwd.1.xml:45(manvolnum)
-#: passwd.1.xml:415(replaceable) newgrp.1.xml:39(manvolnum)
-#: login.1.xml:71(manvolnum) grpck.8.xml:220(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:39(manvolnum)
-#: chage.1.xml:255(replaceable)
+#: userdel.8.xml:201(replaceable) useradd.8.xml:730(replaceable)
+#: su.1.xml:56(manvolnum) su.1.xml:397(replaceable) sg.1.xml:40(manvolnum)
+#: pwck.8.xml:286(replaceable) passwd.1.xml:46(manvolnum)
+#: passwd.1.xml:431(replaceable) newgrp.1.xml:40(manvolnum)
+#: login.1.xml:72(manvolnum) grpck.8.xml:238(replaceable)
+#: groups.1.xml:39(manvolnum) gpasswd.1.xml:44(manvolnum)
+#: expiry.1.xml:43(manvolnum) chsh.1.xml:42(manvolnum)
+#: chfn.1.xml:42(manvolnum) chage.1.xml:40(manvolnum)
+#: chage.1.xml:271(replaceable)
 msgid "1"
 msgstr "1"
 
-#: userdel.8.xml:187(para) useradd.8.xml:716(para)
+#: userdel.8.xml:203(para) useradd.8.xml:732(para)
 msgid "can't update password file"
 msgstr "Die Passwortdatei kann nicht aktualisieren werden."
 
-#: userdel.8.xml:191(replaceable) useradd.8.xml:720(replaceable)
-#: pwck.8.xml:288(replaceable) passwd.1.xml:421(replaceable)
-#: grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable)
-#: groupdel.8.xml:118(replaceable) groupadd.8.xml:256(replaceable)
-#: chage.1.xml:261(replaceable)
+#: userdel.8.xml:207(replaceable) useradd.8.xml:736(replaceable)
+#: pwck.8.xml:292(replaceable) passwd.1.xml:437(replaceable)
+#: grpck.8.xml:244(replaceable) groupmod.8.xml:219(replaceable)
+#: groupdel.8.xml:151(replaceable) groupadd.8.xml:271(replaceable)
+#: chage.1.xml:277(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:193(para) useradd.8.xml:722(para) pwck.8.xml:284(para)
-#: grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
-#: groupadd.8.xml:258(para) chage.1.xml:263(para)
+#: userdel.8.xml:209(para) useradd.8.xml:738(para) pwck.8.xml:288(para)
+#: grpck.8.xml:240(para) groupmod.8.xml:221(para) groupdel.8.xml:153(para)
+#: groupadd.8.xml:273(para) chage.1.xml:279(para)
 msgid "invalid command syntax"
 msgstr "unzulässige Syntax für diesen Befehl"
 
-#: userdel.8.xml:197(replaceable) useradd.8.xml:738(replaceable)
-#: pwck.8.xml:312(replaceable) passwd.1.xml:445(replaceable)
-#: groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
+#: userdel.8.xml:213(replaceable) useradd.8.xml:754(replaceable)
+#: pwck.8.xml:316(replaceable) passwd.1.xml:461(replaceable)
+#: groupmod.8.xml:237(replaceable) groupdel.8.xml:157(replaceable)
 msgid "6"
 msgstr "6"
 
-#: userdel.8.xml:199(para)
+#: userdel.8.xml:215(para)
 msgid "specified user doesn't exist"
 msgstr "Der angegebene Benutzer ist nicht vorhanden."
 
-#: userdel.8.xml:205(para)
+#: userdel.8.xml:221(para)
 msgid "user currently logged in"
 msgstr "Benutzer ist im Moment angemeldet."
 
-#: userdel.8.xml:209(replaceable) useradd.8.xml:750(replaceable)
-#: groupmod.8.xml:223(replaceable) groupdel.8.xml:136(replaceable)
-#: groupadd.8.xml:280(replaceable)
+#: userdel.8.xml:225(replaceable) useradd.8.xml:766(replaceable)
+#: groupmod.8.xml:249(replaceable) groupdel.8.xml:169(replaceable)
+#: groupadd.8.xml:295(replaceable)
 msgid "10"
 msgstr "10"
 
-#: userdel.8.xml:211(para) useradd.8.xml:752(para) groupmod.8.xml:225(para)
-#: groupdel.8.xml:138(para) groupadd.8.xml:282(para)
+#: userdel.8.xml:227(para) useradd.8.xml:768(para) groupmod.8.xml:251(para)
+#: groupdel.8.xml:171(para) groupadd.8.xml:297(para)
 msgid "can't update group file"
 msgstr "Die Gruppendatei kann nicht aktualisieren werden."
 
-#: userdel.8.xml:215(replaceable) useradd.8.xml:756(replaceable)
+#: userdel.8.xml:231(replaceable) useradd.8.xml:772(replaceable)
 msgid "12"
 msgstr "12"
 
-#: userdel.8.xml:217(para)
+#: userdel.8.xml:233(para)
 msgid "can't remove home directory"
 msgstr "Das Home-Verzeichnis kann nicht gelöscht werden."
 
-#: userdel.8.xml:175(para)
+#: userdel.8.xml:191(para)
 msgid ""
 "The <command>userdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1364,7 +1463,7 @@
 "Der Befehl <command>userdel</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: userdel.8.xml:226(para)
+#: userdel.8.xml:242(para)
 msgid ""
 "<command>userdel</command> will not allow you to remove an account if there "
 "are running processes which belong to this account. In that case, you may "
@@ -1378,7 +1477,7 @@
 "Konto später entfernen. Die Option <option>-f</option> erzwingt das Löschen "
 "eines Kontos."
 
-#: userdel.8.xml:233(para)
+#: userdel.8.xml:249(para)
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this user."
@@ -1386,7 +1485,7 @@
 "Sie sollten von Hand alle Systemdateien überprüfen, um sicherzustellen, dass "
 "keine Dateien vorhanden sind, die dem gelöschten Benutzer gehören."
 
-#: userdel.8.xml:237(para)
+#: userdel.8.xml:253(para)
 msgid ""
 "You may not remove any NIS attributes on a NIS client. This must be "
 "performed on the NIS server."
@@ -1394,7 +1493,7 @@
 "Sie sollten keine NIS-Attribute auf einem NIS-Client löschen. Dies muss auf "
 "dem NIS-Server durchgeführt werden."
 
-#: userdel.8.xml:240(para)
+#: userdel.8.xml:256(para)
 msgid ""
 "If <option>USERGROUPS_ENAB</option> is defined to <emphasis remap=\"I\">yes</"
 "emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -1413,7 +1512,7 @@
 "angezeigt und die betreffende Gruppe nicht entfernt. Mit der Option <option>-"
 "f</option> kann das Löschen dieser Gruppe erzwungen werden."
 
-#: userdel.8.xml:253(para)
+#: userdel.8.xml:269(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1447,23 +1546,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: useradd.8.xml:52(refentrytitle) useradd.8.xml:57(refname)
-#: useradd.8.xml:62(command) useradd.8.xml:69(command)
-#: useradd.8.xml:73(command) login.defs.5.xml:444(term)
+#: useradd.8.xml:53(refentrytitle) useradd.8.xml:60(refname)
+#: useradd.8.xml:65(command) useradd.8.xml:72(command)
+#: useradd.8.xml:76(command) login.defs.5.xml:447(term)
 msgid "useradd"
 msgstr "useradd"
 
-#: useradd.8.xml:58(refpurpose)
+#: useradd.8.xml:61(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:70(arg) useradd.8.xml:74(arg)
+#: useradd.8.xml:73(arg) useradd.8.xml:77(arg)
 msgid "-D"
 msgstr "-D"
 
-#: useradd.8.xml:83(para)
+#: useradd.8.xml:86(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 "
@@ -1479,7 +1578,7 @@
 "Befehl <command>useradd</command> Systemdateien, erstellt ein Home-"
 "Verzeichnis für den neuen Benutzer und kopiert Dateien."
 
-#: useradd.8.xml:92(para)
+#: useradd.8.xml:95(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 "
@@ -1489,13 +1588,13 @@
 "(vergleiche <option>-g</option>, <option>-N</option>, <option>-U</option> "
 "und <option>USERGROUPS_ENAB</option>)."
 
-#: useradd.8.xml:101(para)
+#: useradd.8.xml:104(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:105(term) useradd.8.xml:507(term)
+#: useradd.8.xml:108(term) useradd.8.xml:523(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
@@ -1503,7 +1602,7 @@
 "<option>-b</option>, <option>--base-dir</option><replaceable>WURZEL_VERZ</"
 "replaceable>"
 
-#: useradd.8.xml:110(para)
+#: useradd.8.xml:113(para)
 msgid ""
 "The default base directory for the system if <option>-d</"
 "option><replaceable>HOME_DIR</replaceable> is not specified. "
@@ -1518,7 +1617,7 @@
 "<option>-m</option> nicht verwendet wird, muss <replaceable>WURZEL_VERZ</"
 "replaceable> existieren."
 
-#: useradd.8.xml:118(para)
+#: useradd.8.xml:121(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>/"
@@ -1529,7 +1628,7 @@
 "in <filename>/etc/default/useradd</filename> festgelegt wurde, anderenfalls "
 "<filename>/home</filename>."
 
-#: useradd.8.xml:133(para)
+#: useradd.8.xml:136(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."
@@ -1538,7 +1637,7 @@
 "des Logins und wird im Moment im Feld für den vollen Namen des Benutzers "
 "gespeichert."
 
-#: useradd.8.xml:146(para)
+#: useradd.8.xml:149(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 "
@@ -1554,15 +1653,15 @@
 "replaceable> angehängt. Das Verzeichnis <replaceable>HOME_VERZ</replaceable> "
 "muss nicht vorhanden sein, sondern wird gegebenenfalls angelegt."
 
-#: useradd.8.xml:158(term)
+#: useradd.8.xml:161(term)
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr "<option>-D</option>, <option>--defaults</option>"
 
-#: useradd.8.xml:162(para)
+#: useradd.8.xml:165(para)
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr "Lesen Sie dazu unten den Abschnitt »Die Standardwerte verändern«."
 
-#: useradd.8.xml:177(para)
+#: useradd.8.xml:180(para)
 msgid ""
 "If not specified, <command>useradd</command> will use the default expiry "
 "date specified by the <option>EXPIRE</option> variable in <filename>/etc/"
@@ -1573,7 +1672,7 @@
 "<filename>/etc/default/useradd</filename> bestimmt wurde, anderenfalls eine "
 "leere Zeichenkette (kein Verfall)."
 
-#: useradd.8.xml:191(para)
+#: useradd.8.xml:194(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 "
@@ -1583,7 +1682,7 @@
 "deaktiviert wird. Ein Wert von 0 deaktiviert das Konto, sobald das Passwort "
 "abläuft. Ein Wert von -1 schaltet diese Funktion ab."
 
-#: useradd.8.xml:197(para)
+#: useradd.8.xml:200(para)
 msgid ""
 "If not specified, <command>useradd</command> will use the default inactivity "
 "period specified by the <option>INACTIVE</option> variable in <filename>/etc/"
@@ -1594,7 +1693,7 @@
 "option> in <filename>/etc/default/useradd</filename> bestimmt wurde, "
 "anderenfalls -1."
 
-#: useradd.8.xml:211(para)
+#: useradd.8.xml:214(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."
@@ -1603,7 +1702,7 @@
 "Gruppenname muss existieren. Die Gruppenzahl muss auf eine bereits "
 "vorhandene Gruppe verweisen."
 
-#: useradd.8.xml:216(para)
+#: useradd.8.xml:219(para)
 msgid ""
 "If not specified, the behavior of <command>useradd</command> will depend on "
 "the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
@@ -1627,7 +1726,7 @@
 "fest, die mit der Variable <option>GROUP</option> in <filename>/etc/default/"
 "useradd</filename> definiert wurde, anderenfalls 100."
 
-#: useradd.8.xml:239(para)
+#: useradd.8.xml:242(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. "
@@ -1641,7 +1740,7 @@
 "Option <option>-g</option> bestimmt wurde. Standardmäßig ist der Benutzer "
 "nur Mitglied der Ausgangsgruppe."
 
-#: useradd.8.xml:256(term)
+#: useradd.8.xml:259(term)
 msgid ""
 "<option>-k</option>, <option>--skel</option><replaceable>SKEL_DIR</"
 "replaceable>"
@@ -1649,7 +1748,7 @@
 "<option>-k</option>, <option>--skel</option><replaceable>GERÜST_VERZ</"
 "replaceable>"
 
-#: useradd.8.xml:261(para)
+#: useradd.8.xml:264(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 "
@@ -1659,7 +1758,7 @@
 "Home-Verzeichnis des Benutzers kopiert werden, wenn es von <command>useradd</"
 "command> erstellt wird."
 
-#: useradd.8.xml:266(para)
+#: useradd.8.xml:269(para)
 msgid ""
 "This option is only valid if the <option>-m</option> (or <option>--create-"
 "home</option>) option is specified."
@@ -1667,7 +1766,7 @@
 "Diese Option ist nur zulässig, wenn auch die Option <option>-m</option> "
 "(oder <option>--create-home</option>) angegeben wird."
 
-#: useradd.8.xml:270(para)
+#: useradd.8.xml:273(para)
 msgid ""
 "If this option is not set, the skeleton directory is defined by the "
 "<option>SKEL</option> variable in <filename>/etc/default/useradd</filename> "
@@ -1677,11 +1776,11 @@
 "Variable <option>SKEL</option> in <filename>/etc/default/useradd</filename> "
 "festgelegt, anderenfalls ist dieses <filename>/etc/skel</filename>."
 
-#: useradd.8.xml:276(para)
+#: useradd.8.xml:279(para)
 msgid "If possible, the ACLs and extended attributes are copied."
 msgstr "Soweit möglich, werden die ACLs und erweiterten Attribute kopiert."
 
-#: useradd.8.xml:282(term) groupadd.8.xml:113(term)
+#: useradd.8.xml:285(term) groupadd.8.xml:115(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -1689,7 +1788,7 @@
 "<option>-K</option>, <option>--key</option><replaceable>SCHLÜSSEL</"
 "replaceable>=<replaceable>WERT</replaceable>"
 
-#: useradd.8.xml:287(para)
+#: useradd.8.xml:290(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (<option>UID_MIN</"
 "option>, <option>UID_MAX</option>, <option>UMASK</option>, "
@@ -1714,15 +1813,15 @@
 "replaceable><option> -K </option><replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable>"
 
-#: useradd.8.xml:311(term)
+#: useradd.8.xml:314(term)
 msgid "<option>-l</option>, <option>--no-log-init</option>"
 msgstr "<option>-l</option>, <option>--no-log-init</option>"
 
-#: useradd.8.xml:313(para)
+#: useradd.8.xml:316(para)
 msgid "Do not add the user to the lastlog and faillog databases."
 msgstr "Fügt den Benutzer nicht zu den Datenbanken lastlog und faillog hinzu."
 
-#: useradd.8.xml:316(para)
+#: useradd.8.xml:319(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."
@@ -1731,11 +1830,11 @@
 "faillog zurückgesetzt, um zu vermeiden, dass der Eintrag eines früher "
 "gelöschten Benutzers verwendet wird."
 
-#: useradd.8.xml:324(term)
+#: useradd.8.xml:327(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:328(para)
+#: useradd.8.xml:331(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 "
@@ -1746,7 +1845,7 @@
 "<option>-k</option> festgelegt werden kann, werden in das Home-Verzeichnis "
 "kopiert."
 
-#: useradd.8.xml:334(para)
+#: useradd.8.xml:337(para)
 msgid ""
 "By default, if this option is not specified and <option>CREATE_HOME</option> "
 "is not enabled, no home directories are created."
@@ -1754,11 +1853,11 @@
 "Wenn diese Option nicht angegeben wird und <option>CREATE_HOME</option> "
 "nicht aktiviert wurde, wird standardmäßig kein Home-Verzeichnis erstellt."
 
-#: useradd.8.xml:343(option)
+#: useradd.8.xml:346(option)
 msgid "-M"
 msgstr "-M"
 
-#: useradd.8.xml:346(para)
+#: useradd.8.xml:349(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 "
@@ -1768,11 +1867,11 @@
 "systemweite Option <option>CREATE_HOME</option> in <filename>/etc/login."
 "defs</filename> auf <replaceable>yes</replaceable> gesetzt ist."
 
-#: useradd.8.xml:355(term)
+#: useradd.8.xml:358(term)
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr "<option>-N</option>, <option>--no-user-group</option>"
 
-#: useradd.8.xml:359(para)
+#: useradd.8.xml:362(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 "
@@ -1783,7 +1882,7 @@
 "Variable <option>GROUP</option> in <filename>/etc/default/useradd</filename> "
 "angegeben wurde."
 
-#: useradd.8.xml:365(para) useradd.8.xml:473(para)
+#: useradd.8.xml:368(para) useradd.8.xml:489(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 "
@@ -1795,20 +1894,20 @@
 "<option>USERGROUPS_ENAB</option> in <filename>/etc/login.defs</filename> "
 "bestimmt."
 
-#: useradd.8.xml:378(para)
+#: useradd.8.xml:381(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:379(para)
+#: useradd.8.xml:382(para)
 msgid ""
 "This option is only valid in combination with the <option>-u</option> option."
 msgstr ""
 "Diese Option kann nur in Verbindung mit der Option <option>-u</option> "
 "verwendet werden."
 
-#: useradd.8.xml:391(para) groupadd.8.xml:149(para)
+#: useradd.8.xml:394(para) groupadd.8.xml:151(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
@@ -1818,15 +1917,15 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> zurückgegeben wird. "
 "Standardmäßig ist das Passwort deaktiviert."
 
-#: useradd.8.xml:408(term) newusers.8.xml:263(term) groupadd.8.xml:166(term)
+#: useradd.8.xml:411(term) newusers.8.xml:268(term) groupadd.8.xml:168(term)
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr "<option>-r</option>, <option>--system</option>"
 
-#: useradd.8.xml:412(para) newusers.8.xml:267(para)
+#: useradd.8.xml:415(para) newusers.8.xml:272(para)
 msgid "Create a system account."
 msgstr "erstellt ein Systemkonto"
 
-#: useradd.8.xml:415(para)
+#: useradd.8.xml:418(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are chosen in the "
@@ -1841,7 +1940,7 @@
 "<option>UID_MIN</option> bis <option>UID_MAX</option> gewählt (gleiches gilt "
 "für die GID bei der Erstellung von Gruppen)."
 
-#: useradd.8.xml:424(para)
+#: useradd.8.xml:427(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."
@@ -1853,7 +1952,7 @@
 "unabhängig von der Einstellung in <filename>/etc/login.defs</filename> "
 "(<option>CREATE_HOME</option>) kein Home-Verzeichnis erzeugen wird."
 
-#: useradd.8.xml:440(para)
+#: useradd.8.xml:456(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 specified "
@@ -1865,7 +1964,7 @@
 "der Variable <option>SHELL</option> in <filename>/etc/default/useradd</"
 "filename> definiert wird, anderenfalls bleibt das Feld leer."
 
-#: useradd.8.xml:455(para)
+#: useradd.8.xml:471(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 "
@@ -1879,11 +1978,11 @@
 "größer als jeder andere Wert eines Benutzers verwendet. Typischerweise sind "
 "Werte zwischen 0 und 999 für Systemkonten reserviert."
 
-#: useradd.8.xml:465(term)
+#: useradd.8.xml:481(term)
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr "<option>-U</option>, <option>--user-group</option>"
 
-#: useradd.8.xml:469(para)
+#: useradd.8.xml:485(para)
 msgid ""
 "Create a group with the same name as the user, and add the user to this "
 "group."
@@ -1891,7 +1990,7 @@
 "erstellt eine Gruppe mit dem gleichen Name wie der Benutzer und fügt diesen "
 "der Gruppe hinzu"
 
-#: useradd.8.xml:487(para)
+#: useradd.8.xml:503(para)
 msgid ""
 "The SELinux user for the user's login. The default is to leave this field "
 "blank, which causes the system to select the default SELinux user."
@@ -1900,11 +1999,11 @@
 "bleibt dieses Feld leer und es wird dem System überlassen, den SELinux-"
 "Benutzer zu bestimmen."
 
-#: useradd.8.xml:497(title)
+#: useradd.8.xml:513(title)
 msgid "Changing the default values"
 msgstr "Die Standardwerte verändern"
 
-#: useradd.8.xml:498(para)
+#: useradd.8.xml:514(para)
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
 "command> will display the current default values. When invoked with <option>-"
@@ -1917,7 +2016,7 @@
 "Optionen aufgerufen wird, werden deren Standardwerte entsprechend angepasst. "
 "Die gültigen Optionen, um Standardwerte zu ändern, sind:"
 
-#: useradd.8.xml:512(para)
+#: useradd.8.xml:528(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 "
@@ -1929,7 +2028,7 @@
 "den Namen des Home-Verzeichnisses zu erhalten, falls nicht die Option "
 "<option>-d</option> bei der Erstellung eines neuen Kontos verwendet wird."
 
-#: useradd.8.xml:519(para)
+#: useradd.8.xml:535(para)
 msgid ""
 "This option sets the <option>HOME</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -1937,11 +2036,11 @@
 "Diese Option verändert die Variable <option>HOME</option> in <filename>/etc/"
 "default/useradd</filename>."
 
-#: useradd.8.xml:531(para)
+#: useradd.8.xml:547(para)
 msgid "The date on which the user account is disabled."
 msgstr "das Datum, an dem das Benutzerkonto abgeschaltet wird"
 
-#: useradd.8.xml:532(para)
+#: useradd.8.xml:548(para)
 msgid ""
 "This option sets the <option>EXPIRE</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -1949,7 +2048,7 @@
 "Diese Option verändert die Variable <option>EXPIRE</option> in <filename>/"
 "etc/default/useradd</filename>."
 
-#: useradd.8.xml:544(para)
+#: useradd.8.xml:560(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
@@ -1957,7 +2056,7 @@
 "die Anzahl von Tagen nach dem Ablaufen des Passworts bis das Konto "
 "deaktiviert wird"
 
-#: useradd.8.xml:548(para)
+#: useradd.8.xml:564(para)
 msgid ""
 "This option sets the <option>INACTIVE</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -1965,7 +2064,7 @@
 "Diese Option verändert die Variable <option>INACTIVE</option> in <filename>/"
 "etc/default/useradd</filename>."
 
-#: useradd.8.xml:560(para)
+#: useradd.8.xml:576(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> "
@@ -1979,7 +2078,7 @@
 "option> auf <replaceable>no</replaceable> gesetzt ist. Die bezeichnete "
 "Gruppe und die GID müssen existieren."
 
-#: useradd.8.xml:569(para)
+#: useradd.8.xml:585(para)
 msgid ""
 "This option sets the <option>GROUP</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -1987,11 +2086,11 @@
 "Diese Option verändert die Variable <option>GROUP</option> in <filename>/etc/"
 "default/useradd</filename>."
 
-#: useradd.8.xml:581(para)
+#: useradd.8.xml:597(para)
 msgid "The name of a new user's login shell."
 msgstr "der Name der Anmelde-Shell des neuen Benutzers"
 
-#: useradd.8.xml:584(para)
+#: useradd.8.xml:600(para)
 msgid ""
 "This option sets the <option>SHELL</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -1999,11 +2098,11 @@
 "Diese Option verändert die Variable <option>SHELL</option> in <filename>/etc/"
 "default/useradd</filename>."
 
-#: useradd.8.xml:596(title)
+#: useradd.8.xml:612(title)
 msgid "NOTES"
 msgstr "ANMERKUNGEN"
 
-#: useradd.8.xml:597(para)
+#: useradd.8.xml:613(para)
 msgid ""
 "The system administrator is responsible for placing the default user files "
 "in the <filename>/etc/skel/</filename> directory (or any other skeleton "
@@ -2015,7 +2114,7 @@
 "einem anderen Gerüstverzeichnis, das in <filename>/etc/default/useradd</"
 "filename> oder über die Befehlszeile definiert wurde), anzulegen."
 
-#: useradd.8.xml:606(para)
+#: useradd.8.xml:622(para)
 msgid ""
 "You may not add a user to a NIS or LDAP group. This must be performed on the "
 "corresponding server."
@@ -2023,7 +2122,7 @@
 "Sie dürfen einen Benutzer nicht einer NIS- oder LDAP-Gruppe hinzufügen. Dies "
 "muss auf dem entsprechenden Server durchgeführt werden."
 
-#: useradd.8.xml:611(para)
+#: useradd.8.xml:627(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 "
@@ -2033,7 +2132,7 @@
 "erstellen, wenn der Benutzername schon in einer externen Benutzerdatenbank "
 "wie z.B. NIS oder LDAP vorhanden ist."
 
-#: useradd.8.xml:617(para)
+#: useradd.8.xml:633(para)
 msgid ""
 "Usernames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
@@ -2044,7 +2143,7 @@
 "Gedankenstriche enthalten. Sie können mit einem Dollarzeichen enden. Als "
 "regulärer Ausdruck: [a-z_][a-z0-9_-]*[$]?"
 
-#: useradd.8.xml:623(para)
+#: useradd.8.xml:639(para)
 msgid "Usernames may only be up to 32 characters long."
 msgstr "Benutzernamen dürfen nur bis zu 32 Zeichen lang sein."
 
@@ -2257,72 +2356,72 @@
 "Sie wird ebenfalls von <command>pam_umask</command> als die Standard-Umask "
 "verwendet."
 
-#: useradd.8.xml:682(filename)
+#: useradd.8.xml:698(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
 # type: Plain text
-#: useradd.8.xml:684(para)
+#: useradd.8.xml:700(para)
 msgid "Default values for account creation."
 msgstr "Standardwerte für die Erstellung eines Kontos"
 
-#: useradd.8.xml:688(filename)
+#: useradd.8.xml:704(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
-#: useradd.8.xml:690(para)
+#: useradd.8.xml:706(para)
 msgid "Directory containing default files."
 msgstr "Verzeichnis, das die Standarddateien enthält"
 
-#: useradd.8.xml:726(replaceable) shadow.3.xml:35(manvolnum)
-#: pwck.8.xml:294(replaceable) passwd.1.xml:427(replaceable)
-#: grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable)
-#: groupadd.8.xml:262(replaceable)
+#: useradd.8.xml:742(replaceable) shadow.3.xml:39(manvolnum)
+#: pwck.8.xml:298(replaceable) passwd.1.xml:443(replaceable)
+#: grpck.8.xml:250(replaceable) groupmod.8.xml:225(replaceable)
+#: groupadd.8.xml:277(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:728(para) passwd.1.xml:447(para) groupmod.8.xml:201(para)
-#: groupadd.8.xml:264(para)
+#: useradd.8.xml:744(para) passwd.1.xml:463(para) groupmod.8.xml:227(para)
+#: groupadd.8.xml:279(para)
 msgid "invalid argument to option"
 msgstr "ungültiges Argument für Option"
 
-#: useradd.8.xml:732(replaceable) pwck.8.xml:300(replaceable)
-#: passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable)
-#: groupmod.8.xml:205(replaceable) groupadd.8.xml:268(replaceable)
+#: useradd.8.xml:748(replaceable) pwck.8.xml:304(replaceable)
+#: passwd.1.xml:449(replaceable) grpck.8.xml:256(replaceable)
+#: groupmod.8.xml:231(replaceable) groupadd.8.xml:283(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:734(para)
+#: useradd.8.xml:750(para)
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr "UID ist schon vergeben (und kein <option>-o</option>)"
 
-#: useradd.8.xml:740(para) groupmod.8.xml:207(para) groupmod.8.xml:213(para)
-#: groupdel.8.xml:126(para)
+#: useradd.8.xml:756(para) groupmod.8.xml:233(para) groupmod.8.xml:239(para)
+#: groupdel.8.xml:159(para)
 msgid "specified group doesn't exist"
 msgstr "angegebene Gruppe ist nicht vorhanden"
 
-#: useradd.8.xml:744(replaceable) groupmod.8.xml:217(replaceable)
-#: groupadd.8.xml:274(replaceable)
+#: useradd.8.xml:760(replaceable) groupmod.8.xml:243(replaceable)
+#: groupadd.8.xml:289(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:746(para)
+#: useradd.8.xml:762(para)
 msgid "username already in use"
 msgstr "Benutzername ist schon vergeben"
 
-#: useradd.8.xml:758(para)
+#: useradd.8.xml:774(para)
 msgid "can't create home directory"
 msgstr "Home-Verzeichnis kann nicht erstellt werden."
 
-#: useradd.8.xml:762(replaceable)
+#: useradd.8.xml:778(replaceable)
 msgid "13"
 msgstr "13"
 
-#: useradd.8.xml:764(para)
+#: useradd.8.xml:780(para)
 msgid "can't create mail spool"
 msgstr "Mail-Spool kann nicht erstellen werden."
 
-#: useradd.8.xml:704(para)
+#: useradd.8.xml:720(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -2330,7 +2429,7 @@
 "Der Befehl <command>useradd</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: useradd.8.xml:773(para)
+#: useradd.8.xml:789(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -2368,36 +2467,36 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
+#: suauth.5.xml:38(refentrytitle) suauth.5.xml:45(refname)
 msgid "suauth"
 msgstr "suauth"
 
-#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
-#: pwck.8.xml:306(replaceable) porttime.5.xml:35(manvolnum)
-#: passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable)
-#: login.defs.5.xml:101(manvolnum) login.access.5.xml:36(manvolnum)
-#: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
-#: grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
+#: suauth.5.xml:39(manvolnum) shadow.5.xml:39(manvolnum)
+#: pwck.8.xml:310(replaceable) porttime.5.xml:39(manvolnum)
+#: passwd.5.xml:39(manvolnum) passwd.1.xml:455(replaceable)
+#: login.defs.5.xml:102(manvolnum) login.access.5.xml:40(manvolnum)
+#: limits.5.xml:40(manvolnum) gshadow.5.xml:38(manvolnum)
+#: grpck.8.xml:262(replaceable) faillog.5.xml:39(manvolnum)
 msgid "5"
 msgstr "5"
 
-#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo)
-#: porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo)
-#: login.defs.5.xml:102(refmiscinfo) login.access.5.xml:37(refmiscinfo)
-#: limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo)
-#: faillog.5.xml:36(refmiscinfo)
+#: suauth.5.xml:40(refmiscinfo) shadow.5.xml:40(refmiscinfo)
+#: porttime.5.xml:40(refmiscinfo) passwd.5.xml:40(refmiscinfo)
+#: login.defs.5.xml:103(refmiscinfo) login.access.5.xml:41(refmiscinfo)
+#: limits.5.xml:41(refmiscinfo) gshadow.5.xml:39(refmiscinfo)
+#: faillog.5.xml:40(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr "Dateiformate und -konvertierung"
 
-#: suauth.5.xml:40(refpurpose)
+#: suauth.5.xml:46(refpurpose)
 msgid "detailed su control file"
 msgstr "ausführliche Kontrolldatei für su"
 
-#: suauth.5.xml:45(command) suauth.5.xml:171(filename)
+#: suauth.5.xml:51(command) suauth.5.xml:177(filename)
 msgid "/etc/suauth"
 msgstr "/etc/suauth"
 
-#: suauth.5.xml:51(para)
+#: suauth.5.xml:57(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:"
@@ -2407,7 +2506,7 @@
 "werden. Dies hängt von Folgendem ab:"
 
 #. .RS
-#: suauth.5.xml:58(literallayout)
+#: suauth.5.xml:64(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2419,14 +2518,14 @@
 "    "
 
 #. .fi
-#: suauth.5.xml:62(para)
+#: suauth.5.xml:68(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:67(para)
+#: suauth.5.xml:73(para)
 msgid ""
 "The file is formatted like this, with lines starting with a # being treated "
 "as comment lines and ignored;"
@@ -2434,7 +2533,7 @@
 "Die Datei ist folgendermaßen aufgebaut, wobei Zeilen, die mit einem # "
 "beginnen, als Kommentare behandelt und daher ignoriert werden:"
 
-#: suauth.5.xml:72(literallayout)
+#: suauth.5.xml:78(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2445,11 +2544,16 @@
 "      Herkunfts-ID:Ziel-ID:AKTION\n"
 "    "
 
-#: suauth.5.xml:76(para)
+#: suauth.5.xml:82(para)
+#, fuzzy
+#| 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 \",\""
 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 \",\""
+"a list of usernames delimited by \",\"."
 msgstr ""
 "Hierbei kann to-id <emphasis>ALL</emphasis>, eine Aufzählung von "
 "Benutzernamen, die durch ein »,« getrennt werden, oder <emphasis>ALL EXCEPT</"
@@ -2457,7 +2561,7 @@
 "durch ein »,« getrennt werden, sein."
 
 # SB: What is the meaning of the last sentence?
-#: suauth.5.xml:82(para)
+#: suauth.5.xml:88(para)
 msgid ""
 "from-id is formatted the same as to-id except the extra word "
 "<emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</"
@@ -2475,36 +2579,36 @@
 "<citerefentry><refentrytitle>/etc/group</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry> ist notwendig."
 
-#: suauth.5.xml:93(para)
+#: suauth.5.xml:99(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:99(emphasis)
+#: suauth.5.xml:105(emphasis)
 msgid "DENY"
 msgstr "DENY"
 
-#: suauth.5.xml:102(para)
+#: suauth.5.xml:108(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:109(emphasis)
+#: suauth.5.xml:115(emphasis)
 msgid "NOPASS"
 msgstr "NOPASS"
 
-#: suauth.5.xml:112(para)
+#: suauth.5.xml:118(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:120(emphasis)
+#: suauth.5.xml:126(emphasis)
 msgid "OWNPASS"
 msgstr "OWNPASS"
 
-#: suauth.5.xml:123(para)
+#: suauth.5.xml:129(para)
 msgid ""
 "For the su command to be successful, the user must enter his or her own "
 "password. They are told this."
@@ -2512,7 +2616,7 @@
 "Damit der Befehl su Erfolg hat, muss der Benutzer sein eigenes Passwort "
 "eingeben. Darauf wird er hingewiesen."
 
-#: suauth.5.xml:131(para)
+#: suauth.5.xml:137(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 "
@@ -2527,11 +2631,11 @@
 "wird angewendet, ohne dass die Datei weiter ausgewertet wird. Damit kann ein "
 "Systemadministrator eine strenge Kontrolle ausüben."
 
-#: suauth.5.xml:141(title)
+#: suauth.5.xml:147(title)
 msgid "EXAMPLE"
 msgstr "BEISPIEL"
 
-#: suauth.5.xml:142(literallayout)
+#: suauth.5.xml:148(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2580,11 +2684,11 @@
 "      #\n"
 "    "
 
-#: suauth.5.xml:178(title) pwconv.8.xml:153(title) login.defs.5.xml:488(title)
+#: suauth.5.xml:184(title) pwconv.8.xml:198(title) login.defs.5.xml:491(title)
 msgid "BUGS"
 msgstr "FEHLER"
 
-#: suauth.5.xml:179(para)
+#: suauth.5.xml:185(para)
 msgid ""
 "There could be plenty lurking. The file parser is particularly unforgiving "
 "about syntax errors, expecting no spurious whitespace (apart from beginning "
@@ -2595,11 +2699,11 @@
 "Schluss einer Zeile) und dem besonderen Zeichen, das die verschiedenen "
 "Felder von einander trennt."
 
-#: suauth.5.xml:188(title) shadow.3.xml:183(title)
+#: suauth.5.xml:194(title) shadow.3.xml:189(title)
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSE"
 
-#: suauth.5.xml:189(para)
+#: suauth.5.xml:195(para)
 msgid ""
 "An error parsing the file is reported using "
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
@@ -2609,7 +2713,7 @@
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry> mit der Stufe ERR an das Gerät AUTH gemeldet."
 
-#: suauth.5.xml:198(para)
+#: suauth.5.xml:204(para)
 msgid ""
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -2617,30 +2721,30 @@
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command)
-#: login.defs.5.xml:418(term)
+#: su.1.xml:55(refentrytitle) su.1.xml:62(refname) su.1.xml:67(command)
+#: login.defs.5.xml:421(term)
 msgid "su"
 msgstr "su"
 
-#: 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:40(refmiscinfo)
+#: su.1.xml:57(refmiscinfo) sg.1.xml:41(refmiscinfo)
+#: passwd.1.xml:47(refmiscinfo) newgrp.1.xml:41(refmiscinfo)
+#: login.1.xml:73(refmiscinfo) groups.1.xml:40(refmiscinfo)
+#: gpasswd.1.xml:45(refmiscinfo) expiry.1.xml:44(refmiscinfo)
+#: chsh.1.xml:43(refmiscinfo) chfn.1.xml:43(refmiscinfo)
+#: chage.1.xml:41(refmiscinfo)
 msgid "User Commands"
 msgstr "Dienstprogramme für Benutzer"
 
-#: su.1.xml:60(refpurpose)
+#: su.1.xml:63(refpurpose)
 msgid "change user ID or become superuser"
 msgstr "ändert die Benutzer-ID oder wechselt zu Root"
 
-#: su.1.xml:70(replaceable) login.1.xml:85(replaceable)
-#: login.1.xml:93(replaceable)
+#: su.1.xml:73(replaceable) login.1.xml:88(replaceable)
+#: login.1.xml:96(replaceable)
 msgid "username"
 msgstr "Benutzername"
 
-#: su.1.xml:78(para)
+#: su.1.xml:81(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</"
@@ -2656,7 +2760,7 @@
 "Benutzer nach einer direkten Anmeldung erwartet."
 
 # SB: Bessere Übersetzung als 'Zielbenutzer'?
-#: su.1.xml:87(para)
+#: su.1.xml:90(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 "
@@ -2671,7 +2775,7 @@
 "Befehl wird von der Shell ausgeführt, die in <filename>/etc/passwd</"
 "filename> für den Zielbenutzer angegeben ist."
 
-#: su.1.xml:96(para)
+#: su.1.xml:99(para)
 msgid ""
 "You can use the <option>--</option> argument to separate <command>su</"
 "command> options from the arguments supplied to the shell."
@@ -2679,7 +2783,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:101(para)
+#: su.1.xml:104(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 "
@@ -2690,7 +2794,7 @@
 "auch misslungene Versuche werden protokolliert, um Missbrauch des Systems zu "
 "entdecken."
 
-#: su.1.xml:106(para)
+#: su.1.xml:109(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 "
@@ -2707,7 +2811,7 @@
 "filename> geändert werden."
 
 # SB: Not quite sure what subsystem logins are.
-#: su.1.xml:115(para) login.1.xml:166(para)
+#: su.1.xml:118(para) login.1.xml:169(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 "
@@ -2718,12 +2822,12 @@
 "das Dateisystem verwendet, auf welchem der Benutzer tatsächlich angemeldet "
 "ist."
 
-#: su.1.xml:124(para)
+#: su.1.xml:127(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:128(term)
+#: su.1.xml:131(term)
 msgid ""
 "<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
 "replaceable>"
@@ -2731,7 +2835,7 @@
 "<option>-c</option>, <option>--command</option><replaceable>BEFEHL</"
 "replaceable>"
 
-#: su.1.xml:133(para)
+#: su.1.xml:136(para)
 msgid ""
 "Specify a command that will be invoked by the shell using its <option>-c</"
 "option>."
@@ -2739,11 +2843,17 @@
 "gibt einen Befehl an, der von der Shell mittels ihrer Option <option>-c</"
 "option> ausgeführt wird"
 
-#: su.1.xml:140(term)
+#: su.1.xml:140(para)
+msgid ""
+"The executed command will have no controlling terminal. This option cannot "
+"be used to execute interractive programs which need a controlling TTY."
+msgstr ""
+
+#: su.1.xml:150(term)
 msgid "<option>-</option>, <option>-l</option>, <option>--login</option>"
 msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
 
-#: su.1.xml:144(para)
+#: su.1.xml:154(para)
 msgid ""
 "Provide an environment similar to what the user would expect had the user "
 "logged in directly."
@@ -2751,7 +2861,7 @@
 "Eine Umgebung wird zur Verfügung gestellt, die der entspricht, die der "
 "Benutzer nach einer direkten Anmeldung erwartet."
 
-#: su.1.xml:148(para)
+#: su.1.xml:158(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 "
@@ -2761,15 +2871,15 @@
 "<command>su</command> angegeben werden. Die übrigen Formen ((<option>-l</"
 "option> und <option>--login</option>) unterliegen nicht dieser Beschränkung."
 
-#: su.1.xml:162(para)
+#: su.1.xml:172(para)
 msgid "The shell that will be invoked."
 msgstr "die Shell, die gestartet wird"
 
-#: su.1.xml:170(para)
+#: su.1.xml:180(para)
 msgid "The shell specified with --shell."
 msgstr "die Shell, die mit --shell angegeben wurde"
 
-#: su.1.xml:173(para)
+#: su.1.xml:183(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
@@ -2778,7 +2888,7 @@
 "durch die Umgebungsvariable <envar>$SHELL</envar> festgelegt wird."
 
 # SB: Bessere Übersetzung als 'Zielbenutzer'?
-#: su.1.xml:180(para)
+#: su.1.xml:190(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
@@ -2786,7 +2896,7 @@
 "die Shell, die in <filename>/etc/passwd</filename> für den Zielbenutzer "
 "angegeben ist"
 
-#: su.1.xml:186(para)
+#: su.1.xml:196(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
@@ -2794,7 +2904,7 @@
 "<filename>/bin/sh</filename>, falls durch die obigen Methoden keine Shell "
 "gefunden werden kann"
 
-#: su.1.xml:163(para)
+#: su.1.xml:173(para)
 msgid ""
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
@@ -2802,7 +2912,7 @@
 "<placeholder-1/>"
 
 # SB: Bessere Übersetzung als 'Zielbenutzer'?
-#: su.1.xml:191(para)
+#: su.1.xml:201(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>/"
@@ -2816,7 +2926,7 @@
 "shell</option> und die Umgebungsvariable <envar>$SHELL</envar> nicht "
 "beachtet, sofern <command>su</command> nicht von Root aufgerufen wird."
 
-#: su.1.xml:202(term)
+#: su.1.xml:212(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2824,11 +2934,11 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:211(envar)
+#: su.1.xml:221(envar)
 msgid "$PATH"
 msgstr "$PATH"
 
-#: su.1.xml:213(para)
+#: su.1.xml:223(para)
 msgid ""
 "reset according to the <filename>/etc/login.defs</filename> options "
 "<option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
@@ -2837,11 +2947,11 @@
 "oder <option>ENV_SUPATH</option> in <filename>/etc/login.defs</filename> "
 "zurücksetzen (siehe unten);"
 
-#: su.1.xml:222(envar)
+#: su.1.xml:232(envar)
 msgid "$IFS"
 msgstr "$IFS"
 
-#: su.1.xml:224(para)
+#: su.1.xml:234(para)
 msgid ""
 "reset to <quote><space><tab><newline></quote>, if it was "
 "set."
@@ -2849,11 +2959,11 @@
 "auf <quote><space><tab><newline></quote> zurücksetzen, "
 "falls es verändert wurde"
 
-#: su.1.xml:207(para)
+#: su.1.xml:217(para)
 msgid "Preserve the current environment, except for: <placeholder-1/>"
 msgstr "Erhält die aktuelle Umgebung mit Ausnahme von: <placeholder-1/>"
 
-#: su.1.xml:233(para)
+#: su.1.xml:243(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
@@ -2861,7 +2971,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:242(para)
+#: su.1.xml:252(para)
 msgid ""
 "The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, "
 "<envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> "
@@ -2871,7 +2981,7 @@
 "$USER</envar>, <envar>$LOGNAME</envar>, <envar>$PATH</envar> und <envar>"
 "$IFS</envar> werden zurückgesetzt."
 
-#: su.1.xml:251(para)
+#: su.1.xml:261(para)
 msgid ""
 "If <option>--login</option> is not used, the environment is copied, except "
 "for the variables above."
@@ -2879,7 +2989,7 @@
 "Falls nicht <option>--login</option> verwendet wurde, wird die Umgebung mit "
 "der Ausnahme der genannten Variablen kopiert."
 
-#: su.1.xml:258(para)
+#: su.1.xml:268(para)
 msgid ""
 "If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>"
 "$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> "
@@ -2889,7 +2999,7 @@
 "$TERM</envar>, <envar>$COLORTERM</envar>, <envar>$DISPLAY</envar> und <envar>"
 "$XAUTHORITY</envar> übernommen, wenn ihnen ein Wert zugewiesen wurde."
 
-#: su.1.xml:268(para)
+#: su.1.xml:278(para)
 msgid ""
 "If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</"
 "envar>, and <envar>$MAIL</envar> environment variables are set according to "
@@ -2903,7 +3013,7 @@
 "<option>ENV_TZ</option>, <option>ENV_HZ</option>, <option>MAIL_DIR</option> "
 "und <option>MAIL_FILE</option> (siehe unten) gesetzt."
 
-#: su.1.xml:281(para)
+#: su.1.xml:291(para)
 msgid ""
 "If <option>--login</option> is used, other environment variables might be "
 "set by the <option>ENVIRON_FILE</option> file (see below)."
@@ -2912,11 +3022,11 @@
 "Umgebungsvariablen mit der Datei <option>ENVIRON_FILE</option> vergeben "
 "werden (siehe unten)."
 
-#: su.1.xml:289(para)
+#: su.1.xml:299(para)
 msgid "Other environments might be set by PAM modules."
 msgstr "Andere Umgebungen können auch durch PAM-Module eingerichtet werden."
 
-#: su.1.xml:237(para)
+#: su.1.xml:247(para)
 msgid ""
 "Note that the default behavior for the environment is the following: "
 "<placeholder-1/>"
@@ -2924,7 +3034,7 @@
 "Beachten Sie, dass Folgendes das Standardverhalten für die Umgebung ist: "
 "<placeholder-1/>"
 
-#: su.1.xml:303(para)
+#: su.1.xml:313(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -2979,9 +3089,13 @@
 msgstr "<option>DEFAULT_HOME</option> (boolesch)"
 
 #: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+#, fuzzy
+#| msgid ""
+#| "Indicate if login is allowed if we can't cd to the home directory. "
+#| "Default in no."
 msgid ""
 "Indicate if login is allowed if we can't cd to the home directory. Default "
-"in no."
+"is no."
 msgstr ""
 "Legt fest, ob ein Login erlaubt wird, wenn mit cd nicht in das Home-"
 "Verzeichnis gewechselt werden kann. Standardmäßig wird dies nicht zugelassen."
@@ -3112,10 +3226,15 @@
 
 #: 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)
+#, fuzzy
+#| 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."
 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."
+"will not be translated."
 msgstr ""
 "Diese Zeichenkette wird bei der Eingabeaufforderung des Passworts (Prompt) "
 "verwendet. Standardmäßig wird »Password: « oder eine Übersetzung davon "
@@ -3153,7 +3272,12 @@
 msgstr "<option>QUOTAS_ENAB</option> (boolesch)"
 
 #: 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."
+#, fuzzy
+#| msgid ""
+#| "Enable setting of ulimit, umask, and niceness from passwd gecos field."
+msgid ""
+"Enable setting of resource limits from <filename>/etc/limits</filename> and "
+"ulimit, umask, and niceness from the user's passwd gecos field."
 msgstr ""
 "aktiviert das Setzen von ulimit, umask und niceness aus dem gecos-Feld von "
 "passwd"
@@ -3214,7 +3338,7 @@
 "aktiviert das Protokollieren der Aktivitäten von <command>su</command> in "
 "»syslog« neben der Protokollierung in der sulog-Datei"
 
-#: su.1.xml:363(para)
+#: su.1.xml:373(para)
 msgid ""
 "On success, <command>su</command> returns the exit value of the command it "
 "executed."
@@ -3222,7 +3346,7 @@
 "Wenn <command>su</command> erfolgreich ausgeführt wird, gibt es den "
 "Rückgabewert des mit ihm ausgeführten Befehls zurück."
 
-#: su.1.xml:367(para)
+#: su.1.xml:377(para)
 msgid ""
 "If this command was terminated by a signal, <command>su</command> returns "
 "the number of this signal plus 128."
@@ -3230,7 +3354,7 @@
 "Wenn dieser Befehl mit einem Signal beendet wurde, gibt <command>su</"
 "command> die Nummer des Signals plus 128 zurück."
 
-#: su.1.xml:371(para)
+#: su.1.xml:381(para)
 msgid ""
 "If su has to kill the command (because it was asked to terminate, and the "
 "command did not terminate in time), <command>su</command> returns 255."
@@ -3239,31 +3363,31 @@
 "Aufforderung, sich zu beenden, nicht rechtzeitig nachgekommen ist), gibt es "
 "255 zurück."
 
-#: su.1.xml:383(para)
+#: su.1.xml:393(para)
 msgid "success (<option>--help</option> only)"
 msgstr "Erfolg (nur bei <option>--help</option>)"
 
-#: su.1.xml:389(para)
+#: su.1.xml:399(para)
 msgid "System or authentication failure"
 msgstr "System- oder Anmeldefehler"
 
-#: su.1.xml:393(replaceable)
+#: su.1.xml:403(replaceable)
 msgid "126"
 msgstr "126"
 
-#: su.1.xml:395(para)
+#: su.1.xml:405(para)
 msgid "The requested command was not found"
 msgstr "Der angegebene Befehl konnte nicht gefunden werden."
 
-#: su.1.xml:399(replaceable)
+#: su.1.xml:409(replaceable)
 msgid "127"
 msgstr "127"
 
-#: su.1.xml:401(para)
+#: su.1.xml:411(para)
 msgid "The requested command could not be executed"
 msgstr "Der angegebene Befehl konnte nicht ausgeführt werden."
 
-#: su.1.xml:376(para)
+#: su.1.xml:386(para)
 msgid ""
 "Some exit values from <command>su</command> are independent from the "
 "executed command: <placeholder-1/>"
@@ -3271,7 +3395,7 @@
 "Einige Rückgabewerte von <command>su</command> sind unabhängig von dem "
 "ausgeführten Befehl: <placeholder-1/>"
 
-#: su.1.xml:410(para)
+#: su.1.xml:420(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -3287,27 +3411,27 @@
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>."
 
-#: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command)
+#: sg.1.xml:39(refentrytitle) sg.1.xml:46(refname) sg.1.xml:52(command)
 msgid "sg"
 msgstr "sg"
 
-#: sg.1.xml:44(refpurpose)
+#: sg.1.xml:47(refpurpose)
 msgid "execute command as different group ID"
 msgstr "führt einen Befehl unter einer anderen Gruppen-ID aus"
 
-#: sg.1.xml:50(arg) newgrp.1.xml:49(arg)
+#: sg.1.xml:53(arg) newgrp.1.xml:52(arg)
 msgid "-"
 msgstr "-"
 
-#: sg.1.xml:52(arg) expiry.1.xml:53(arg)
+#: sg.1.xml:55(arg)
 msgid "-c"
 msgstr "-c"
 
-#: sg.1.xml:51(arg)
+#: sg.1.xml:54(arg)
 msgid "group <placeholder-1/> command"
 msgstr "Gruppe <placeholder-1/> Befehl"
 
-#: sg.1.xml:60(para)
+#: sg.1.xml:63(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/"
@@ -3341,7 +3465,7 @@
 "aktiviert das Protokollieren der Aktivitäten von <command>sg</command> in "
 "»syslog«"
 
-#: sg.1.xml:119(para)
+#: sg.1.xml:122(para)
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -3367,18 +3491,17 @@
 "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry></phrase>."
 
-#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
-#: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
-#: pwck.8.xml:63(replaceable) pwck.8.xml:78(replaceable)
-#: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
+#: shadow.5.xml:38(refentrytitle) shadow.5.xml:45(refname)
+#: shadow.3.xml:38(refentrytitle) shadow.3.xml:45(refname)
+#: pwck.8.xml:65(replaceable) grpck.8.xml:57(replaceable)
 msgid "shadow"
 msgstr "shadow"
 
-#: shadow.5.xml:40(refpurpose)
+#: shadow.5.xml:46(refpurpose)
 msgid "shadowed password file"
 msgstr "Shadow-Passwortdatei"
 
-#: shadow.5.xml:45(para)
+#: shadow.5.xml:51(para)
 msgid ""
 "<filename>shadow</filename> is a file which contains the password "
 "information for the system's accounts and optional aging information."
@@ -3387,7 +3510,7 @@
 "Passwortinformationen für die Konten des Systems und fakultativ "
 "Informationen zum Verfall der Passwörter enthält."
 
-#: shadow.5.xml:51(para) gshadow.5.xml:49(para)
+#: shadow.5.xml:57(para) gshadow.5.xml:55(para)
 msgid ""
 "This file must not be readable by regular users if password security is to "
 "be maintained."
@@ -3395,7 +3518,7 @@
 "Um die Sicherheit der Passwörter zu gewährleisten, darf diese Datei nicht "
 "für normale Benutzer lesbar sein."
 
-#: shadow.5.xml:56(para)
+#: shadow.5.xml:62(para)
 msgid ""
 "Each line of this file contains 9 fields, separated by colons (<quote>:</"
 "quote>), in the following order:"
@@ -3403,21 +3526,21 @@
 "Jede Zeile dieser Datei enthält folgende neun Felder, die durch Doppelpunkt "
 "(<quote>:</quote>) getrennt werden:"
 
-#: shadow.5.xml:63(emphasis) passwd.5.xml:53(para)
+#: shadow.5.xml:69(emphasis) passwd.5.xml:59(para)
 msgid "login name"
 msgstr "Anmeldename"
 
-#: shadow.5.xml:65(para)
+#: shadow.5.xml:71(para)
 msgid "It must be a valid account name, which exist on the system."
 msgstr ""
 "Dabei muss es sich um eine gültigen Kontonamen handeln, der auf dem System "
 "existiert."
 
-#: shadow.5.xml:71(emphasis) gshadow.5.xml:68(emphasis)
+#: shadow.5.xml:77(emphasis) gshadow.5.xml:74(emphasis)
 msgid "encrypted password"
 msgstr "verschlüsseltes Passwort"
 
-#: shadow.5.xml:73(para) gshadow.5.xml:70(para)
+#: shadow.5.xml:79(para) gshadow.5.xml:76(para)
 msgid ""
 "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry> for details on how this string is interpreted."
@@ -3426,7 +3549,7 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> nachsehen, wenn Sie "
 "mehr über die Bedeutung dieser Zeichenkette wissen wollen."
 
-#: shadow.5.xml:78(para)
+#: shadow.5.xml:84(para)
 msgid ""
 "If the password field contains some string that is not a valid result of "
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
@@ -3439,7 +3562,7 @@
 "mit einem Unix-Passwort anmelden; eine Anmeldung auf anderem Wege wird "
 "dadurch nicht verhindert."
 
-#: shadow.5.xml:85(para)
+#: shadow.5.xml:91(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 "
@@ -3451,7 +3574,7 @@
 "welche die Datei <filename>/etc/shadow</filename> auswerten, dennoch den "
 "Zugang, wenn das Passwortfeld leer ist."
 
-#: shadow.5.xml:92(para) gshadow.5.xml:92(para)
+#: shadow.5.xml:98(para) gshadow.5.xml:98(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 "
@@ -3461,11 +3584,11 @@
 "Passwort gesperrt ist. Die übrigen Zeichen sind das Passwort vor der "
 "Sperrung."
 
-#: shadow.5.xml:102(emphasis)
+#: shadow.5.xml:108(emphasis)
 msgid "date of last password change"
 msgstr "Datum, an dem das Passwort das letzte Mal geändert wurde"
 
-#: shadow.5.xml:105(para)
+#: shadow.5.xml:111(para)
 msgid ""
 "The date of the last password change, expressed as the number of days since "
 "Jan 1, 1970."
@@ -3473,7 +3596,7 @@
 "Das Datum, als das Passwort das letzte Mal geändert wurde, wird als Anzahl "
 "der Tage seit dem 1. Januar 1970 ausgedrückt."
 
-#: shadow.5.xml:109(para)
+#: shadow.5.xml:115(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."
@@ -3481,16 +3604,16 @@
 "Dem Wert 0 kommt eine besondere Bedeutung zu: Der Benutzer sollte sein "
 "Passwort bei der nächsten Anmeldung ändern."
 
-#: shadow.5.xml:114(para)
+#: shadow.5.xml:120(para)
 msgid "An empty field means that password aging features are disabled."
 msgstr ""
 "Ein leeres Feld bedeutet, dass das Altern des Passworts abgeschaltet ist."
 
-#: shadow.5.xml:121(emphasis)
+#: shadow.5.xml:127(emphasis)
 msgid "minimum password age"
 msgstr "Mindestalter des Passworts"
 
-#: shadow.5.xml:123(para)
+#: shadow.5.xml:129(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."
@@ -3498,17 +3621,17 @@
 "Das Mindestalter des Passworts ist die Anzahl von Tagen, die ein Benutzer "
 "warten muss, bevor er sein Passwort wieder ändern darf."
 
-#: shadow.5.xml:128(para)
+#: shadow.5.xml:134(para)
 msgid "An empty field and value 0 mean that there are no minimum password age."
 msgstr ""
 "Eine leeres Feld oder der Wert 0 bedeuten, dass es kein Mindestalter eines "
 "Passworts gibt."
 
-#: shadow.5.xml:135(emphasis)
+#: shadow.5.xml:141(emphasis)
 msgid "maximum password age"
 msgstr "Höchstalter des Passworts"
 
-#: shadow.5.xml:137(para)
+#: shadow.5.xml:143(para)
 msgid ""
 "The maximum password age is the number of days after which the user will "
 "have to change her password."
@@ -3516,7 +3639,7 @@
 "Das Höchstalter des Passworts ist die Anzahl von Tagen, nach welcher der "
 "Benutzer sein Passwort ändern muss."
 
-#: shadow.5.xml:141(para)
+#: shadow.5.xml:147(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."
@@ -3525,7 +3648,7 @@
 "Benutzer wird bei der nächsten Anmeldung aufgefordert, sein Passwort zu "
 "ändern."
 
-#: shadow.5.xml:146(para)
+#: shadow.5.xml:152(para)
 msgid ""
 "An empty field means that there are no maximum password age, no password "
 "warning period, and no password inactivity period (see below)."
@@ -3533,7 +3656,7 @@
 "Ein leeres Feld bedeutet, dass es kein Höchstalter für das Passwort, keine "
 "Vorwarnung und keine Dauer der Untätigkeit (siehe unten) gibt."
 
-#: shadow.5.xml:151(para)
+#: shadow.5.xml:157(para)
 msgid ""
 "If the maximum password age is lower than the minimum password age, the user "
 "cannot change her password."
@@ -3541,11 +3664,11 @@
 "Wenn das Höchstalter niedriger als das Mindestalter eines Passworts ist, "
 "kann ein Benutzer sein Passwort nicht ändern."
 
-#: shadow.5.xml:159(emphasis)
+#: shadow.5.xml:165(emphasis)
 msgid "password warning period"
 msgstr "Passwortvorwarndauer"
 
-#: shadow.5.xml:162(para)
+#: shadow.5.xml:168(para)
 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."
@@ -3553,17 +3676,17 @@
 "Die Anzahl von Tagen, während welcher der Benutzer vorgewarnt wird, bevor "
 "sein Passwort abläuft (siehe das Höchstalter des Passworts)."
 
-#: shadow.5.xml:167(para)
+#: shadow.5.xml:173(para)
 msgid ""
 "An empty field and value 0 mean that there are no password warning period."
 msgstr ""
 "Ein leeres Feld oder der Wert 0 bedeutet, dass es keine Vorwarnung gibt."
 
-#: shadow.5.xml:175(emphasis)
+#: shadow.5.xml:181(emphasis)
 msgid "password inactivity period"
 msgstr "Dauer der fehlenden Verwendung des Passworts"
 
-#: shadow.5.xml:178(para)
+#: shadow.5.xml:184(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 "
@@ -3573,7 +3696,7 @@
 "abgelaufen ist (vergleiche oben das Höchstalter des Passworts), noch "
 "verwenden kann (und während des nächsten Logins ändern muss)."
 
-#: shadow.5.xml:184(para)
+#: shadow.5.xml:190(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 "
@@ -3583,18 +3706,18 @@
 "verstrichen ist, kann sich der Benutzer mit seinem Passwort nicht mehr "
 "anmelden. Er muss sich dann an den Administrator wenden."
 
-#: shadow.5.xml:189(para)
+#: shadow.5.xml:195(para)
 msgid ""
 "An empty field means that there are no enforcement of an inactivity period."
 msgstr ""
 "Ein leeres Feld bedeutet, dass es keine Höchstdauer zwischen Ablauf des "
 "Passworts und erneuter Anmeldung des Benutzers gibt."
 
-#: shadow.5.xml:197(emphasis)
+#: shadow.5.xml:203(emphasis)
 msgid "account expiration date"
 msgstr "Datum des Verfalls des Kontos"
 
-#: shadow.5.xml:200(para)
+#: shadow.5.xml:206(para)
 msgid ""
 "The date of expiration of the account, expressed as the number of days since "
 "Jan 1, 1970."
@@ -3602,7 +3725,7 @@
 "Das Datum, an dem das Konto verfällt, wird als Anzahl der Tage seit dem 1. "
 "Januar 1970 ausgedrückt."
 
-#: shadow.5.xml:204(para)
+#: shadow.5.xml:210(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 "
@@ -3613,11 +3736,11 @@
 "anmelden. Im letzteren Fall kann sich der Benutzer nur nicht mehr mit seinem "
 "(alten) Passwort anmelden."
 
-#: shadow.5.xml:210(para)
+#: shadow.5.xml:216(para)
 msgid "An empty field means that the account will never expire."
 msgstr "Ein leeren Feld bedeutet, dass das Konto nicht verfallen wird."
 
-#: shadow.5.xml:213(para)
+#: shadow.5.xml:219(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."
@@ -3626,23 +3749,23 @@
 "das Konto nicht verfällt als auch, dass das Konto bereits am 1. Januar 1970 "
 "verfallen ist."
 
-#: shadow.5.xml:221(emphasis)
+#: shadow.5.xml:227(emphasis)
 msgid "reserved field"
 msgstr "reserviertes Feld"
 
-#: shadow.5.xml:223(para)
+#: shadow.5.xml:229(para)
 msgid "This field is reserved for future use."
 msgstr "Dieses Feld ist für zukünftigen Gebrauch reserviert."
 
-#: shadow.5.xml:245(filename)
+#: shadow.5.xml:251(filename)
 msgid "/etc/shadow-"
 msgstr "/etc/shadow-"
 
-#: shadow.5.xml:247(para)
+#: shadow.5.xml:253(para)
 msgid "Backup file for /etc/shadow."
 msgstr "Sicherungskopie von /etc/shadow"
 
-#: shadow.5.xml:248(para) passwd.5.xml:134(para)
+#: shadow.5.xml:254(para) passwd.5.xml:140(para)
 msgid ""
 "Note that this file is used by the tools of the shadow toolsuite, but not by "
 "all user and password management tools."
@@ -3651,7 +3774,7 @@
 "verwendet wird, aber nicht von allen sonstigen Programmen zur Benutzer- und "
 "Passwortverwaltung."
 
-#: shadow.5.xml:259(para)
+#: shadow.5.xml:265(para)
 msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -3683,89 +3806,89 @@
 "<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: shadow.3.xml:36(refmiscinfo)
+#: shadow.3.xml:40(refmiscinfo)
 msgid "Library Calls"
 msgstr "Bibliotheksaufrufe"
 
-#: shadow.3.xml:40(refname)
+#: shadow.3.xml:46(refname)
 msgid "getspnam"
 msgstr "getspnam"
 
 # SB: Übersetzung iO?
-#: shadow.3.xml:41(refpurpose)
+#: shadow.3.xml:47(refpurpose)
 msgid "encrypted password file routines"
 msgstr "Routinen für die Datei, die die verschlüsselten Passwörter enthält"
 
-#: shadow.3.xml:45(title)
+#: shadow.3.xml:51(title)
 msgid "SYNTAX"
 msgstr "SYNTAX"
 
-#: shadow.3.xml:47(emphasis)
+#: shadow.3.xml:53(emphasis)
 msgid "#include <shadow.h>"
 msgstr "#include <shadow.h>"
 
-#: shadow.3.xml:51(emphasis)
+#: shadow.3.xml:57(emphasis)
 msgid "struct spwd *getspent();"
 msgstr "struct spwd *getspent();"
 
-#: shadow.3.xml:55(emphasis)
+#: shadow.3.xml:61(emphasis)
 msgid "struct spwd *getspnam(char"
 msgstr "truct spwd *getspnam(char"
 
-#: shadow.3.xml:56(emphasis)
+#: shadow.3.xml:62(emphasis)
 msgid "*name"
 msgstr "*name"
 
-#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis)
-#: shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:62(emphasis) shadow.3.xml:75(emphasis)
+#: shadow.3.xml:80(emphasis) shadow.3.xml:86(emphasis)
 msgid ");"
 msgstr ");"
 
-#: shadow.3.xml:60(emphasis)
+#: shadow.3.xml:66(emphasis)
 msgid "void setspent();"
 msgstr "void setspent();"
 
-#: shadow.3.xml:64(emphasis)
+#: shadow.3.xml:70(emphasis)
 msgid "void endspent();"
 msgstr "void endspent();"
 
-#: shadow.3.xml:68(emphasis)
+#: shadow.3.xml:74(emphasis)
 msgid "struct spwd *fgetspent(FILE"
 msgstr "struct spwd *fgetspent(FILE"
 
-#: shadow.3.xml:69(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:75(emphasis) shadow.3.xml:86(emphasis)
 msgid "*fp"
 msgstr "*fp"
 
-#: shadow.3.xml:73(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "struct spwd *sgetspent(char"
 msgstr "struct spwd *sgetspent(char"
 
-#: shadow.3.xml:74(emphasis)
+#: shadow.3.xml:80(emphasis)
 msgid "*cp"
 msgstr "*cp"
 
-#: shadow.3.xml:78(emphasis)
+#: shadow.3.xml:84(emphasis)
 msgid "int putspent(struct spwd"
 msgstr "int putspent(struct spwd"
 
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "*p,"
 msgstr "*p,"
 
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "FILE"
 msgstr "DATEIEN"
 
-#: shadow.3.xml:84(emphasis)
+#: shadow.3.xml:90(emphasis)
 msgid "int lckpwdf();"
 msgstr "int lckpwdf();"
 
-#: shadow.3.xml:88(emphasis)
+#: shadow.3.xml:94(emphasis)
 msgid "int ulckpwdf();"
 msgstr "int ulckpwdf();"
 
-#: shadow.3.xml:94(para)
+#: shadow.3.xml:100(para)
 msgid ""
 "<emphasis remap=\"I\">shadow</emphasis> manipulates the contents of the "
 "shadow password file, <filename>/etc/shadow</filename>. The structure in the "
@@ -3775,7 +3898,7 @@
 "Passwort-Datei <filename>/etc/shadow</filename>. Der Aufbau der Datei "
 "<emphasis remap=\"I\">#include</emphasis> ist:"
 
-#: shadow.3.xml:99(programlisting)
+#: shadow.3.xml:105(programlisting)
 #, no-wrap
 msgid ""
 "struct spwd {\n"
@@ -3804,34 +3927,34 @@
 "}\n"
 "    "
 
-#: shadow.3.xml:111(para)
+#: shadow.3.xml:117(para)
 msgid "The meanings of each field are:"
 msgstr "Die Bedeutung dieser Felder ist:"
 
 # SB: Übersetzung von 'null-terminated'?
-#: shadow.3.xml:114(para)
+#: shadow.3.xml:120(para)
 msgid "sp_namp - pointer to null-terminated user name"
 msgstr "sp_namp - Verweis auf Benutzername, der mit einer Null endet"
 
-#: shadow.3.xml:117(para)
+#: shadow.3.xml:123(para)
 msgid "sp_pwdp - pointer to null-terminated password"
 msgstr "sp_pwdp - Verweis auf Passwort, das mit einer Null endet"
 
-#: shadow.3.xml:120(para)
+#: shadow.3.xml:126(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:123(para)
+#: shadow.3.xml:129(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:126(para)
+#: shadow.3.xml:132(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:129(para)
+#: shadow.3.xml:135(para)
 msgid ""
 "sp_warn - days before password is to expire that user is warned of pending "
 "password expiration"
@@ -3839,7 +3962,7 @@
 "sp_warn - Anzahl der Tage ehe das Passwort verfällt, an denen der Benutzer "
 "vor dem Verfall gewarnt wird"
 
-#: shadow.3.xml:134(para)
+#: shadow.3.xml:140(para)
 msgid ""
 "sp_inact - days after password expires that account is considered inactive "
 "and disabled"
@@ -3847,17 +3970,17 @@
 "sp_inact - Anzahl der Tage nach dem Verfall des Passworts, nach denen das "
 "Konto als inaktiv angesehen und abgeschaltet wird"
 
-#: shadow.3.xml:139(para)
+#: shadow.3.xml:145(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:142(para)
+#: shadow.3.xml:148(para)
 msgid "sp_flag - reserved for future use"
 msgstr "sp_flag - für zukünftigen Gebrauch reserviert"
 
-#: shadow.3.xml:150(para)
+#: shadow.3.xml:156(para)
 msgid ""
 "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, "
 "<emphasis>fgetspent</emphasis>, and <emphasis>sgetspent</emphasis> each "
@@ -3881,7 +4004,7 @@
 "emphasis> sucht ab der aktuellen Position in der Datei nach einem Eintrag, "
 "der mit <emphasis>name</emphasis> übereinstimmt."
 
-#: shadow.3.xml:163(para)
+#: shadow.3.xml:169(para)
 msgid ""
 "<emphasis>setspent</emphasis> and <emphasis>endspent</emphasis> may be used "
 "to begin and end, respectively, access to the shadow password file."
@@ -3890,7 +4013,7 @@
 "verwendet werden, um den Zugriff auf die Shadow-Passwort-Datei zu beginnen "
 "oder zu beenden."
 
-#: shadow.3.xml:169(para)
+#: shadow.3.xml:175(para)
 msgid ""
 "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines "
 "should be used to insure exclusive access to the <filename>/etc/shadow</"
@@ -3911,7 +4034,7 @@
 "scheitern, gibt <emphasis>lckpwdf</emphasis> -1 zurück. Wurden beide Sperren "
 "erhalten, wird 0 zurückgegeben."
 
-#: shadow.3.xml:184(para)
+#: shadow.3.xml:190(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 "
@@ -3922,7 +4045,7 @@
 "<emphasis>int</emphasis> als Rückgabewert haben, geben im Erfolgsfall 0 und "
 "beim Scheitern -1 zurück."
 
-#: shadow.3.xml:194(para)
+#: shadow.3.xml:200(para)
 msgid ""
 "These routines may only be used by the superuser as access to the shadow "
 "password file is restricted."
@@ -3930,7 +4053,7 @@
 "Diese Routinen können nur von Root verwendet werden, da der Zugriff auf die "
 "Shadow-Passwort-Datei beschränkt ist."
 
-#: shadow.3.xml:214(para)
+#: shadow.3.xml:220(para)
 msgid ""
 "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -3940,32 +4063,32 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: pwconv.8.xml:43(refentrytitle) pwconv.8.xml:48(refname)
-#: pwconv.8.xml:57(command) login.defs.5.xml:401(term)
+#: pwconv.8.xml:44(refentrytitle) pwconv.8.xml:51(refname)
+#: pwconv.8.xml:60(command) login.defs.5.xml:404(term)
 msgid "pwconv"
 msgstr "pwconv"
 
-#: pwconv.8.xml:49(refname) pwconv.8.xml:60(command)
-#: login.defs.5.xml:410(term)
+#: pwconv.8.xml:52(refname) pwconv.8.xml:66(command)
+#: login.defs.5.xml:413(term)
 msgid "pwunconv"
 msgstr "pwunconv"
 
-#: pwconv.8.xml:50(refname) pwconv.8.xml:63(command)
-#: login.defs.5.xml:314(term)
+#: pwconv.8.xml:53(refname) pwconv.8.xml:72(command)
+#: login.defs.5.xml:317(term)
 msgid "grpconv"
 msgstr "grpconv"
 
-#: pwconv.8.xml:51(refname) pwconv.8.xml:66(command)
-#: login.defs.5.xml:320(term)
+#: pwconv.8.xml:54(refname) pwconv.8.xml:78(command)
+#: login.defs.5.xml:323(term)
 msgid "grpunconv"
 msgstr "grpunconv"
 
-#: pwconv.8.xml:52(refpurpose)
+#: pwconv.8.xml:55(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:72(para)
+#: pwconv.8.xml:87(para)
 msgid ""
 "The <command>pwconv</command> command creates <emphasis remap=\"I\">shadow</"
 "emphasis> from <emphasis remap=\"I\">passwd</emphasis> and an optionally "
@@ -3976,7 +4099,7 @@
 "Datei und gegebenenfalls aus einer bereits vorhandenen <emphasis remap=\"I"
 "\">shadow</emphasis>-Datei."
 
-#: pwconv.8.xml:77(para)
+#: pwconv.8.xml:92(para)
 msgid ""
 "<command>pwconv</command> does not work with <option>USE_TCB</option> "
 "enabled. To convert to tcb passwords, you should first use <command>pwconv</"
@@ -3994,7 +4117,7 @@
 "<filename>login.defs</filename> reaktivieren."
 
 # SB: Translation ok?
-#: pwconv.8.xml:87(para)
+#: pwconv.8.xml:102(para)
 msgid ""
 "The <command>pwunconv</command> command creates <emphasis remap=\"I"
 "\">passwd</emphasis> from <emphasis remap=\"I\">passwd</emphasis> and "
@@ -4006,7 +4129,7 @@
 "emphasis>- und <emphasis remap=\"I\">shadow</emphasis>-Datei und entfernt "
 "anschließend die<emphasis remap=\"I\">shadow</emphasis>-Datei."
 
-#: pwconv.8.xml:93(para)
+#: pwconv.8.xml:108(para)
 msgid ""
 "<command>pwunconv</command> does not work with <option>USE_TCB</option> "
 "enabled. You should first switch back from tcb to shadowed passwords using "
@@ -4019,7 +4142,7 @@
 "Verwendung von  <command>pwunconv</command> <option>USE_TCB</option> in "
 "<filename>login.defs</filename> deaktivieren."
 
-#: pwconv.8.xml:102(para)
+#: pwconv.8.xml:117(para)
 msgid ""
 "The <command>grpconv</command> command creates <emphasis remap=\"I"
 "\">gshadow</emphasis> from <emphasis remap=\"I\">group</emphasis> and an "
@@ -4030,7 +4153,7 @@
 "Datei und gegebenenfalls aus einer bereits vorhandenen <emphasis remap=\"I"
 "\">gshadow</emphasis>-Datei."
 
-#: pwconv.8.xml:108(para)
+#: pwconv.8.xml:123(para)
 msgid ""
 "The <command>grpunconv</command> command creates <emphasis remap=\"I"
 "\">group</emphasis> from <emphasis remap=\"I\">group</emphasis> and "
@@ -4042,7 +4165,7 @@
 "und <emphasis remap=\"I\">gshadow</emphasis>-Datei und entfernt anschließend "
 "die <emphasis remap=\"I\">gshadow</emphasis>-Datei."
 
-#: pwconv.8.xml:115(para)
+#: pwconv.8.xml:130(para)
 msgid ""
 "These four programs all operate on the normal and shadow password and group "
 "files: <filename>/etc/passwd</filename>, <filename>/etc/group</filename>, "
@@ -4053,7 +4176,7 @@
 "<filename>/etc/group</filename>, <filename>/etc/shadow</filename> und "
 "<filename>/etc/gshadow</filename>."
 
-#: pwconv.8.xml:122(para)
+#: pwconv.8.xml:137(para)
 msgid ""
 "Each program acquires the necessary locks before conversion. "
 "<command>pwconv</command> and <command>grpconv</command> are similar. First, "
@@ -4074,7 +4197,7 @@
 "Shadow-Datei zu aktualisieren, falls die Hauptdatei von Hand bearbeitet "
 "wurde."
 
-#: pwconv.8.xml:133(para)
+#: pwconv.8.xml:148(para)
 msgid ""
 "<command>pwconv</command> will use the values of <emphasis remap=\"I"
 "\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis>, "
@@ -4087,7 +4210,7 @@
 "defs</filename>, wenn neue Einträge zu <filename>/etc/shadow</filename> "
 "hinzugefügt werden."
 
-#: pwconv.8.xml:142(para)
+#: pwconv.8.xml:157(para)
 msgid ""
 "Likewise <command>pwunconv</command> and <command>grpunconv</command> are "
 "similar. Passwords in the main file are updated from the shadowed file. "
@@ -4104,8 +4227,21 @@
 "Passwörtern geht durch <command>pwunconv</command> verloren. Es wird aber so "
 "viel wie möglich umgewandelt."
 
-#: pwconv.8.xml:154(para)
+#: pwconv.8.xml:169(para)
+#, fuzzy
+#| msgid ""
+#| "The options which apply to the <command>vipw</command> and <command>vigr</"
+#| "command> commands are:"
 msgid ""
+"The options which apply to the <command>pwconv</command>, <command>pwunconv</"
+"command>, <command>grpconv</command>, and <command>grpunconv</command> "
+"commands are:"
+msgstr ""
+"Die Optionen, die von den Befehlen <command>vipw</command> und "
+"<command>vigr</command> unterstützt werden, sind:"
+
+#: pwconv.8.xml:199(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. "
 "Please run <command>pwck</command> and <command>grpck</command> to correct "
@@ -4117,7 +4253,7 @@
 "ausführen, um solche Fehler zu entfernen, bevor Sie von oder zu Shadow-"
 "Passwörtern oder -gruppen umwandeln."
 
-#: pwconv.8.xml:165(para)
+#: pwconv.8.xml:210(para)
 msgid ""
 "The following configuration variable in <filename>/etc/login.defs</filename> "
 "changes the behavior of <command>grpconv</command> and <command>grpunconv</"
@@ -4127,7 +4263,7 @@
 "beeinflussen das Verhalten von <command>grpconv</command> und "
 "<command>grpunconv</command>:"
 
-#: pwconv.8.xml:173(para)
+#: pwconv.8.xml:218(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of <command>pwconv</command>:"
@@ -4135,7 +4271,7 @@
 "Die folgenden Konfigurationsvariablen in <filename>/etc/login.defs</"
 "filename> beeinflussen das Verhalten von <command>pwconv</command>:"
 
-#: pwconv.8.xml:200(para)
+#: pwconv.8.xml:245(para)
 msgid ""
 "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -4155,37 +4291,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>tcb_unconvert</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry></phrase>."
 
-#: pwck.8.xml:43(refentrytitle) pwck.8.xml:48(refname) pwck.8.xml:54(command)
-#: pwck.8.xml:69(command) login.defs.5.xml:392(term)
+#: pwck.8.xml:44(refentrytitle) pwck.8.xml:51(refname) pwck.8.xml:57(command)
+#: login.defs.5.xml:395(term)
 msgid "pwck"
 msgstr "pwck"
 
-#: pwck.8.xml:49(refpurpose)
+#: pwck.8.xml:52(refpurpose)
 msgid "verify integrity of password files"
 msgstr "überprüft die Stimmigkeit der Passwortdateien"
 
-#: pwck.8.xml:55(arg) pwck.8.xml:70(arg) pwck.8.xml:177(option)
-msgid "-q"
-msgstr "-q"
-
-#: pwck.8.xml:56(arg) pwck.8.xml:198(option) grpck.8.xml:58(arg)
-#: grpck.8.xml:149(option)
-msgid "-s"
-msgstr "-s"
-
-#: pwck.8.xml:59(replaceable) pwck.8.xml:74(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:381(term)
+#: pwck.8.xml:61(replaceable) passwd.5.xml:38(refentrytitle)
+#: passwd.5.xml:45(refname) passwd.1.xml:45(refentrytitle)
+#: passwd.1.xml:52(refname) passwd.1.xml:58(command)
+#: login.defs.5.xml:384(term)
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:71(arg) pwck.8.xml:188(option) login.1.xml:222(option)
-#: grpck.8.xml:49(arg) grpck.8.xml:139(option)
-msgid "-r"
-msgstr "-r"
-
-#: pwck.8.xml:87(para)
+#: pwck.8.xml:74(para)
 msgid ""
 "The <command>pwck</command> command verifies the integrity of the users and "
 "authentication information. It checks that all entries in <filename>/etc/"
@@ -4204,35 +4326,35 @@
 "aufgefordert, Einträge zu löschen, die falsch formatiert sind oder andere "
 "unbehebbare Fehler enthalten."
 
-#: pwck.8.xml:99(para) grpck.8.xml:80(para)
+#: pwck.8.xml:86(para) grpck.8.xml:75(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:102(para) grpck.8.xml:84(para)
+#: pwck.8.xml:89(para) grpck.8.xml:79(para)
 msgid "the correct number of fields"
 msgstr "die richtige Anzahl von Feldern"
 
-#: pwck.8.xml:105(para)
+#: pwck.8.xml:92(para)
 msgid "a unique and valid user name"
 msgstr "einen eindeutigen und gültigen Benutzernamen"
 
-#: pwck.8.xml:108(para)
+#: pwck.8.xml:95(para)
 msgid "a valid user and group identifier"
 msgstr "eine gültige Benutzer- und Gruppenkennung"
 
-#: pwck.8.xml:111(para)
+#: pwck.8.xml:98(para)
 msgid "a valid primary group"
 msgstr "eine gültige Hauptgruppe"
 
-#: pwck.8.xml:114(para)
+#: pwck.8.xml:101(para)
 msgid "a valid home directory"
 msgstr "ein gültiges Home-Verzeichnis"
 
-#: pwck.8.xml:117(para)
+#: pwck.8.xml:104(para)
 msgid "a valid login shell"
 msgstr "eine gültige Anmelde-Shell"
 
-#: pwck.8.xml:121(para)
+#: pwck.8.xml:108(para)
 msgid ""
 "<filename>shadow</filename> checks are enabled when a second file parameter "
 "is specified or when <filename>/etc/shadow</filename> exists on the system."
@@ -4241,34 +4363,34 @@
 "zweiter Parameter angegeben wird oder auf dem System <filename>/etc/shadow</"
 "filename>  existiert."
 
-#: pwck.8.xml:126(para)
+#: pwck.8.xml:113(para)
 msgid "These checks are the following:"
 msgstr "Diese Tests umfassen Folgendes:"
 
-#: pwck.8.xml:131(para)
+#: pwck.8.xml:118(para)
 msgid ""
 "every passwd entry has a matching shadow entry, and every shadow entry has a "
 "matching passwd entry"
 msgstr ""
 "ob jedem Eintrag in passwd ein Eintrag in shadow entspricht und umgekehrt"
 
-#: pwck.8.xml:137(para)
+#: pwck.8.xml:124(para)
 msgid "passwords are specified in the shadowed file"
 msgstr "ob die Passwörter in der Shadow-Datei niedergelegt sind"
 
-#: pwck.8.xml:140(para)
+#: pwck.8.xml:127(para)
 msgid "shadow entries have the correct number of fields"
 msgstr "ob die shadow-Einträge die richtige Anzahl von Feldern haben"
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:130(para)
 msgid "shadow entries are unique in shadow"
 msgstr "ob die Shadow-Einträge in shadow eindeutig sind"
 
-#: pwck.8.xml:146(para)
+#: pwck.8.xml:133(para)
 msgid "the last password changes are not in the future"
 msgstr "dass das Datum der letzten Passwortänderung nicht in der Zukunft liegt"
 
-#: pwck.8.xml:150(para)
+#: pwck.8.xml:137(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 "
@@ -4288,7 +4410,7 @@
 "Fehlern wird eine Warnung abgegeben und der Benutzer aufgefordert, den "
 "Fehler mittels des Befehls <command>usermod</command> zu beheben."
 
-#: pwck.8.xml:161(para)
+#: pwck.8.xml:148(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> "
@@ -4299,13 +4421,24 @@
 "sollte <command>pwck</command> verwendet werden, um den betreffenden Eintrag "
 "zu entfernen."
 
-#: pwck.8.xml:171(para)
+#: pwck.8.xml:158(para) grpck.8.xml:129(para)
+#, fuzzy
+#| msgid ""
+#| "Except for the <option>-A</option> and <option>-M</option> options, the "
+#| "options cannot be combined."
+msgid ""
+"The <option>-r</option> and <option>-s</option> options cannot be combined."
+msgstr ""
+"Außer die Optionen <option>-A</option> und <option>-M</option> können die "
+"übrigen Optionen nicht zusammen verwendet werden."
+
+#: pwck.8.xml:162(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:180(para)
+#: pwck.8.xml:175(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
@@ -4313,11 +4446,23 @@
 "meldet nur Fehler. Warnungen, die keine Handlung des Benutzers erfordern, "
 "werden nicht angezeigt"
 
-#: pwck.8.xml:191(para)
+#: pwck.8.xml:182(term) grpck.8.xml:144(term)
+#, fuzzy
+#| msgid "<option>-r</option>, <option>--remove</option>"
+msgid "<option>-r</option>, <option>--read-only</option>"
+msgstr "<option>-r</option>, <option>--remove</option>"
+
+#: pwck.8.xml:184(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:201(para)
+#: pwck.8.xml:203(term) grpck.8.xml:167(term)
+#, fuzzy
+#| msgid "<option>-s</option>, <option>--shadow</option>"
+msgid "<option>-s</option>, <option>--sort</option>"
+msgstr "<option>-s</option>, <option>--shadow</option>"
+
+#: pwck.8.xml:205(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
@@ -4325,12 +4470,12 @@
 "ordnet die Einträge in <filename>/etc/passwd</filename> und <filename>/etc/"
 "shadow</filename> nach der UID"
 
-#: pwck.8.xml:205(para)
+#: pwck.8.xml:209(para)
 msgid "This option has no effect when <option>USE_TCB</option> is enabled."
 msgstr ""
 "Diese Option ist wirkungslos, wenn <option>USE_TCB</option> aktiviert ist."
 
-#: pwck.8.xml:212(para)
+#: pwck.8.xml:216(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename><phrase condition=\"tcb"
@@ -4344,7 +4489,7 @@
 "Benutzer kann andere Dateien mit den Parametern <replaceable>passwd</"
 "replaceable> und <replaceable>shadow</replaceable> auswählen."
 
-#: pwck.8.xml:221(para)
+#: pwck.8.xml:225(para)
 msgid ""
 "Note that when <option>USE_TCB</option> is enabled, you cannot specify an "
 "alternative <replaceable>shadow</replaceable> file. In future releases, this "
@@ -4355,27 +4500,27 @@
 "Versionen kann dieser Parameter durch ein anderes TCB-Verzeichnis ersetzt "
 "werden."
 
-#: pwck.8.xml:290(para)
+#: pwck.8.xml:294(para)
 msgid "one or more bad password entries"
 msgstr "ein oder mehrere fehlerhafte Passworteinträge"
 
-#: pwck.8.xml:296(para)
+#: pwck.8.xml:300(para)
 msgid "can't open password files"
 msgstr "Die Passwortdatei kann nicht geöffnet werden."
 
-#: pwck.8.xml:302(para)
+#: pwck.8.xml:306(para)
 msgid "can't lock password files"
 msgstr "Die Passwortdatei kann nicht gesperret werden."
 
-#: pwck.8.xml:308(para)
+#: pwck.8.xml:312(para)
 msgid "can't update password files"
 msgstr "Die Passwortdatei kann nicht aktualisieren werden."
 
-#: pwck.8.xml:314(para)
+#: pwck.8.xml:318(para)
 msgid "can't sort password files"
 msgstr "Die Passwortdatei kann nicht sortieren werden."
 
-#: pwck.8.xml:272(para)
+#: pwck.8.xml:276(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4383,7 +4528,7 @@
 "Der Befehl <command>pwck</command> gibt beim Beenden folgende Werte zurück: "
 "<placeholder-1/>"
 
-#: pwck.8.xml:323(para)
+#: pwck.8.xml:327(para)
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>grpck</"
@@ -4403,15 +4548,15 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
+#: porttime.5.xml:38(refentrytitle) porttime.5.xml:45(refname)
 msgid "porttime"
 msgstr "porttime"
 
-#: porttime.5.xml:40(refpurpose)
+#: porttime.5.xml:46(refpurpose)
 msgid "port access time file"
 msgstr "Datei für zeitlich begrenzten Zugang zu Ports"
 
-#: porttime.5.xml:45(para)
+#: porttime.5.xml:51(para)
 msgid ""
 "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, "
 "user names, and permitted login times."
@@ -4419,7 +4564,7 @@
 "<emphasis remap=\"I\">porttime</emphasis> enthält eine Liste von tty-"
 "Geräten, Benutzernamen und zulässigen Anmeldezeiten."
 
-#: porttime.5.xml:50(para)
+#: porttime.5.xml:56(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 "
@@ -4436,7 +4581,7 @@
 "Eintrag auf alle Benutzernamen zutrifft. Das dritte Feld ist eine Liste von "
 "Anmeldezeiten, die durch Kommata getrennt sind."
 
-#: porttime.5.xml:59(para)
+#: porttime.5.xml:65(para)
 msgid ""
 "Each access time entry consists of zero or more days of the week, "
 "abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</"
@@ -4455,11 +4600,11 @@
 "<emphasis>Al</emphasis> wird jeder Tag gewählt. Falls keine Tage angegeben "
 "werden, wird <emphasis>Al</emphasis> angenommen."
 
-#: porttime.5.xml:73(title)
+#: porttime.5.xml:79(title)
 msgid "EXAMPLES"
 msgstr "BEISPIELE"
 
-#: porttime.5.xml:74(para)
+#: porttime.5.xml:80(para)
 msgid ""
 "The following entry allows access to user <emphasis remap=\"B\">jfh</"
 "emphasis> on every port during weekdays from 9am to 5pm."
@@ -4467,11 +4612,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:80(para)
+#: porttime.5.xml:86(para)
 msgid "*:jfh:Wk0900-1700"
 msgstr "*:jfh:Wk0900-1700"
 
-#: porttime.5.xml:82(para)
+#: porttime.5.xml:88(para)
 msgid ""
 "The following entries allow access only to the users <emphasis>root</"
 "emphasis> and <emphasis>oper</emphasis> on <filename>/dev/console</filename> "
@@ -4485,7 +4630,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:91(programlisting)
+#: porttime.5.xml:97(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -4498,7 +4643,7 @@
 "      console:*:\n"
 "    "
 
-#: porttime.5.xml:96(para)
+#: porttime.5.xml:102(para)
 msgid ""
 "The following entry allows access for the user <emphasis>games</emphasis> on "
 "any port during non-working hours."
@@ -4506,19 +4651,19 @@
 "Der folgende Eintrag erlaubt dem Benutzer <emphasis>games</emphasis> Zugriff "
 "auf jeden Port außerhalb von Arbeitszeiten."
 
-#: porttime.5.xml:101(para)
+#: porttime.5.xml:107(para)
 msgid "*:games:Wk1700-0900,SaSu0000-2400"
 msgstr "*:games:Wk1700-0900,SaSu0000-2400"
 
-#: porttime.5.xml:108(filename) logoutd.8.xml:67(filename)
+#: porttime.5.xml:114(filename) logoutd.8.xml:73(filename)
 msgid "/etc/porttime"
 msgstr "/etc/porttime"
 
-#: porttime.5.xml:110(para) logoutd.8.xml:69(para)
+#: porttime.5.xml:116(para) logoutd.8.xml:75(para)
 msgid "File containing port access."
 msgstr "Datei, die den Port-Zugriff enthält."
 
-#: porttime.5.xml:118(para) login.access.5.xml:109(para)
+#: porttime.5.xml:124(para) login.access.5.xml:115(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -4526,11 +4671,11 @@
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: passwd.5.xml:40(refpurpose)
+#: passwd.5.xml:46(refpurpose)
 msgid "the password file"
 msgstr "die Passwortdatei"
 
-#: passwd.5.xml:45(para)
+#: passwd.5.xml:51(para)
 msgid ""
 "<filename>/etc/passwd</filename> contains one line for each user account, "
 "with seven fields delimited by colons (<quote>:</quote>). These fields are:"
@@ -4539,32 +4684,32 @@
 "wobei jeder Eintrag sieben Felder besitzt, die durch Doppelpunkt (<quote>:</"
 "quote>) getrennt sind. Diese Felder sind:"
 
-#: passwd.5.xml:56(para)
+#: passwd.5.xml:62(para)
 msgid "optional encrypted password"
 msgstr "optional verschlüsseltes Passwort"
 
-#: passwd.5.xml:59(para)
+#: passwd.5.xml:65(para)
 msgid "numerical user ID"
 msgstr "numerische Benutzer-ID"
 
-#: passwd.5.xml:62(para)
+#: passwd.5.xml:68(para)
 msgid "numerical group ID"
 msgstr "numerische Gruppen-ID"
 
-#: passwd.5.xml:65(para)
+#: passwd.5.xml:71(para)
 msgid "user name or comment field"
 msgstr "Benutzername oder Kommentarfeld"
 
-#: passwd.5.xml:68(para)
+#: passwd.5.xml:74(para)
 msgid "user home directory"
 msgstr "Home-Verzeichnis des Benutzers"
 
 # SB: Übersetzung von "command interpreter"?
-#: passwd.5.xml:71(para)
+#: passwd.5.xml:77(para)
 msgid "optional user command interpreter"
 msgstr "optional Befehlsinterpreter des Benutzers"
 
-#: passwd.5.xml:75(para)
+#: passwd.5.xml:81(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 "
@@ -4596,7 +4741,7 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>."
 
-#: passwd.5.xml:94(para)
+#: passwd.5.xml:100(para)
 msgid ""
 "The comment field is used by various system utilities, such as "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
@@ -4606,7 +4751,7 @@
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> ausgewertet."
 
-#: passwd.5.xml:100(para)
+#: passwd.5.xml:106(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 "
@@ -4618,7 +4763,7 @@
 "setzen."
 
 # SB: Übersetzung von "command language interpreter"?
-#: passwd.5.xml:106(para)
+#: passwd.5.xml:112(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 "
@@ -4633,19 +4778,19 @@
 "setzen. Falls dieses Feld leer ist, wird ihm standardmäßig der Wert "
 "<filename>/bin/sh</filename> zugewiesen."
 
-#: passwd.5.xml:127(para)
+#: passwd.5.xml:133(para)
 msgid "optional encrypted password file"
 msgstr "optionale Datei für verschlüsseltes Passwort"
 
-#: passwd.5.xml:131(filename)
+#: passwd.5.xml:137(filename)
 msgid "/etc/passwd-"
 msgstr "/etc/passwd-"
 
-#: passwd.5.xml:133(para)
+#: passwd.5.xml:139(para)
 msgid "Backup file for /etc/passwd."
 msgstr "Sicherungskopie von /etc/passwd"
 
-#: passwd.5.xml:145(para)
+#: passwd.5.xml:151(para)
 msgid ""
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getent</"
@@ -4681,11 +4826,11 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: passwd.1.xml:50(refpurpose)
+#: passwd.1.xml:53(refpurpose)
 msgid "change user password"
 msgstr "ändert das Passwort eines Benutzers"
 
-#: passwd.1.xml:67(para)
+#: passwd.1.xml:70(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 "
@@ -4698,11 +4843,11 @@
 "Mit <command>passwd</command> können auch die Informationen über das Konto "
 "und die Gültigkeitsdauer des Passworts verändert werden."
 
-#: passwd.1.xml:76(title)
+#: passwd.1.xml:79(title)
 msgid "Password Changes"
 msgstr "Verändern des Passworts"
 
-#: passwd.1.xml:77(para)
+#: passwd.1.xml:80(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 "
@@ -4715,7 +4860,7 @@
 "das richtige Passwort einzugeben. Der Superuser kann diesen Schritt "
 "überspringen, um so vergessene Passwörter zu ändern."
 
-#: passwd.1.xml:85(para)
+#: passwd.1.xml:88(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, "
@@ -4726,7 +4871,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:92(para)
+#: passwd.1.xml:95(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 "
@@ -4736,7 +4881,7 @@
 "Beide Eingaben werden miteinander verglichen. Sie müssen übereinstimmen, "
 "damit das Passwort geändert wird."
 
-#: passwd.1.xml:98(para)
+#: passwd.1.xml:101(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 "
@@ -4747,19 +4892,19 @@
 "bestehen sollten und ein oder mehrere Zeichen aus folgenden Mengen enthalten "
 "sollten:"
 
-#: passwd.1.xml:106(para)
+#: passwd.1.xml:109(para)
 msgid "lower case alphabetics"
 msgstr "Kleinbuchstaben"
 
-#: passwd.1.xml:109(para)
+#: passwd.1.xml:112(para)
 msgid "digits 0 thru 9"
 msgstr "Ziffern 0 bis 9"
 
-#: passwd.1.xml:112(para)
+#: passwd.1.xml:115(para)
 msgid "punctuation marks"
 msgstr "Satzzeichen"
 
-#: passwd.1.xml:116(para)
+#: passwd.1.xml:119(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 "
@@ -4769,11 +4914,11 @@
 "Zeichen des Systems eingeben. <command>passwd</command> weist Passwörter "
 "zurück, die nicht hinreichend komplex sind."
 
-#: passwd.1.xml:125(title)
+#: passwd.1.xml:128(title)
 msgid "Hints for user passwords"
 msgstr "Hinweise zu Benutzerpasswörtern"
 
-#: passwd.1.xml:126(para)
+#: passwd.1.xml:129(para)
 msgid ""
 "The security of a password depends upon the strength of the encryption "
 "algorithm and the size of the key space. The legacy <emphasis>UNIX</"
@@ -4789,7 +4934,7 @@
 "zu empfehlen (vergleiche <option>ENCRYPT_METHOD</option>). Die Größe des "
 "Schlüsselraums hängt von der Zufälligkeit des gewählten Passworts ab."
 
-#: passwd.1.xml:135(para)
+#: passwd.1.xml:138(para)
 msgid ""
 "Compromises in password security normally result from careless password "
 "selection or handling. For this reason, you should not select a password "
@@ -4804,7 +4949,7 @@
 "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:144(para)
+#: passwd.1.xml:147(para)
 msgid ""
 "You can find advices on how to choose a strong password on http://en."
 "wikipedia.org/wiki/Password_strength"
@@ -4812,17 +4957,17 @@
 "Ratschläge, wie Sie ein sicheres Passwort wählen, finden Sie unter http://de."
 "wikipedia.org/wiki/Passwort#Wahl_von_sicheren_Passw.C3.B6rtern."
 
-#: passwd.1.xml:153(para)
+#: passwd.1.xml:156(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:158(term) faillog.8.xml:71(term)
+#: passwd.1.xml:161(term) faillog.8.xml:77(term)
 msgid "<option>-a</option>, <option>--all</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
-#: passwd.1.xml:162(para)
+#: passwd.1.xml:165(para)
 msgid ""
 "This option can be used only with <option>-S</option> and causes show status "
 "for all users."
@@ -4830,11 +4975,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:169(term)
+#: passwd.1.xml:172(term)
 msgid "<option>-d</option>, <option>--delete</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: passwd.1.xml:173(para)
+#: passwd.1.xml:176(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."
@@ -4843,11 +4988,11 @@
 "Weg, um das Passwort eines Kontos zu deaktivieren. Dem Konto ist dann kein "
 "Passwort zugeordnet."
 
-#: passwd.1.xml:181(term)
+#: passwd.1.xml:184(term)
 msgid "<option>-e</option>, <option>--expire</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
-#: passwd.1.xml:185(para)
+#: passwd.1.xml:188(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."
@@ -4856,7 +5001,7 @@
 "erreicht werden, dass ein Benutzer beim nächsten Login das Passwort ändern "
 "muss."
 
-#: passwd.1.xml:198(term)
+#: passwd.1.xml:201(term)
 msgid ""
 "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -4864,7 +5009,7 @@
 "<option>-i</option>, <option>--inactive</option><replaceable>INAKTIV</"
 "replaceable>"
 
-#: passwd.1.xml:202(para)
+#: passwd.1.xml:205(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 "
@@ -4876,12 +5021,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:211(term)
+#: passwd.1.xml:214(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:215(para)
+#: passwd.1.xml:218(para)
 msgid ""
 "Indicate password change should be performed only for expired authentication "
 "tokens (passwords). The user wishes to keep their non-expired tokens as "
@@ -4890,11 +5035,11 @@
 "Zeigt an, dass nur abgelaufene Passwörter geändert werden sollen. Der "
 "Benutzer möchte seine gültigen Passwörter unverändert lassen."
 
-#: passwd.1.xml:223(term)
+#: passwd.1.xml:226(term)
 msgid "<option>-l</option>, <option>--lock</option>"
 msgstr "<option>-l</option>, <option>--lock</option>"
 
-#: passwd.1.xml:227(para)
+#: passwd.1.xml:230(para)
 msgid ""
 "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 "
@@ -4905,7 +5050,7 @@
 "verschlüsselten Wert übereinstimmen kann. Dies geschieht, indem ein »!« dem "
 "Passwort vorangestellt wird."
 
-#: passwd.1.xml:233(para)
+#: passwd.1.xml:236(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 "
@@ -4918,11 +5063,11 @@
 "<command>usermod --expiredate 1</command> verwenden; dies setzt das "
 "Verfallsdatum des Kontos auf den 2. Januar 1970."
 
-#: passwd.1.xml:240(para)
+#: passwd.1.xml:243(para)
 msgid "Users with a locked password are not allowed to change their password."
 msgstr "Benutzer mit einem gesperrten Passwort können dieses nicht ändern."
 
-#: passwd.1.xml:247(term)
+#: passwd.1.xml:250(term)
 msgid ""
 "<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -4930,7 +5075,7 @@
 "<option>-n</option>, <option>--mindays</option><replaceable>MIN_TAGE</"
 "replaceable>"
 
-#: passwd.1.xml:251(para) chage.1.xml:146(para)
+#: passwd.1.xml:254(para) chage.1.xml:149(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -4941,7 +5086,7 @@
 "von Null in diesem Feld bedeutet, dass der Benutzer sein Passwort jederzeit "
 "ändern darf."
 
-#: passwd.1.xml:269(term)
+#: passwd.1.xml:272(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -4949,15 +5094,15 @@
 "<option>-r</option>, <option>--repository</option><replaceable>DEPOT</"
 "replaceable>"
 
-#: passwd.1.xml:273(para)
+#: passwd.1.xml:276(para)
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr "ändert das Passwort im Depot <replaceable>DEPOT</replaceable>"
 
-#: passwd.1.xml:279(term)
+#: passwd.1.xml:295(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
-#: passwd.1.xml:283(para)
+#: passwd.1.xml:299(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 "
@@ -4975,11 +5120,11 @@
 "sind 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:297(term)
+#: passwd.1.xml:313(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
-#: passwd.1.xml:301(para)
+#: passwd.1.xml:317(para)
 msgid ""
 "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 "
@@ -4989,7 +5134,7 @@
 "indem das Passwort auf seinen alten Wert zurückgesetzt wird, den es hatte, "
 "bevor die Option <option>-l</option> verwendet wurde."
 
-#: passwd.1.xml:310(term)
+#: passwd.1.xml:326(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -4997,7 +5142,7 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_TAGE</"
 "replaceable>"
 
-#: passwd.1.xml:314(para)
+#: passwd.1.xml:330(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 "
@@ -5009,7 +5154,7 @@
 "replaceable> bezeichnet die Anzahl der Tage, für die ein Benutzer vor "
 "Verfall seines Passworts gewarnt wird."
 
-#: passwd.1.xml:323(term)
+#: passwd.1.xml:339(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -5017,7 +5162,7 @@
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_TAGE</"
 "replaceable>"
 
-#: passwd.1.xml:327(para)
+#: passwd.1.xml:343(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -5025,7 +5170,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:339(para)
+#: passwd.1.xml:355(para)
 msgid ""
 "Password complexity checking may vary from site to site. The user is urged "
 "to select a password as complex as he or she feels comfortable with."
@@ -5034,7 +5179,7 @@
 "unterscheiden. Der Benutzer wird angehalten, ein möglichst komplexes, von "
 "ihm aber gut zu verwendendes Passwort zu wählen."
 
-#: passwd.1.xml:344(para)
+#: passwd.1.xml:360(para)
 msgid ""
 "Users may not be able to change their password on a system if NIS is enabled "
 "and they are not logged into the NIS server."
@@ -5042,7 +5187,7 @@
 "Benutzer können unter Umständen ihr Passwort nicht ändern, wenn auf dem "
 "System NIS aktiviert ist, sie aber nicht am NIS-Server angemeldet sind."
 
-#: passwd.1.xml:349(para)
+#: passwd.1.xml:365(para)
 msgid ""
 "<command>passwd</command> uses PAM to authenticate users and to change their "
 "passwords."
@@ -5132,8 +5277,13 @@
 
 #: 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)
+#, fuzzy
+#| msgid ""
+#| "This variable is superceded by the <option>ENCRYPT_METHOD</option> "
+#| "variable or by any command line option used to configure the encryption "
+#| "algorithm."
 msgid ""
-"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"This variable is superseded by the <option>ENCRYPT_METHOD</option> variable "
 "or by any command line option used to configure the encryption algorithm."
 msgstr ""
 "Dieser Variable geht die Variable <option>ENCRYPT_METHOD</option> und eine "
@@ -5239,7 +5389,9 @@
 
 #: 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."
+#, fuzzy
+#| msgid "The values must be inside the 1000-999999999 range."
+msgid "The values must be inside the 1000-999,999,999 range."
 msgstr "Die Werte müssen zwischen 1000-999.999.999 liegen."
 
 #: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para)
@@ -5262,36 +5414,36 @@
 "Falls <option>SHA_CRYPT_MIN_ROUNDS</option> > "
 "<option>SHA_CRYPT_MAX_ROUNDS</option>, wird der höhere Wert verwendet."
 
-#: passwd.1.xml:395(filename)
+#: passwd.1.xml:411(filename)
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/pam.d/passwd"
 
-#: passwd.1.xml:397(para)
+#: passwd.1.xml:413(para)
 msgid "PAM configuration for <command>passwd</command>."
 msgstr "PAM-Konfiguration für <command>passwd</command>"
 
-#: passwd.1.xml:417(para) chage.1.xml:257(para)
+#: passwd.1.xml:433(para) chage.1.xml:273(para)
 msgid "permission denied"
 msgstr "Berechtigung verweigert"
 
-#: passwd.1.xml:423(para)
+#: passwd.1.xml:439(para)
 msgid "invalid combination of options"
 msgstr "ungültige Kombination von Optionen"
 
-#: passwd.1.xml:429(para)
+#: passwd.1.xml:445(para)
 msgid "unexpected failure, nothing done"
 msgstr "unerwarteter Fehler, nichts wurde verändert"
 
-#: passwd.1.xml:435(para)
+#: passwd.1.xml:451(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr "unerwarteter Fehler, die Datei <filename>passwd</filename> fehlt"
 
-#: passwd.1.xml:441(para)
+#: passwd.1.xml:457(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 "Datei <filename>passwd</filename> wird benutzt, bitte nochmal versuchen"
 
-#: passwd.1.xml:405(para)
+#: passwd.1.xml:421(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5299,34 +5451,46 @@
 "Der Befehl <command>passwd</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: passwd.1.xml:456(para)
+#: passwd.1.xml:472(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></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>usermod</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
-"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
-"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>chpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <phrase condition=\"no_pam"
+"\"><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, </phrase><citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"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>, <phrase condition="
-"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
-"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname)
-#: nologin.8.xml:45(command)
+#: nologin.8.xml:38(refentrytitle) nologin.8.xml:45(refname)
+#: nologin.8.xml:51(command)
 msgid "nologin"
 msgstr "nologin"
 
-#: nologin.8.xml:40(refpurpose)
+#: nologin.8.xml:46(refpurpose)
 msgid "politely refuse a login"
 msgstr "lehnt höflich eine Anmeldung ab"
 
-#: nologin.8.xml:51(para)
+#: nologin.8.xml:57(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 "
@@ -5336,7 +5500,7 @@
 "nicht verfügbar ist, und gibt einen Wert von ungleich Null zurück. Dies ist "
 "als Einsatz für das Shell-Feld bei abgeschalteten Konten vorgesehen."
 
-#: nologin.8.xml:56(para)
+#: nologin.8.xml:62(para)
 msgid ""
 "To disable all logins, investigate <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
@@ -5345,7 +5509,7 @@
 "<citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>."
 
-#: nologin.8.xml:65(para)
+#: nologin.8.xml:71(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
@@ -5355,35 +5519,43 @@
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: nologin.8.xml:76(title)
+#: nologin.8.xml:82(title)
 msgid "HISTORY"
 msgstr "GESCHICHTE"
 
-#: nologin.8.xml:77(para)
+#: nologin.8.xml:83(para)
 msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr "Der Befehl <command>nologin</command> tauchte erstmals in BSD 4.4 auf."
 
-#: newusers.8.xml:50(refentrytitle) newusers.8.xml:55(refname)
-#: newusers.8.xml:61(command) login.defs.5.xml:365(term)
+#: newusers.8.xml:51(refentrytitle) newusers.8.xml:58(refname)
+#: newusers.8.xml:64(command) login.defs.5.xml:368(term)
 msgid "newusers"
 msgstr "newusers"
 
-#: newusers.8.xml:56(refpurpose)
+#: newusers.8.xml:59(refpurpose)
 msgid "update and create new users in batch"
 msgstr "erstellt oder aktualisiert mehrere neue Benutzer am Stück"
 
-#: newusers.8.xml:64(replaceable)
-msgid "new_users"
-msgstr "neue_benutzer"
+#: newusers.8.xml:69(replaceable)
+msgid "file"
+msgstr ""
 
-#: newusers.8.xml:71(para)
+#: newusers.8.xml:76(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 "
+#| "exceptions explained below:"
 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 exceptions "
-"explained below:"
+"The <command>newusers</command> command reads a <replaceable>file</"
+"replaceable> (or the standard input by default) and uses this information to "
+"update a set 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 exceptions explained below:"
 msgstr ""
 "Der Befehl <command>newusers</command> verwendet eine Datei mit "
 "Benutzernamen und entsprechenden Klartext-Passwörtern und aktualisiert damit "
@@ -5392,19 +5564,19 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>) mit den unten aufgeführten Ausnahmen:"
 
-#: newusers.8.xml:79(para)
+#: newusers.8.xml:84(para)
 msgid "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
 msgstr "pw_Name:pw_Passwort:pw_uid:pw_gid:pw_gecos:pw_Verz:pw_shell"
 
-#: newusers.8.xml:84(emphasis)
+#: newusers.8.xml:89(emphasis)
 msgid "pw_name"
 msgstr "pw_Name"
 
-#: newusers.8.xml:87(para)
+#: newusers.8.xml:92(para)
 msgid "This is the name of the user."
 msgstr "Dies ist der Name des Benutzers."
 
-#: newusers.8.xml:90(para)
+#: newusers.8.xml:95(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, "
@@ -5415,11 +5587,11 @@
 "wurde) handeln. Für den Fall, dass der Benutzer bereits vorhanden ist, "
 "werden seine Daten verändert, anderenfalls wird ein neuer Benutzer erstellt."
 
-#: newusers.8.xml:101(emphasis)
+#: newusers.8.xml:106(emphasis)
 msgid "pw_passwd"
 msgstr "pw_Passwort"
 
-#: newusers.8.xml:104(para)
+#: newusers.8.xml:109(para)
 msgid ""
 "This field will be encrypted and used as the new value of the encrypted "
 "password."
@@ -5427,15 +5599,15 @@
 "Dieses Feld wird verschlüsselt und als neuer Wert für das verschlüsselte "
 "Passwort verwendet."
 
-#: newusers.8.xml:112(emphasis)
+#: newusers.8.xml:117(emphasis)
 msgid "pw_uid"
 msgstr "pw_uid"
 
-#: newusers.8.xml:115(para)
+#: newusers.8.xml:120(para)
 msgid "This field is used to define the UID of the user."
 msgstr "Mit diesem Feld wird die UID des Benutzers bestimmt."
 
-#: newusers.8.xml:118(para)
+#: newusers.8.xml:123(para)
 msgid ""
 "If the field is empty, an new (unused) UID will be defined automatically by "
 "<command>newusers</command>."
@@ -5443,11 +5615,11 @@
 "Wenn dieses Feld leer ist, wird von <command>newusers</command> automatisch "
 "eine neue (noch freie) UID gewählt."
 
-#: newusers.8.xml:122(para)
+#: newusers.8.xml:127(para)
 msgid "If this field contains a number, this number will be used as the UID."
 msgstr "Wenn dieses Feld eine Zahl enthält, wird sie als UID verwendet."
 
-#: newusers.8.xml:126(para)
+#: newusers.8.xml:131(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 "
@@ -5457,7 +5629,7 @@
 "Benutzers, der zuvor mit <command>newusers</command> erstellt wurde), wird "
 "die UID des angegebenen Benutzers verwendet."
 
-#: newusers.8.xml:132(para)
+#: newusers.8.xml:137(para)
 msgid ""
 "If the UID of an existing user is changed, the files ownership of the user's "
 "file should be fixed manually."
@@ -5465,15 +5637,15 @@
 "Falls die UID eines bestehenden Benutzers verändert wird, muss der "
 "Eigentümer der Dateien des Benutzers per Hand angepasst werden."
 
-#: newusers.8.xml:140(emphasis)
+#: newusers.8.xml:145(emphasis)
 msgid "pw_gid"
 msgstr "pw_gid"
 
-#: newusers.8.xml:143(para)
+#: newusers.8.xml:148(para)
 msgid "This field is used to define the primary group ID for the user."
 msgstr "Mit diesem Feld wird die ID der Hauptgruppe des Benutzers definiert."
 
-#: newusers.8.xml:146(para)
+#: newusers.8.xml:151(para)
 msgid ""
 "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 "
@@ -5483,7 +5655,7 @@
 "Gruppe, die zuvor mit <command>newusers</command> erstellt wurde), wird die "
 "GID dieser Gruppe als ID der Hauptgruppe des  Benutzers verwendet."
 
-#: newusers.8.xml:152(para)
+#: newusers.8.xml:157(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 "
@@ -5493,7 +5665,7 @@
 "Benutzers verwendet. Falls eine Gruppe mit dieser GID nicht existiert, wird "
 "eine neue Gruppe mit dieser GID unter dem Namen des Benutzers erstellt."
 
-#: newusers.8.xml:158(para)
+#: newusers.8.xml:163(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> "
@@ -5505,13 +5677,20 @@
 "GID gewählt, die als ID der Hauptgruppe des Benutzers und als GID für die "
 "neue Gruppe dient."
 
-#: newusers.8.xml:164(para)
+#: newusers.8.xml:169(para)
+#, fuzzy
+#| 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."
 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 "
+"created before 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."
+"and GID for the new group."
 msgstr ""
 "Wenn dieses Feld den Namen einer Gruppe enthält, die nicht vorhanden ist "
 "(und nicht zuvor von <command>newusers</command> erstellt wurde), wird eine "
@@ -5519,23 +5698,23 @@
 "command> automatisch eine neue GID gewählt, die als ID der Hauptgruppe des "
 "Benutzers und als GID für die neue Gruppe dient."
 
-#: newusers.8.xml:176(emphasis)
+#: newusers.8.xml:181(emphasis)
 msgid "pw_gecos"
 msgstr "pw_gecos"
 
-#: newusers.8.xml:179(para)
+#: newusers.8.xml:184(para)
 msgid "This field is copied in the GECOS field of the user."
 msgstr "Dieses Feld wird in das GECOS-Feld des Benutzers kopiert."
 
-#: newusers.8.xml:186(emphasis)
+#: newusers.8.xml:191(emphasis)
 msgid "pw_dir"
 msgstr "pw_Verz"
 
-#: newusers.8.xml:189(para)
+#: newusers.8.xml:194(para)
 msgid "This field is used to define the home directory of the user."
 msgstr "Mit diesem Feld wird das Home-Verzeichnis des Benutzers definiert."
 
-#: newusers.8.xml:192(para)
+#: newusers.8.xml:197(para)
 msgid ""
 "If this field does not specify an existing directory, the specified "
 "directory is created, with ownership set to the user being created or "
@@ -5545,7 +5724,7 @@
 "wird es erstellt. Dieses gehört dem Benutzer, der gerade erstellt und "
 "aktualisiert wird, und dessen Hauptgruppe."
 
-#: newusers.8.xml:197(para)
+#: newusers.8.xml:202(para)
 msgid ""
 "If the home directory of an existing user is changed, <command>newusers</"
 "command> does not move or copy the content of the old directory to the new "
@@ -5555,11 +5734,11 @@
 "verschiebt oder kopiert <command>newusers</command> nicht den Inhalt des "
 "alten Verzeichnisses in das neue. Dies muss von Hand erledigt werden."
 
-#: newusers.8.xml:207(emphasis)
+#: newusers.8.xml:212(emphasis)
 msgid "pw_shell"
 msgstr "pw_shell"
 
-#: newusers.8.xml:210(para)
+#: newusers.8.xml:215(para)
 msgid ""
 "This field defines the shell of the user. No checks are performed on this "
 "field."
@@ -5567,7 +5746,7 @@
 "Mit diesem Feld wird die Shell des Benutzers definiert. Diese Eingabe wird "
 "nicht überprüft."
 
-#: newusers.8.xml:218(para)
+#: newusers.8.xml:223(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 "
@@ -5579,7 +5758,7 @@
 "Falls ein Fehler auftritt (außer beim Schreiben in die Datenbanken), werden "
 "in den Datenbanken keine Änderungen vorgenommen."
 
-#: newusers.8.xml:224(para)
+#: newusers.8.xml:229(para)
 msgid ""
 "During this first pass, users are created with a locked password (and "
 "passwords are not changed for the users which are not created). A second "
@@ -5592,7 +5771,7 @@
 "Sofern dabei ein Fehler auftritt, wird dieser angezeigt, die Aktualisierung "
 "der übrigen Passwörter aber fortgesetzt."
 
-#: newusers.8.xml:232(para)
+#: newusers.8.xml:237(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are updated at a single time."
@@ -5600,21 +5779,21 @@
 "Dieser Befehl ist für den Einsatz in einer Umgebung mit zahlreichen Systemen "
 "vorgesehen, in der viele Konten gleichzeitig aktualisiert werden müssen."
 
-#: newusers.8.xml:240(para)
+#: newusers.8.xml:245(para)
 msgid "The options which apply to the <command>newusers</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>newusers</command> unterstützt werden, "
 "sind:"
 
-#: newusers.8.xml:245(term) chgpasswd.8.xml:95(term)
+#: newusers.8.xml:250(term) chgpasswd.8.xml:98(term)
 msgid "<option>-c</option>, <option>--crypt-method</option>"
 msgstr "<option>-c</option>, <option>--crypt-method</option>"
 
-#: newusers.8.xml:247(para) chpasswd.8.xml:120(para) chgpasswd.8.xml:97(para)
+#: newusers.8.xml:252(para) chpasswd.8.xml:123(para) chgpasswd.8.xml:100(para)
 msgid "Use the specified method to encrypt the passwords."
 msgstr "Definiert die Methode, mit der die Passwörter verschlüsselt werden."
 
-#: newusers.8.xml:248(para) chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
+#: newusers.8.xml:253(para) chpasswd.8.xml:127(para) chgpasswd.8.xml:104(para)
 msgid ""
 "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc "
 "support these methods."
@@ -5622,7 +5801,7 @@
 "Die verfügbaren Methoden sind DES, MD5, NONE und SHA256 oder SHA512, soweit "
 "Ihre libc sie unterstützt."
 
-#: newusers.8.xml:270(para)
+#: newusers.8.xml:275(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are chosen in the "
@@ -5637,17 +5816,17 @@
 "anstelle von <option>UID_MIN</option> bis <option>UID_MAX</option> gewählt "
 "(gleiches gilt für die GID bei der Erstellung von Gruppen)."
 
-#: newusers.8.xml:284(term) chgpasswd.8.xml:129(term)
+#: newusers.8.xml:302(term) chgpasswd.8.xml:145(term)
 msgid "<option>-s</option>, <option>--sha-rounds</option>"
 msgstr "<option>-s</option>, <option>--sha-rounds</option>"
 
-#: newusers.8.xml:286(para) chpasswd.8.xml:172(para) chgpasswd.8.xml:131(para)
+#: newusers.8.xml:304(para) chpasswd.8.xml:188(para) chgpasswd.8.xml:147(para)
 msgid "Use the specified number of rounds to encrypt the passwords."
 msgstr ""
 "Verwendet die angegebene Anzahl von Runden, um die Passwörter zu "
 "verschlüsseln."
 
-#: newusers.8.xml:289(para) chpasswd.8.xml:175(para) chgpasswd.8.xml:134(para)
+#: newusers.8.xml:307(para) chpasswd.8.xml:191(para) chgpasswd.8.xml:150(para)
 msgid ""
 "The value 0 means that the system will choose the default number of rounds "
 "for the crypt method (5000)."
@@ -5655,18 +5834,18 @@
 "Ein Wert von 0 bedeutet, dass das System die Standardanzahl der Runden "
 "(5000) für die Verschlüsselung verwenden wird."
 
-#: newusers.8.xml:293(para) chpasswd.8.xml:179(para) chgpasswd.8.xml:138(para)
+#: newusers.8.xml:311(para) chpasswd.8.xml:195(para) chgpasswd.8.xml:154(para)
 msgid ""
 "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr "Der Mindestwert ist 1000, der Höchstwert 999.999.999."
 
-#: newusers.8.xml:297(para) chpasswd.8.xml:183(para) chgpasswd.8.xml:142(para)
+#: newusers.8.xml:315(para) chpasswd.8.xml:199(para) chgpasswd.8.xml:158(para)
 msgid "You can only use this option with the SHA256 or SHA512 crypt method."
 msgstr ""
 "Sie können diese Option nur mit den Verschlüsselungsmethoden SHA256 und "
 "SHA512 verwenden."
 
-#: newusers.8.xml:301(para) chgpasswd.8.xml:146(para)
+#: newusers.8.xml:319(para) chgpasswd.8.xml:162(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>."
@@ -5675,14 +5854,14 @@
 "SHA_CRYPT_MIN_ROUNDS und SHA_CRYPT_MAX_ROUNDS  in <filename>/etc/login.defs</"
 "filename> definiert."
 
-#: newusers.8.xml:313(para)
+#: newusers.8.xml:331(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:317(para) chgpasswd.8.xml:162(para)
+#: newusers.8.xml:335(para) chgpasswd.8.xml:178(para)
 msgid ""
 "You should make sure the passwords and the encryption method respect the "
 "system's password policy."
@@ -5690,15 +5869,15 @@
 "Sie sollten darauf achten, dass Passwörter und Verschlüsselungsmethode in "
 "Einklage mit der Passwortrichtlinie des Systems stehen."
 
-#: newusers.8.xml:390(filename)
+#: newusers.8.xml:408(filename)
 msgid "/etc/pam.d/newusers"
 msgstr "/etc/pam.d/newusers"
 
-#: newusers.8.xml:392(para)
+#: newusers.8.xml:410(para)
 msgid "PAM configuration for <command>newusers</command>."
 msgstr "Konfiguration von PAM für <command>newusers</command>."
 
-#: newusers.8.xml:400(para)
+#: newusers.8.xml:418(para)
 msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5712,22 +5891,21 @@
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname)
-#: newgrp.1.xml:49(command)
+#: newgrp.1.xml:39(refentrytitle) newgrp.1.xml:46(refname)
+#: newgrp.1.xml:52(command)
 msgid "newgrp"
 msgstr "newgrp"
 
-#: newgrp.1.xml:44(refpurpose)
+#: newgrp.1.xml:47(refpurpose)
 msgid "log in to a new group"
 msgstr "als neue Gruppe anmelden"
 
-#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
-#: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
-#: groupadd.8.xml:57(replaceable) gpasswd.1.xml:66(replaceable)
+#: newgrp.1.xml:53(replaceable) grpck.8.xml:55(replaceable)
+#: groupadd.8.xml:59(replaceable) gpasswd.1.xml:69(replaceable)
 msgid "group"
 msgstr "Gruppe"
 
-#: newgrp.1.xml:56(para)
+#: newgrp.1.xml:59(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, "
@@ -5742,7 +5920,7 @@
 "bleibt die aktuelle Umgebung einschließlich des aktuellen "
 "Arbeitsverzeichnisses unverändert."
 
-#: newgrp.1.xml:64(para)
+#: newgrp.1.xml:67(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 "
@@ -5765,7 +5943,7 @@
 "der Shadow-Passwort-Datei hat, anderenfalls in <filename>/etc/passwd</"
 "filename>), wird er nach einem Passwort gefragt."
 
-#: newgrp.1.xml:78(para)
+#: newgrp.1.xml:81(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 "
@@ -5777,7 +5955,7 @@
 "entnommen. Anderenfalls wird der Eintrag in <filename>/etc/group</filename> "
 "ausgewertet."
 
-#: newgrp.1.xml:130(para)
+#: newgrp.1.xml:133(para)
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -5803,17 +5981,19 @@
 "\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry></phrase>."
 
-#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname)
-#: logoutd.8.xml:45(command)
+#: logoutd.8.xml:38(refentrytitle) logoutd.8.xml:45(refname)
+#: logoutd.8.xml:51(command)
 msgid "logoutd"
 msgstr "logoutd"
 
-#: logoutd.8.xml:40(refpurpose)
-msgid "Enforce login time restrictions"
+#: logoutd.8.xml:46(refpurpose)
+#, fuzzy
+#| msgid "Enforce login time restrictions"
+msgid "enforce login time restrictions"
 msgstr "richtet Beschränkung von Anmeldezeiten ein"
 
 # SB: /etc/rc is not in Debian. Probably doesn't matter, since logoutd is not in Debian either.
-#: logoutd.8.xml:51(para)
+#: logoutd.8.xml:57(para)
 msgid ""
 "<command>logoutd</command> enforces the login time and port restrictions "
 "specified in <filename>/etc/porttime</filename>. <command>logoutd</command> "
@@ -5831,23 +6011,23 @@
 "zugelassen ist. Alle angemeldeten Sitzungen, die gegen die Beschränkungen in "
 "<filename>/etc/porttime</filename> verstoßen, werden beendet."
 
-#: logoutd.8.xml:73(filename) login.1.xml:319(filename)
+#: logoutd.8.xml:79(filename) login.1.xml:322(filename)
 msgid "/var/run/utmp"
 msgstr "/var/run/utmp"
 
-#: logoutd.8.xml:75(para) login.1.xml:321(para)
+#: logoutd.8.xml:81(para) login.1.xml:324(para)
 msgid "List of current login sessions."
 msgstr "Liste der aktuellen angemeldeten Sitzungen"
 
-#: login.defs.5.xml:100(refentrytitle) login.defs.5.xml:105(refname)
+#: login.defs.5.xml:101(refentrytitle) login.defs.5.xml:108(refname)
 msgid "login.defs"
 msgstr "login.defs"
 
-#: login.defs.5.xml:106(refpurpose)
+#: login.defs.5.xml:109(refpurpose)
 msgid "shadow password suite configuration"
 msgstr "Konfiguration der Werkzeugsammlung für Shadow-Passwörter"
 
-#: login.defs.5.xml:111(para)
+#: login.defs.5.xml:114(para)
 msgid ""
 "The <filename>/etc/login.defs</filename> file defines the site-specific "
 "configuration for the shadow password suite. This file is required. Absence "
@@ -5859,7 +6039,7 @@
 "muss vorhanden sein. Wenn sie fehlt, wird das System zwar laufen, es können "
 "aber unerwünschte Ergebnisse auftauchen."
 
-#: login.defs.5.xml:118(para)
+#: login.defs.5.xml:121(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 "
@@ -5874,7 +6054,7 @@
 "Rautezeichen »#« eingeleitet. Die Raute muss das erste nicht leere Zeichen "
 "der Zeile sein."
 
-#: login.defs.5.xml:126(para)
+#: login.defs.5.xml:129(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 "
@@ -5894,7 +6074,7 @@
 "oder Hexadezimalzahlen (beginnen mit »0x«) bestehen. Die maximale Größe der "
 "Parameter normaler und langer Zahlen ist systemabhängig."
 
-#: login.defs.5.xml:141(para)
+#: login.defs.5.xml:144(para)
 msgid "The following configuration items are provided:"
 msgstr "Die folgenden Konfigurationsmöglichkeiten sind vorhanden:"
 
@@ -6110,9 +6290,15 @@
 "wird"
 
 #: login.defs.5.xml:37(para) login.1.xml:37(para)
+#, fuzzy
+#| msgid ""
+#| "This will most likely be overridden 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."
 msgid ""
 "This will most likely be overridden by PAM, since the default pam_unix "
-"module has it's own built in of 3 retries. However, this is a safe fallback "
+"module has its 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 ""
@@ -6156,7 +6342,7 @@
 "Root verhindert. Der Inhalt der Datei sollte die Gründe enthalten, weshalb "
 "Anmeldungen untersagt sind."
 
-#: login.defs.5.xml:184(para)
+#: login.defs.5.xml:187(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 "
@@ -6171,7 +6357,11 @@
 msgstr "<option>PORTTIME_CHECKS_ENAB</option> (boolesch)"
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "Enable checking of time restrictions specified in /etc/porttime."
+#, fuzzy
+#| msgid "Enable checking of time restrictions specified in /etc/porttime."
+msgid ""
+"Enable checking of time restrictions specified in <filename>/etc/porttime</"
+"filename>."
 msgstr ""
 "aktiviert die Auswertung der in /etc/porttime angegebenen Zeitbegrenzungen"
 
@@ -6241,11 +6431,11 @@
 msgid "Default <command>ulimit</command> value."
 msgstr "der Standardwert von <command>ulimit</command>"
 
-#: login.defs.5.xml:215(title)
+#: login.defs.5.xml:218(title)
 msgid "CROSS REFERENCES"
 msgstr "QUERVERWEISE"
 
-#: login.defs.5.xml:216(para)
+#: login.defs.5.xml:219(para)
 msgid ""
 "The following cross references show which programs in the shadow password "
 "suite use which parameters."
@@ -6253,22 +6443,22 @@
 "Die folgenden Querverweise zeigen, welche Programme aus der Shadow-Passwort-"
 "Werkzeugsammlung welche Parameter verwenden."
 
-#: login.defs.5.xml:223(term) chage.1.xml:38(refentrytitle)
-#: chage.1.xml:43(refname) chage.1.xml:48(command)
+#: login.defs.5.xml:226(term) chage.1.xml:39(refentrytitle)
+#: chage.1.xml:46(refname) chage.1.xml:51(command)
 msgid "chage"
 msgstr "chage"
 
-#: login.defs.5.xml:225(para) login.defs.5.xml:413(phrase)
-#: login.defs.5.xml:480(phrase)
+#: login.defs.5.xml:228(para) login.defs.5.xml:416(phrase)
+#: login.defs.5.xml:483(phrase)
 msgid "USE_TCB"
 msgstr "USE_TCB"
 
-#: login.defs.5.xml:229(term) chfn.1.xml:41(refentrytitle)
-#: chfn.1.xml:46(refname) chfn.1.xml:52(command)
+#: login.defs.5.xml:232(term) chfn.1.xml:41(refentrytitle)
+#: chfn.1.xml:48(refname) chfn.1.xml:54(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:231(para)
+#: login.defs.5.xml:234(para)
 msgid ""
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
@@ -6276,12 +6466,12 @@
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
 
-#: login.defs.5.xml:239(term) chgpasswd.8.xml:42(refentrytitle)
-#: chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
+#: login.defs.5.xml:242(term) chgpasswd.8.xml:43(refentrytitle)
+#: chgpasswd.8.xml:50(refname) chgpasswd.8.xml:56(command)
 msgid "chgpasswd"
 msgstr "chgpasswd"
 
-#: login.defs.5.xml:241(para) login.defs.5.xml:272(para)
+#: login.defs.5.xml:244(para) login.defs.5.xml:275(para)
 msgid ""
 "ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB <phrase condition="
 "\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
@@ -6289,75 +6479,75 @@
 "ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB <phrase condition="
 "\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 
-#: login.defs.5.xml:249(term) chpasswd.8.xml:41(refentrytitle)
-#: chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
+#: login.defs.5.xml:252(term) chpasswd.8.xml:42(refentrytitle)
+#: chpasswd.8.xml:49(refname) chpasswd.8.xml:55(command)
 msgid "chpasswd"
 msgstr "chpasswd"
 
-#: login.defs.5.xml:252(phrase)
+#: login.defs.5.xml:255(phrase)
 msgid "ENCRYPT_METHOD MD5_CRYPT_ENAB"
 msgstr "ENCRYPT_METHOD MD5_CRYPT_ENAB"
 
-#: login.defs.5.xml:254(phrase)
+#: login.defs.5.xml:257(phrase)
 msgid "SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS"
 msgstr "SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS"
 
-#: login.defs.5.xml:260(term) chsh.1.xml:40(refentrytitle)
-#: chsh.1.xml:45(refname) chsh.1.xml:51(command)
+#: login.defs.5.xml:263(term) chsh.1.xml:41(refentrytitle)
+#: chsh.1.xml:48(refname) chsh.1.xml:54(command)
 msgid "chsh"
 msgstr "chsh"
 
-#: login.defs.5.xml:262(para)
+#: login.defs.5.xml:265(para)
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr "CHSH_AUTH LOGIN_STRING"
 
-#: login.defs.5.xml:270(term) gpasswd.1.xml:42(refentrytitle)
-#: gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
+#: login.defs.5.xml:273(term) gpasswd.1.xml:43(refentrytitle)
+#: gpasswd.1.xml:50(refname) gpasswd.1.xml:64(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
-#: login.defs.5.xml:280(term) groupadd.8.xml:41(refentrytitle)
-#: groupadd.8.xml:46(refname) groupadd.8.xml:52(command)
+#: login.defs.5.xml:283(term) groupadd.8.xml:41(refentrytitle)
+#: groupadd.8.xml:48(refname) groupadd.8.xml:54(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:282(para)
+#: login.defs.5.xml:285(para)
 msgid "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 msgstr "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 
-#: login.defs.5.xml:289(term) groupdel.8.xml:38(refentrytitle)
-#: groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
+#: login.defs.5.xml:292(term) groupdel.8.xml:39(refentrytitle)
+#: groupdel.8.xml:46(refname) groupdel.8.xml:52(command)
 msgid "groupdel"
 msgstr "groupdel"
 
-#: login.defs.5.xml:291(para) login.defs.5.xml:297(para)
-#: login.defs.5.xml:303(para) login.defs.5.xml:310(para)
-#: login.defs.5.xml:316(para) login.defs.5.xml:322(para)
+#: login.defs.5.xml:294(para) login.defs.5.xml:300(para)
+#: login.defs.5.xml:306(para) login.defs.5.xml:313(para)
+#: login.defs.5.xml:319(para) login.defs.5.xml:325(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr "MAX_MEMBERS_PER_GROUP"
 
-#: login.defs.5.xml:295(term) groupmems.8.xml:38(refentrytitle)
-#: groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
+#: login.defs.5.xml:298(term) groupmems.8.xml:39(refentrytitle)
+#: groupmems.8.xml:46(refname) groupmems.8.xml:52(command)
 msgid "groupmems"
 msgstr "groupmems"
 
-#: login.defs.5.xml:301(term) groupmod.8.xml:38(refentrytitle)
-#: groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
+#: login.defs.5.xml:304(term) groupmod.8.xml:39(refentrytitle)
+#: groupmod.8.xml:46(refname) groupmod.8.xml:52(command)
 msgid "groupmod"
 msgstr "groupmod"
 
-#: login.defs.5.xml:308(term) grpck.8.xml:38(refentrytitle)
-#: grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
+#: login.defs.5.xml:311(term) grpck.8.xml:39(refentrytitle)
+#: grpck.8.xml:46(refname) grpck.8.xml:52(command)
 msgid "grpck"
 msgstr "grpck"
 
-#: login.defs.5.xml:328(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)
+#: login.defs.5.xml:331(term) login.1.xml:71(refentrytitle)
+#: login.1.xml:78(refname) login.1.xml:84(command) login.1.xml:92(command)
+#: login.1.xml:99(command)
 msgid "login"
 msgstr "login"
 
-#: login.defs.5.xml:330(para)
+#: login.defs.5.xml:333(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</"
@@ -6383,15 +6573,15 @@
 "TTYGROUP TTYPERM TTYTYPE_FILE <phrase condition=\"no_pam\">ULIMIT UMASK</"
 "phrase> USERGROUPS_ENAB"
 
-#: login.defs.5.xml:357(term)
+#: login.defs.5.xml:360(term)
 msgid "newgrp / sg"
 msgstr "newgrp / sg"
 
-#: login.defs.5.xml:359(para)
+#: login.defs.5.xml:362(para)
 msgid "SYSLOG_SG_ENAB"
 msgstr "SYSLOG_SG_ENAB"
 
-#: login.defs.5.xml:367(para)
+#: login.defs.5.xml:370(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"
@@ -6403,7 +6593,7 @@
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase> SYS_GID_MAX "
 "SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX UID_MIN UMASK"
 
-#: login.defs.5.xml:383(para)
+#: login.defs.5.xml:386(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"
@@ -6413,7 +6603,7 @@
 "PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN <phrase condition=\"sha_crypt"
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 
-#: login.defs.5.xml:394(para)
+#: login.defs.5.xml:397(para)
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb"
 "\">TCB_AUTH_GROUP TCB_SYMLINKS USE_TCB</phrase>"
@@ -6421,7 +6611,7 @@
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb"
 "\">TCB_AUTH_GROUP TCB_SYMLINKS USE_TCB</phrase>"
 
-#: login.defs.5.xml:403(para)
+#: login.defs.5.xml:406(para)
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">USE_TCB</"
 "phrase>"
@@ -6429,7 +6619,7 @@
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">USE_TCB</"
 "phrase>"
 
-#: login.defs.5.xml:420(para)
+#: login.defs.5.xml:423(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH "
@@ -6445,15 +6635,15 @@
 "\"no_pam\">SU_WHEEL_ONLY</phrase> SYSLOG_SU_ENAB <phrase condition=\"no_pam"
 "\">USERGROUPS_ENAB</phrase>"
 
-#: login.defs.5.xml:435(term)
+#: login.defs.5.xml:438(term)
 msgid "sulogin"
 msgstr "sulogin"
 
-#: login.defs.5.xml:437(para)
+#: login.defs.5.xml:440(para)
 msgid "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 msgstr "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 
-#: login.defs.5.xml:446(para)
+#: login.defs.5.xml:449(para)
 msgid ""
 "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 "
@@ -6465,7 +6655,7 @@
 "UID_MAX UID_MIN UMASK <phrase condition=\"tcb\">TCB_AUTH_GROUP TCB_SYMLINK "
 "USE_TCB</phrase>"
 
-#: login.defs.5.xml:460(para)
+#: login.defs.5.xml:463(para)
 msgid ""
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB <phrase "
 "condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
@@ -6473,7 +6663,7 @@
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB <phrase "
 "condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
 
-#: login.defs.5.xml:470(para)
+#: login.defs.5.xml:473(para)
 msgid ""
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP <phrase condition=\"tcb"
 "\">TCB_SYMLINKS USE_TCB</phrase>"
@@ -6481,7 +6671,7 @@
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP <phrase condition=\"tcb"
 "\">TCB_SYMLINKS USE_TCB</phrase>"
 
-#: login.defs.5.xml:489(para)
+#: login.defs.5.xml:492(para)
 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 "
@@ -6503,7 +6693,7 @@
 "citerefentry> nur noch in geringem Umfang beachtet. Sie sollten daher für "
 "eine entsprechende Konfiguration in den Dateien von PAM nachsehen."
 
-#: login.defs.5.xml:505(para)
+#: login.defs.5.xml:508(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -6525,15 +6715,15 @@
 "citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
+#: login.access.5.xml:39(refentrytitle) login.access.5.xml:46(refname)
 msgid "login.access"
 msgstr "login.access"
 
-#: login.access.5.xml:41(refpurpose)
+#: login.access.5.xml:47(refpurpose)
 msgid "login access control table"
 msgstr "Tabelle für die Zugangskontrolle zur Anmeldung"
 
-#: login.access.5.xml:46(para)
+#: login.access.5.xml:52(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 "
@@ -6543,7 +6733,7 @@
 "von (Benutzer, Rechner) und (Benutzer, tty) fest, für die eine Anmeldung "
 "erlaubt oder abgelehnt wird."
 
-#: login.access.5.xml:52(para)
+#: login.access.5.xml:58(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, "
@@ -6557,7 +6747,7 @@
 "zutrifft. Das Feld für die Erlaubnis bestimmt, ob die Anmeldung zugelassen "
 "oder abgelehnt wird."
 
-#: login.access.5.xml:60(para)
+#: login.access.5.xml:66(para)
 msgid ""
 "Each line of the login access control table has three fields separated by a "
 "\":\" character:"
@@ -6565,7 +6755,7 @@
 "Jede Zeile der Tabelle für die Zugangskontrolle enthält drei Felder, die "
 "jeweils durch einen Doppelpunkt »:« getrennt sind:"
 
-#: login.access.5.xml:65(para)
+#: login.access.5.xml:71(para)
 msgid ""
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
 "emphasis>:<emphasis remap=\"I\">origins</emphasis>"
@@ -6573,7 +6763,7 @@
 "<emphasis remap=\"I\">Erlaubnis</emphasis>:<emphasis remap=\"I\">Benutzer</"
 "emphasis>:<emphasis remap=\"I\">Herkunft</emphasis>"
 
-#: login.access.5.xml:69(para)
+#: login.access.5.xml:75(para)
 msgid ""
 "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or "
 "\"<emphasis>-</emphasis>\" (access denied) character. The second field "
@@ -6598,7 +6788,7 @@
 "literal>« enthalten). Falls Sie NIS einsetzen, können Sie in den Rechner- "
 "und Benutzerangaben auch @netgroupname verwenden."
 
-#: login.access.5.xml:83(para)
+#: login.access.5.xml:89(para)
 msgid ""
 "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
 "compact rules."
@@ -6606,7 +6796,7 @@
 "Der Operator <emphasis>EXCEPT</emphasis> ermöglicht es, sehr kurze Regeln zu "
 "schreiben."
 
-#: login.access.5.xml:88(para)
+#: login.access.5.xml:94(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 "
@@ -6618,37 +6808,37 @@
 "Programm beachtet also nicht den Wert der Hauptgruppe des Benutzers."
 
 # SB: Translation of login.1 based on Josef Spillner's (josef at ggzgamingzone.org) from 2003. Mention somewhere else as well?
-#: login.1.xml:76(refpurpose)
+#: login.1.xml:79(refpurpose)
 msgid "begin session on the system"
 msgstr "startet eine Sitzung auf dem System"
 
-#: 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)
+#: login.1.xml:85(arg) login.1.xml:93(arg) login.1.xml:100(arg)
+#: login.1.xml:217(option) groupmems.8.xml:57(arg)
 msgid "-p"
 msgstr "-p"
 
-#: login.1.xml:83(replaceable) login.1.xml:91(replaceable)
-#: login.1.xml:98(replaceable)
+#: login.1.xml:86(replaceable) login.1.xml:94(replaceable)
+#: login.1.xml:101(replaceable)
 msgid "host"
 msgstr "Rechner"
 
-#: login.1.xml:83(arg) login.1.xml:91(arg) chfn.1.xml:56(arg)
+#: login.1.xml:86(arg) login.1.xml:94(arg)
 msgid "-h <placeholder-1/>"
 msgstr "-h <placeholder-1/>"
 
-#: login.1.xml:86(replaceable)
+#: login.1.xml:89(replaceable)
 msgid "ENV=VAR"
 msgstr "ENV=VAR"
 
-#: login.1.xml:92(arg) login.1.xml:192(option) expiry.1.xml:54(arg)
+#: login.1.xml:95(arg) login.1.xml:195(option)
 msgid "-f"
 msgstr "-f"
 
-#: login.1.xml:98(arg) chfn.1.xml:54(arg)
+#: login.1.xml:101(arg)
 msgid "-r <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
-#: login.1.xml:104(para)
+#: login.1.xml:107(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 "
@@ -6673,7 +6863,7 @@
 "Der Versuch, von einer Shell außer der Anmelde-Shell <command>login</"
 "command> auszuführen, wird eine Fehlermeldung erzeugen."
 
-#: login.1.xml:118(para)
+#: login.1.xml:121(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 "
@@ -6685,7 +6875,7 @@
 "kleine Anzahl von Anmeldeversuchen zulässig, ehe <command>login</command> "
 "abbricht und die Kommunikation getrennt wird."
 
-#: login.1.xml:125(para)
+#: login.1.xml:128(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 "
@@ -6700,7 +6890,7 @@
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> finden sich weitere "
 "Informationen."
 
-#: login.1.xml:134(para)
+#: login.1.xml:137(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 "
@@ -6719,7 +6909,7 @@
 "»<emphasis>Sie haben Mails.</emphasis>« oder »<emphasis>Keine Mails.</"
 "emphasis>«."
 
-#: login.1.xml:145(para)
+#: login.1.xml:148(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>, "
@@ -6735,7 +6925,7 @@
 "gesetzt. Werte für ulimit, umask und nice können ebenfalls gemäß den Werten "
 "im GECOS-Feld gesetzt werden."
 
-#: login.1.xml:154(para)
+#: login.1.xml:157(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 "
@@ -6745,7 +6935,7 @@
 "$TERM</envar> entsprechend dem Terminaltyp Ihrer tty-Zeile, wie sie in "
 "<filename>/etc/ttytype</filename> angegeben ist, gesetzt."
 
-#: login.1.xml:160(para)
+#: login.1.xml:163(para)
 msgid ""
 "An initialization script for your command interpreter may also be executed. "
 "Please see the appropriate manual section for more information on this "
@@ -6755,7 +6945,7 @@
 "Sehen Sie bitte in den entsprechenden Handbuchseiten für weitere "
 "Informationen darüber nach."
 
-#: login.1.xml:172(para) login.1.xml:248(para)
+#: login.1.xml:175(para) login.1.xml:251(para)
 msgid ""
 "The <command>login</command> program is NOT responsible for removing users "
 "from the utmp file. It is the responsibility of "
@@ -6777,33 +6967,37 @@
 "verwenden, weiterhin als angemeldet erscheinen, obwohl Sie die "
 "»untergeordnete Sitzung« beendet haben."
 
-#: login.1.xml:195(para)
+#: login.1.xml:198(para)
 msgid "Do not perform authentication, user is preauthenticated."
 msgstr "Keine Authentifizierung durchführen, Benutzer ist bereits angemeldet."
 
-#: login.1.xml:198(para)
+#: login.1.xml:201(para)
 msgid "Note: In that case, <replaceable>username</replaceable> is mandatory."
 msgstr ""
 "Hinweis: In diesem Fall muss <replaceable>Benutzername</replaceable> "
 "angegeben werden."
 
-#: login.1.xml:206(option)
+#: login.1.xml:209(option)
 msgid "-h"
 msgstr "-h"
 
-#: login.1.xml:209(para)
+#: login.1.xml:212(para)
 msgid "Name of the remote host for this login."
 msgstr "Name des entfernt stehenden Rechners für die Anmeldung"
 
-#: login.1.xml:217(para)
+#: login.1.xml:220(para)
 msgid "Preserve environment."
 msgstr "behält die Umgebungseinstellungen bei"
 
-#: login.1.xml:225(para)
+#: login.1.xml:225(option)
+msgid "-r"
+msgstr "-r"
+
+#: login.1.xml:228(para)
 msgid "Perform autologin protocol for rlogin."
 msgstr "führt das Autologin-Protokoll für rlogin aus"
 
-#: login.1.xml:230(para)
+#: login.1.xml:233(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."
@@ -6812,7 +7006,7 @@
 "option> können nur verwendet werden, wenn <command>login</command> von Root "
 "ausgeführt wird."
 
-#: login.1.xml:239(para)
+#: login.1.xml:242(para)
 msgid ""
 "This version of <command>login</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -6821,14 +7015,14 @@
 "Kompilierung, wobei eventuell nicht alle Optionen auf allen Systemen "
 "verwendet werden."
 
-#: login.1.xml:244(para)
+#: login.1.xml:247(para)
 msgid ""
 "The location of files is subject to differences in system configuration."
 msgstr ""
 "Der Ort der Konfigurationsdateien kann je nach Konfiguration des Systems "
 "unterschiedlich sein."
 
-#: login.1.xml:260(para)
+#: login.1.xml:263(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 "
@@ -6844,47 +7038,47 @@
 "verwenden, um einen vertrauenswürdigen Pfad zu erstellen und somit diesem "
 "Angriff zu entgehen."
 
-#: login.1.xml:325(filename)
+#: login.1.xml:328(filename)
 msgid "/var/log/wtmp"
 msgstr "/var/log/wtmp"
 
-#: login.1.xml:327(para)
+#: login.1.xml:330(para)
 msgid "List of previous login sessions."
 msgstr "Liste der vorangegangenen angemeldeten Sitzungen"
 
-#: login.1.xml:343(filename)
+#: login.1.xml:346(filename)
 msgid "/etc/motd"
 msgstr "/etc/motd"
 
-#: login.1.xml:345(para)
+#: login.1.xml:348(para)
 msgid "System message of the day file."
 msgstr "Datei mit der Systemmeldung des Tages"
 
-#: login.1.xml:349(filename)
+#: login.1.xml:352(filename)
 msgid "/etc/nologin"
 msgstr "/etc/nologin"
 
-#: login.1.xml:351(para)
+#: login.1.xml:354(para)
 msgid "Prevent non-root users from logging in."
 msgstr "verhindert, dass sich Benutzer außer Root anmelden"
 
-#: login.1.xml:355(filename)
+#: login.1.xml:358(filename)
 msgid "/etc/ttytype"
 msgstr "/etc/ttytype"
 
-#: login.1.xml:357(para)
+#: login.1.xml:360(para)
 msgid "List of terminal types."
 msgstr "Liste der Terminaltypen"
 
-#: login.1.xml:361(filename)
+#: login.1.xml:364(filename)
 msgid "$HOME/.hushlogin"
 msgstr "$HOME/.hushlogin"
 
-#: login.1.xml:363(para)
+#: login.1.xml:366(para)
 msgid "Suppress printing of system messages."
 msgstr "unterdrückt die Ausgabe von Systemnachrichten"
 
-#: login.1.xml:377(para)
+#: login.1.xml:380(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -6914,15 +7108,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getty</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
+#: limits.5.xml:39(refentrytitle) limits.5.xml:46(refname)
 msgid "limits"
 msgstr "limits"
 
-#: limits.5.xml:41(refpurpose)
+#: limits.5.xml:47(refpurpose)
 msgid "resource limits definition"
 msgstr "Festlegung von Resourcenbeschränkungen"
 
-#: limits.5.xml:47(para)
+#: limits.5.xml:53(para)
 msgid ""
 "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</"
 "filename> by default or LIMITS_FILE defined <filename>config.h</filename>) "
@@ -6934,7 +7128,7 @@
 "filename> festgelegte) bezeichnet die von Ihnen eingeführte Beschränkung von "
 "Ressourcen. Sie sollte Root gehören und nur von ihm lesbar sein."
 
-#: limits.5.xml:55(para)
+#: limits.5.xml:61(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)."
@@ -6943,24 +7137,24 @@
 "keine Möglichkeit, mit diesem Verfahren Root-Konten (Konten mit der UID 0) "
 "Beschränkungen aufzuerlegen."
 
-#: limits.5.xml:61(para)
+#: limits.5.xml:67(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:64(emphasis)
+#: limits.5.xml:70(emphasis)
 msgid "user LIMITS_STRING"
 msgstr "Benutzer BESCHRÄNKUNGSZEICHENKETTE"
 
-#: limits.5.xml:67(para)
+#: limits.5.xml:73(para)
 msgid "or in the form:"
 msgstr "oder in der Form:"
 
-#: limits.5.xml:70(emphasis)
+#: limits.5.xml:76(emphasis)
 msgid "@group LIMITS_STRING"
 msgstr "@Gruppe BESCHRÄNKUNGSZEICHENKETTE"
 
-#: limits.5.xml:73(para)
+#: limits.5.xml:79(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 "
@@ -6970,51 +7164,27 @@
 "Ressourcen-Beschränkungen. Jede Beschränkung besteht aus einer "
 "Buchstabenkennung, der eine zahlenmäßige Beschränkung folgt."
 
-#: limits.5.xml:79(para)
+#: limits.5.xml:85(para)
 msgid "The valid identifiers are:"
 msgstr "Gültige Kennungen sind:"
 
-#: limits.5.xml:82(para)
+#: limits.5.xml:88(para)
 msgid "A: max address space (KB)"
 msgstr "A: maximaler Adressraum (KB)"
 
 # SB: Uebersetzung von "core file"?
-#: limits.5.xml:83(para)
+#: limits.5.xml:89(para)
 msgid "C: max core file size (KB)"
 msgstr "C: maximale Größe der Speicherabbild-Datei"
 
-#: limits.5.xml:84(para)
+#: limits.5.xml:90(para)
 msgid "D: max data size (KB)"
 msgstr "D: maximale Datengröße (KB)"
 
-#: limits.5.xml:85(para)
+#: limits.5.xml:91(para)
 msgid "F: maximum filesize (KB)"
 msgstr "F: maximale Dateigröße (KB)"
 
-#: limits.5.xml:86(para)
-msgid "M: max locked-in-memory address space (KB)"
-msgstr "M: maximaler gesperrter Adressbereich im Speicher (KB)"
-
-#: limits.5.xml:87(para)
-msgid "N: max number of open files"
-msgstr "N: maximale Anzahl offener Dateien"
-
-#: limits.5.xml:88(para)
-msgid "R: max resident set size (KB)"
-msgstr "R: maximale Resident Set Size (KB)"
-
-#: limits.5.xml:89(para)
-msgid "S: max stack size (KB)"
-msgstr "S: maximale Größe des Stapelverarbeitungsspeichers (KB)"
-
-#: limits.5.xml:90(para)
-msgid "T: max CPU time (MIN)"
-msgstr "T: maximale CPU-Zeit (Min)"
-
-#: limits.5.xml:91(para)
-msgid "U: max number of processes"
-msgstr "U: maximale Anzahl von Prozessen"
-
 #: limits.5.xml:92(para)
 msgid ""
 "K: file creation mask, set by <citerefentry><refentrytitle>umask</"
@@ -7025,10 +7195,27 @@
 "citerefentry> gesetzt."
 
 #: limits.5.xml:97(para)
+msgid "I: max nice value (0..39 which translates to 20..-19)"
+msgstr ""
+"I: Maximaler Wert von nice (0 bis 39, was in 20 bis -19 übersetzt wird)"
+
+#: limits.5.xml:99(para)
 msgid "L: max number of logins for this user"
 msgstr "L: maximale Anzahl von Logins für diesen Benutzer"
 
-#: limits.5.xml:98(para)
+#: limits.5.xml:100(para)
+msgid "M: max locked-in-memory address space (KB)"
+msgstr "M: maximaler gesperrter Adressbereich im Speicher (KB)"
+
+#: limits.5.xml:101(para)
+msgid "N: max number of open files"
+msgstr "N: maximale Anzahl offener Dateien"
+
+#: limits.5.xml:102(para)
+msgid "O: max real time priority"
+msgstr "O: Maximale Echtzeit-Priorität "
+
+#: limits.5.xml:103(para)
 msgid ""
 "P: process priority, set by <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
@@ -7036,16 +7223,23 @@
 "P: Prozesspriorität, wird von <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry> gesetzt."
 
-#: limits.5.xml:103(para)
-msgid "I: max nice value (0..39 which translates to 20..-19)"
-msgstr ""
-"I: Maximaler Wert von nice (0 bis 39, was in 20 bis -19 übersetzt wird)"
+#: limits.5.xml:108(para)
+msgid "R: max resident set size (KB)"
+msgstr "R: maximale Resident Set Size (KB)"
 
-#: limits.5.xml:105(para)
-msgid "O: max real time priority"
-msgstr "O: Maximale Echtzeit-Priorität "
+#: limits.5.xml:109(para)
+msgid "S: max stack size (KB)"
+msgstr "S: maximale Größe des Stapelverarbeitungsspeichers (KB)"
 
-#: limits.5.xml:108(para)
+#: limits.5.xml:110(para)
+msgid "T: max CPU time (MIN)"
+msgstr "T: maximale CPU-Zeit (Min)"
+
+#: limits.5.xml:111(para)
+msgid "U: max number of processes"
+msgstr "U: maximale Anzahl von Prozessen"
+
+#: limits.5.xml:114(para)
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
 "<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
@@ -7055,7 +7249,7 @@
 "<emphasis>BESCHRÄNKUNGSZEICHENKETTE</emphasis>. Um das Lesen zu erleichtern, "
 "werden folgende Einträge gleich behandelt:"
 
-#: limits.5.xml:114(programlisting)
+#: limits.5.xml:120(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -7068,7 +7262,7 @@
 "      Benutzername L2 D2048 N5\n"
 "    "
 
-#: limits.5.xml:119(para)
+#: limits.5.xml:125(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 "
@@ -7080,7 +7274,7 @@
 "sind daher nicht zulässig. Eine ungültige Zeichenkette wird von "
 "<command>login</command> ignoriert."
 
-#: limits.5.xml:126(para)
+#: limits.5.xml:132(para)
 msgid ""
 "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
 "have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
@@ -7092,7 +7286,7 @@
 "Werte in der <emphasis>BESCHRÄNKUNGSDATEI</emphasis> bestimmen, wird nur der "
 "letzte berücksichtigt."
 
-#: limits.5.xml:133(para)
+#: limits.5.xml:139(para)
 msgid ""
 "The limits specified in the form \"<replaceable>@group</replaceable>\" apply "
 "to the members of the specified <replaceable>group</replaceable>."
@@ -7101,20 +7295,30 @@
 "festgelegt wurden, gelten für alle Mitglieder der angegebenen Gruppe "
 "<replaceable>group</replaceable>."
 
-#: limits.5.xml:139(para)
+#: limits.5.xml:145(para)
+#, fuzzy
+#| msgid ""
+#| "If a line with limits for an user exist, only the first line for this "
+#| "user will be considered."
 msgid ""
-"If a line with limits for an user exist, only the first line for this user "
-"will be considered."
+"If more than one line with limits for an user exist, only the first line for "
+"this user will be considered."
 msgstr ""
 "Wenn mehr als eine Zeile mit Beschränkungen für einen Benutzer vorhanden "
 "ist, wird für ihn nur die erste Zeile berücksichtigt."
 
-#: limits.5.xml:144(para)
+#: limits.5.xml:150(para)
+#, fuzzy
+#| msgid ""
+#| "If no lines are specified for an user, the last <replaceable>@group</"
+#| "replaceable> line matching a group whose the user is a member of will be "
+#| "conisdered, or the last line with default limits if no groups contain the "
+#| "user)."
 msgid ""
 "If no lines are specified for an user, the last <replaceable>@group</"
 "replaceable> line matching a group whose the user is a member of will be "
-"conisdered, or the last line with default limits if no groups contain the "
-"user)."
+"considered, or the last line with default limits if no groups contain the "
+"user."
 msgstr ""
 "Wenn keine Zeile auf einen Benutzer zutrifft, wird auf ihn die letzte Zeile "
 "mit <replaceable>@group</replaceable> angewendet, die auf eine Gruppe "
@@ -7122,7 +7326,7 @@
 "aufgeführten Gruppe ist, wird auf ihn die letzte Zeile, in der Standardwerte "
 "bestimmt sind, angewendet."
 
-#: limits.5.xml:151(para)
+#: limits.5.xml:157(para)
 msgid ""
 "To completely disable limits for a user, a single dash \"<emphasis>-</"
 "emphasis>\" will do."
@@ -7130,7 +7334,7 @@
 "Mit einem Gedankenstrich »<emphasis>-</emphasis>« können Sie alle "
 "Beschränkungen für einen Benutzer zu entfernen."
 
-#: limits.5.xml:156(para)
+#: limits.5.xml:162(para)
 msgid ""
 "To disable a limit for a user, a single dash \"<replaceable>-</replaceable>"
 "\" can be used instead of the numerical value for this limit."
@@ -7140,7 +7344,7 @@
 "»<replaceable>-</replaceable>« setzen."
 
 # SB: Well, there is PAM with /etc/security/limits.conf
-#: limits.5.xml:162(para)
+#: limits.5.xml:168(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 "
@@ -7150,11 +7354,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:173(filename)
+#: limits.5.xml:179(filename)
 msgid "/etc/limits"
 msgstr "/etc/limits"
 
-#: limits.5.xml:181(para)
+#: limits.5.xml:187(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>setpriority</"
@@ -7168,16 +7372,16 @@
 "<citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
-#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname)
-#: lastlog.8.xml:46(command)
+#: lastlog.8.xml:39(refentrytitle) lastlog.8.xml:46(refname)
+#: lastlog.8.xml:52(command)
 msgid "lastlog"
 msgstr "lastlog"
 
-#: lastlog.8.xml:41(refpurpose)
+#: lastlog.8.xml:47(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:55(para)
+#: lastlog.8.xml:61(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</"
@@ -7193,32 +7397,32 @@
 "Reihenfolge, wie sie sich in <filename>/etc/passwd</filename> befinden, "
 "ausgegeben."
 
-#: lastlog.8.xml:67(para)
+#: lastlog.8.xml:73(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:72(term)
+#: lastlog.8.xml:78(term)
 msgid ""
 "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-b</option>, <option>--before</option><replaceable>TAGE</replaceable>"
 
-#: lastlog.8.xml:76(para)
+#: lastlog.8.xml:82(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:90(term) faillog.8.xml:157(term)
+#: lastlog.8.xml:109(term) faillog.8.xml:176(term)
 msgid ""
 "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>TAGE</replaceable>"
 
-#: lastlog.8.xml:95(para)
+#: lastlog.8.xml:114(para)
 msgid ""
 "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
 "emphasis>."
@@ -7226,7 +7430,7 @@
 "gibt nur Lastlog-Einträge aus, die neuer als <emphasis remap=\"I\">TAGE</"
 "emphasis> sind"
 
-#: lastlog.8.xml:102(term) faillog.8.xml:168(term)
+#: lastlog.8.xml:121(term) faillog.8.xml:187(term)
 msgid ""
 "<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>|"
 "<replaceable>RANGE</replaceable>"
@@ -7234,11 +7438,11 @@
 "<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>|"
 "<replaceable>MENGE</replaceable>"
 
-#: lastlog.8.xml:107(para)
+#: lastlog.8.xml:126(para)
 msgid "Print the lastlog record of the specified user(s)."
 msgstr "gibt nur die Lastlog-Einträge für die angegebenen Benutzer aus"
 
-#: lastlog.8.xml:110(para) faillog.8.xml:178(para)
+#: lastlog.8.xml:129(para) faillog.8.xml:197(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</"
@@ -7253,7 +7457,7 @@
 "Maximumwert (<replaceable>UID_MIN-UID_MAX</replaceable>) oder nur einem "
 "Minimumwert (<replaceable>UID_MIN-</replaceable>) bestimmt werden."
 
-#: lastlog.8.xml:122(para)
+#: lastlog.8.xml:141(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."
@@ -7262,7 +7466,7 @@
 "<emphasis>** Never logged in**</emphasis> anstatt von Port und Zeit "
 "angezeigt."
 
-#: lastlog.8.xml:127(para)
+#: lastlog.8.xml:146(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."
@@ -7270,12 +7474,12 @@
 "Es werden nur Einträge für auf dem System vorhandene Benutzer angezeigt, "
 "selbst wenn Einträge über gelöschte Benutzer noch vorhanden sind."
 
-#: lastlog.8.xml:135(title) groups.1.xml:65(title) chsh.1.xml:106(title)
-#: chage.1.xml:197(title)
+#: lastlog.8.xml:154(title) groups.1.xml:71(title) chsh.1.xml:122(title)
+#: chage.1.xml:213(title)
 msgid "NOTE"
 msgstr "ANMERKUNGEN"
 
-#: lastlog.8.xml:136(para)
+#: lastlog.8.xml:155(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, "
@@ -7293,15 +7497,15 @@
 "filename> befinden). Die wirkliche Dateigröße lässt sich mit »<command>ls -"
 "s</command>« anzeigen."
 
-#: lastlog.8.xml:150(filename)
+#: lastlog.8.xml:169(filename)
 msgid "/var/log/lastlog"
 msgstr "/var/log/lastlog"
 
-#: lastlog.8.xml:152(para)
+#: lastlog.8.xml:171(para)
 msgid "Database times of previous user logins."
 msgstr "Datenbank mit Zeiten der letzten Anmeldung der Benutzer"
 
-#: lastlog.8.xml:160(para)
+#: lastlog.8.xml:179(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 "
@@ -7314,15 +7518,15 @@
 "befindet, wird es scheinen, als ob lastlog stehen geblieben ist, während es "
 "die Einträge mit der UID 171 bis 799 verarbeitet."
 
-#: gshadow.5.xml:33(refentrytitle) gshadow.5.xml:38(refname)
+#: gshadow.5.xml:37(refentrytitle) gshadow.5.xml:44(refname)
 msgid "gshadow"
 msgstr "gshadow"
 
-#: gshadow.5.xml:39(refpurpose)
+#: gshadow.5.xml:45(refpurpose)
 msgid "shadowed group file"
 msgstr "Shadow-Datei für Gruppen"
 
-#: gshadow.5.xml:44(para)
+#: gshadow.5.xml:50(para)
 msgid ""
 "<filename>/etc/gshadow</filename> contains the shadowed information for "
 "group accounts."
@@ -7330,23 +7534,23 @@
 "In <filename>/etc/gshadow</filename> befinden sich die Informationen für das "
 "Shadow-Gruppen-System."
 
-#: gshadow.5.xml:54(para)
+#: gshadow.5.xml:60(para)
 msgid "Each line of this file contains the following colon-separated fields:"
 msgstr ""
 "Die darin enthaltenen Zeilen haben folgende Felder, die durch Doppelpunkt "
 "getrennt sind:"
 
-#: gshadow.5.xml:60(emphasis)
+#: gshadow.5.xml:66(emphasis)
 msgid "group name"
 msgstr "Gruppenname"
 
-#: gshadow.5.xml:62(para)
+#: gshadow.5.xml:68(para)
 msgid "It must be a valid group name, which exist on the system."
 msgstr ""
 "Es muss sich um einen gültigen, auf dem System vorhandenen Gruppennamen "
 "handeln."
 
-#: gshadow.5.xml:75(para)
+#: gshadow.5.xml:81(para)
 msgid ""
 "If the password field contains some string that is not a valid result of "
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
@@ -7359,7 +7563,7 @@
 "einem Unix-Passwort Zugang zu der Gruppe erhalten, wobei Gruppenmitglieder "
 "kein Passwort benötigen."
 
-#: gshadow.5.xml:82(para)
+#: gshadow.5.xml:88(para)
 msgid ""
 "The password is used when an user who is not a member of the group wants to "
 "gain the permissions of this group (see <citerefentry><refentrytitle>newgrp</"
@@ -7370,7 +7574,7 @@
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>)."
 
-#: gshadow.5.xml:88(para)
+#: gshadow.5.xml:94(para)
 msgid ""
 "This field may be empty, in which case only the group members can gain the "
 "group permissions."
@@ -7378,7 +7582,7 @@
 "Dieses Feld kann leer bleiben. Dies hat zur Folge, dass nur "
 "Gruppenmitglieder von den Rechten der Gruppe Gebrauch machen können."
 
-#: gshadow.5.xml:98(para)
+#: gshadow.5.xml:104(para)
 msgid ""
 "This password supersedes any password specified in <filename>/etc/group</"
 "filename>."
@@ -7387,45 +7591,45 @@
 "Passwörtern vor."
 
 # SB: Gruppenverwalter ist besser als Administrator, weil so keine Verwechslung mit Systemadminstrator.
-#: gshadow.5.xml:106(emphasis)
+#: gshadow.5.xml:112(emphasis)
 msgid "administrators"
 msgstr "Gruppenverwalter"
 
-#: gshadow.5.xml:108(para) gshadow.5.xml:124(para)
+#: gshadow.5.xml:114(para) gshadow.5.xml:130(para)
 msgid "It must be a comma-separated list of user names."
 msgstr ""
 "Es muss sich dabei um eine durch Kommas getrennte Liste von Benutzernamen "
 "handeln."
 
-#: gshadow.5.xml:111(para)
+#: gshadow.5.xml:117(para)
 msgid "Administrators can change the password or the members of the group."
 msgstr ""
 "Gruppenverwalter können das Passwort und die Mitglieder der Gruppe ändern."
 
-#: gshadow.5.xml:115(para)
+#: gshadow.5.xml:121(para)
 msgid ""
 "Administrators also have the same permissions as the members (see below)."
 msgstr ""
 "Gruppenverwalter haben die gleichen Recht wie die Gruppenmitglieder (siehe "
 "unten)."
 
-#: gshadow.5.xml:122(emphasis)
+#: gshadow.5.xml:128(emphasis)
 msgid "members"
 msgstr "Mitglieder"
 
-#: gshadow.5.xml:127(para)
+#: gshadow.5.xml:133(para)
 msgid "Members can access the group without being prompted for a password."
 msgstr ""
 "Mitglieder haben Zugang zu der Gruppe, ohne eine Passwort eingeben zu müssen."
 
-#: gshadow.5.xml:131(para)
+#: gshadow.5.xml:137(para)
 msgid ""
 "You should use the same list of users as in <filename>/etc/group</filename>."
 msgstr ""
 "Sie sollten die gleiche Benutzerliste wie in <filename>/etc/group</filename> "
 "verwenden."
 
-#: gshadow.5.xml:160(para)
+#: gshadow.5.xml:166(para)
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
@@ -7445,11 +7649,11 @@
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: grpck.8.xml:44(refpurpose)
+#: grpck.8.xml:47(refpurpose)
 msgid "verify integrity of group files"
 msgstr "überprüft die Stimmigkeit der Gruppendateien"
 
-#: grpck.8.xml:70(para)
+#: grpck.8.xml:65(para)
 msgid ""
 "The <command>grpck</command> command verifies the integrity of the groups "
 "information. It checks that all entries in <filename>/etc/group</"
@@ -7466,11 +7670,11 @@
 "oder andere unbehebbare Fehler enthält, wird der Benutzer aufgefordert, ihn "
 "zu löschen."
 
-#: grpck.8.xml:87(para)
+#: grpck.8.xml:82(para)
 msgid "a unique and valid group name"
 msgstr "einen eindeutigen und gültigen Gruppennamen"
 
-#: grpck.8.xml:90(para)
+#: grpck.8.xml:85(para)
 msgid ""
 "a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/"
 "group</filename> only)</phrase>"
@@ -7478,7 +7682,7 @@
 "eine gültige Gruppenkennung <phrase condition=\"gshadow\"> (nur für "
 "<filename>/etc/group</filename>)</phrase>"
 
-#: grpck.8.xml:97(para)
+#: grpck.8.xml:92(para)
 msgid ""
 "a valid list of members <phrase condition=\"gshadow\"> and administrators</"
 "phrase>"
@@ -7486,7 +7690,7 @@
 "eine gültige Liste der Mitglieder <phrase condition=\"gshadow\"> und "
 "Gruppenverwalter</phrase>"
 
-#: grpck.8.xml:103(para)
+#: grpck.8.xml:98(para)
 msgid ""
 "a corresponding entry in the <filename>/etc/gshadow</filename> file "
 "(respectively <filename>/etc/group</filename> for the <filename>gshadow</"
@@ -7496,7 +7700,7 @@
 "(oder in <filename>/etc/group</filename> bei der Überprüfung von "
 "<filename>gshadow</filename>)"
 
-#: grpck.8.xml:111(para)
+#: grpck.8.xml:106(para)
 msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
 "an entry has the wrong number of fields, the user will be prompted to delete "
@@ -7516,7 +7720,7 @@
 "Fehlern wird eine Warnung ausgegeben und der Benutzer aufgefordert, den "
 "Fehler mittels des Befehls <command>groupmod</command> zu beheben."
 
-#: grpck.8.xml:122(para)
+#: grpck.8.xml:117(para)
 msgid ""
 "The commands which operate on the <filename>/etc/group</filename><phrase "
 "condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
@@ -7531,13 +7735,13 @@
 "In solchen Fällen sollte <command>grpwck</command> verwendet werden, um die "
 "betreffenden Einträge zu entfernen."
 
-#: grpck.8.xml:134(para)
+#: grpck.8.xml:133(para)
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>grpck</command> unterstützt werden, "
 "sind:"
 
-#: grpck.8.xml:141(para)
+#: grpck.8.xml:146(para)
 msgid ""
 "Execute the <command>grpck</command> command in read-only mode. This causes "
 "all questions regarding changes to be answered <emphasis>no</emphasis> "
@@ -7548,7 +7752,7 @@
 "<emphasis>no</emphasis> beantworteten werden, ohne dass der Benutzer "
 "einzugreifen braucht."
 
-#: grpck.8.xml:151(para)
+#: grpck.8.xml:169(para)
 msgid ""
 "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
 "\">and <filename>/etc/gshadow</filename></phrase> by GID."
@@ -7556,7 +7760,7 @@
 "Ordnet die Einträge in <filename>/etc/group</filename><phrase condition="
 "\"gshadow\">und <filename>/etc/gshadow</filename></phrase> nach der GID."
 
-#: grpck.8.xml:160(para)
+#: grpck.8.xml:178(para)
 msgid ""
 "By default, <command>grpck</command> operates on <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</"
@@ -7573,23 +7777,23 @@
 "\">group</emphasis> und <emphasis remap=\"I\">shadow</emphasis></phrase> "
 "auswählen."
 
-#: grpck.8.xml:228(para)
+#: grpck.8.xml:246(para)
 msgid "one or more bad group entries"
 msgstr "ein oder mehrere fehlerhafte Gruppeneinträge"
 
-#: grpck.8.xml:234(para)
+#: grpck.8.xml:252(para)
 msgid "can't open group files"
 msgstr "Die Gruppendateien können nicht geöffnet werden."
 
-#: grpck.8.xml:240(para)
+#: grpck.8.xml:258(para)
 msgid "can't lock group files"
 msgstr "Die Gruppendateien können nicht gesperrt werden."
 
-#: grpck.8.xml:246(para)
+#: grpck.8.xml:264(para)
 msgid "can't update group files"
 msgstr "Die Gruppendateien können nicht aktualisiert werden."
 
-#: grpck.8.xml:210(para)
+#: grpck.8.xml:228(para)
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -7597,7 +7801,7 @@
 "Der Befehl <command>grpck</command> gibt beim Beenden folgende Werte zurück: "
 "<placeholder-1/>"
 
-#: grpck.8.xml:255(para)
+#: grpck.8.xml:273(para)
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>groupmod</"
@@ -7621,20 +7825,20 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
-#: groups.1.xml:45(command)
+#: groups.1.xml:38(refentrytitle) groups.1.xml:45(refname)
+#: groups.1.xml:51(command)
 msgid "groups"
 msgstr "groups"
 
-#: groups.1.xml:40(refpurpose)
+#: groups.1.xml:46(refpurpose)
 msgid "display current group names"
 msgstr "zeigt die aktuell verwendeten Gruppennamen an"
 
-#: groups.1.xml:47(replaceable) chfn.1.xml:58(replaceable)
+#: groups.1.xml:53(replaceable)
 msgid "user"
 msgstr "Benutzer"
 
-#: groups.1.xml:54(para)
+#: groups.1.xml:60(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/"
@@ -7649,11 +7853,17 @@
 "bezeichneten <emphasis remap=\"I\">Benutzers</emphasis> angezeigt."
 
 # SB: Übersetzung von "concurrent group set"?
-#: groups.1.xml:66(para)
+#: groups.1.xml:72(para)
+#, fuzzy
+#| msgid ""
+#| "Systems which do not support concurrent group sets will have the "
+#| "information from <filename>/etc/group</filename> reported. The user must "
+#| "use <command>newgrp</command> or <command>sg</command> to change their "
+#| "current real and effective group ID."
 msgid ""
 "Systems which do not support concurrent group sets will have the information "
 "from <filename>/etc/group</filename> reported. The user must use "
-"<command>newgrp</command> or <command>sg</command> to change their current "
+"<command>newgrp</command> or <command>sg</command> to change his current "
 "real and effective group ID."
 msgstr ""
 "Auf Systemen, die keine simultanen Gruppen unterstützen, werden die "
@@ -7661,7 +7871,7 @@
 "Benutzer seine tatsächliche und effektive Gruppen-ID ändern will, muss er "
 "<command>newgrp</command> oder <command>sg</command> verwenden."
 
-#: groups.1.xml:88(para)
+#: groups.1.xml:94(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getgid</"
@@ -7677,15 +7887,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getuid</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
-#: groupmod.8.xml:44(refpurpose)
+#: groupmod.8.xml:47(refpurpose)
 msgid "modify a group definition on the system"
 msgstr "ändert die Eigenschaften einer Gruppe auf dem System"
 
-#: groupmod.8.xml:53(replaceable)
+#: groupmod.8.xml:56(replaceable) groupdel.8.xml:56(replaceable)
 msgid "GROUP"
 msgstr "GRUPPE"
 
-#: groupmod.8.xml:59(para)
+#: groupmod.8.xml:62(para)
 msgid ""
 "The <command>groupmod</command> command modifies the definition of the "
 "specified <replaceable>GROUP</replaceable> by modifying the appropriate "
@@ -7695,19 +7905,19 @@
 "angegebenen <replaceable>GRUPPE</replaceable>, indem die passenden Einträge "
 "in der Gruppendatenbank geändert werden."
 
-#: groupmod.8.xml:68(para)
+#: groupmod.8.xml:71(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:74(term) groupadd.8.xml:93(term)
+#: groupmod.8.xml:77(term) groupadd.8.xml:95(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
-#: groupmod.8.xml:78(para)
+#: groupmod.8.xml:81(para)
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
 "to <replaceable>GID</replaceable>."
@@ -7715,7 +7925,7 @@
 "Die Gruppen-ID der angegebenen <replaceable>GRUPPE</replaceable> wird zu "
 "<replaceable>GID</replaceable> geändert."
 
-#: groupmod.8.xml:82(para)
+#: groupmod.8.xml:85(para)
 msgid ""
 "The value of <replaceable>GID</replaceable> must be a non-negative decimal "
 "integer. This value must be unique, unless the <option>-o</option> option is "
@@ -7726,8 +7936,14 @@
 "o</option> wendet wird. Typischerweise sind Werte zwischen 0 und 999 für "
 "Systemgruppen vorgesehen."
 
-#: groupmod.8.xml:89(para)
+#: groupmod.8.xml:92(para)
 msgid ""
+"Users who use the group as primary group will be updated to keep the group "
+"as their primary group."
+msgstr ""
+
+#: groupmod.8.xml:96(para)
+msgid ""
 "Any files that have the old group ID and must continue to belong to "
 "<replaceable>GROUP</replaceable>, must have their group ID changed manually."
 msgstr ""
@@ -7735,7 +7951,7 @@
 "<replaceable>GROUP</replaceable> gehören sollen, muss die Gruppen-ID per "
 "Hand angepasst werden."
 
-#: groupmod.8.xml:104(term)
+#: groupmod.8.xml:111(term)
 msgid ""
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
@@ -7743,7 +7959,7 @@
 "<option>-n</option>, <option>--new-name</option><replaceable>NEUE_GRUPPE</"
 "replaceable>"
 
-#: groupmod.8.xml:109(para)
+#: groupmod.8.xml:116(para)
 msgid ""
 "The name of the group will be changed from <replaceable>GROUP</replaceable> "
 "to <replaceable>NEW_GROUP</replaceable> name."
@@ -7751,7 +7967,7 @@
 "Der Gruppenname wird vom Namen <replaceable>GRUPPE</replaceable> zu "
 "<replaceable>NEUE_GRUPPE</replaceable> geändert."
 
-#: groupmod.8.xml:120(para)
+#: groupmod.8.xml:127(para)
 msgid ""
 "When used with the <option>-g</option> option, allow to change the group "
 "<replaceable>GID</replaceable> to a non-unique value."
@@ -7760,11 +7976,11 @@
 "Wert der Gruppen-<replaceable>GID</replaceable> auf einen nicht eindeutigen "
 "Wert gesetzt werden."
 
-#: groupmod.8.xml:219(para)
+#: groupmod.8.xml:245(para)
 msgid "group name already in use"
 msgstr "Gruppenname wird schon verwendet"
 
-#: groupmod.8.xml:183(para)
+#: groupmod.8.xml:209(para)
 msgid ""
 "The <command>groupmod</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -7772,7 +7988,7 @@
 "Der Befehl <command>groupmod</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: groupmod.8.xml:234(para)
+#: groupmod.8.xml:260(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7804,36 +8020,36 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: groupmems.8.xml:44(refpurpose)
+#: groupmems.8.xml:47(refpurpose)
 msgid "administer members of a user's primary group"
 msgstr "verwaltet die Mitglieder der Hauptgruppe eines Benutzers"
 
-#: groupmems.8.xml:51(replaceable) groupmems.8.xml:52(replaceable)
+#: groupmems.8.xml:54(replaceable) groupmems.8.xml:55(replaceable)
 msgid "user_name"
 msgstr "Benutzer_Name"
 
-#: groupmems.8.xml:51(arg)
+#: groupmems.8.xml:54(arg)
 msgid "-a <placeholder-1/>"
 msgstr "-a <placeholder-1/>"
 
-#: groupmems.8.xml:52(arg)
+#: groupmems.8.xml:55(arg)
 msgid "-d <placeholder-1/>"
 msgstr "-d <placeholder-1/>"
 
-#: groupmems.8.xml:53(replaceable)
+#: groupmems.8.xml:56(replaceable)
 msgid "group_name"
 msgstr "Gruppen_Name"
 
-#: groupmems.8.xml:53(arg)
+#: groupmems.8.xml:56(arg)
 msgid "-g <placeholder-1/>"
 msgstr "-g <placeholder-1/>"
 
-#: groupmems.8.xml:54(arg)
+#: groupmems.8.xml:57(arg)
 msgid "-l"
 msgstr "-l"
 
 # SB: 1. I don't understand "sake"? A typo? But of what? 2. I think we shouldn't have the notorious guest account here as an example.
-#: groupmems.8.xml:61(para)
+#: groupmems.8.xml:64(para)
 msgid ""
 "The <command>groupmems</command> command allows a user to administer his/her "
 "own group membership list without the requirement of superuser privileges. "
@@ -7846,7 +8062,7 @@
 "gedacht, auf denen die Hauptgruppe eines Benutzers den gleichen Namen hat "
 "wie der Benutzer (z.B. fritz/fritz)."
 
-#: groupmems.8.xml:69(para)
+#: groupmems.8.xml:72(para)
 msgid ""
 "Only the superuser, as administrator, can use <command>groupmems</command> "
 "to alter the memberships of other groups."
@@ -7854,14 +8070,14 @@
 "Nur Root als Administrator kann mit <command>groupmems</command> die "
 "Mitgliederlisten anderer Gruppen bearbeiten."
 
-#: groupmems.8.xml:76(para)
+#: groupmems.8.xml:79(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:82(term)
+#: groupmems.8.xml:85(term)
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user_name</"
 "replaceable>"
@@ -7869,12 +8085,12 @@
 "<option>-a</option>, <option>--add</option><replaceable>Benutzer_Name</"
 "replaceable>"
 
-#: groupmems.8.xml:84(para)
+#: groupmems.8.xml:87(para)
 msgid "Add an user to the group membership list."
 msgstr "Fügt einen Benutzer der Mitgliederliste der Gruppe hinzu."
 
-#: groupmems.8.xml:85(para) groupmems.8.xml:101(para)
-#: groupmems.8.xml:132(para)
+#: groupmems.8.xml:88(para) groupmems.8.xml:104(para)
+#: groupmems.8.xml:135(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 "
@@ -7883,7 +8099,7 @@
 "Wenn die Datei <filename>/etc/gshadow</filename> vorhanden ist, die Gruppe "
 "darin aber keinen Eintrag hat, wird ein solcher erstellt."
 
-#: groupmems.8.xml:93(term)
+#: groupmems.8.xml:96(term)
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user_name</"
 "replaceable>"
@@ -7891,11 +8107,11 @@
 "<option>-d</option>, <option>--delete</option><replaceable>Benutzer_Name</"
 "replaceable>"
 
-#: groupmems.8.xml:95(para)
+#: groupmems.8.xml:98(para)
 msgid "Delete a user from the group membership list."
 msgstr "Löscht einen Benutzer aus der Mitgliederliste der Gruppe."
 
-#: groupmems.8.xml:96(para)
+#: groupmems.8.xml:99(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."
@@ -7903,7 +8119,7 @@
 "Wenn <filename>/etc/gshadow</filename> vorhanden ist, wird der Benutzer aus "
 "der Liste der Mitglieder und Gruppenverwalter entfernt."
 
-#: groupmems.8.xml:109(term)
+#: groupmems.8.xml:112(term)
 msgid ""
 "<option>-g</option>, <option>--group</option><replaceable>group_name</"
 "replaceable>"
@@ -7911,32 +8127,32 @@
 "<option>-g</option>, <option>--group</option><replaceable>Gruppen_Name</"
 "replaceable>"
 
-#: groupmems.8.xml:111(para)
+#: groupmems.8.xml:114(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:123(term) chage.1.xml:132(term)
+#: groupmems.8.xml:126(term) chage.1.xml:135(term)
 msgid "<option>-l</option>, <option>--list</option>"
 msgstr "<option>-l</option>, <option>--list</option>"
 
-#: groupmems.8.xml:125(para)
+#: groupmems.8.xml:128(para)
 msgid "List the group membership list."
 msgstr "gibt die Mitgliederliste aus"
 
-#: groupmems.8.xml:129(term)
+#: groupmems.8.xml:132(term)
 msgid "<option>-p</option>, <option>--purge</option>"
 msgstr "<option>-p</option>, <option>--purge</option>"
 
-#: groupmems.8.xml:131(para)
+#: groupmems.8.xml:134(para)
 msgid "Purge all users from the group membership list."
 msgstr "löscht alle Benutzer aus der Mitgliederliste der Gruppe"
 
-#: groupmems.8.xml:143(title)
+#: groupmems.8.xml:159(title)
 msgid "SETUP"
 msgstr "EINRICHTUNG"
 
-#: groupmems.8.xml:144(para)
+#: groupmems.8.xml:160(para)
 msgid ""
 "The <command>groupmems</command> executable should be in mode <literal>2770</"
 "literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</"
@@ -7951,7 +8167,7 @@
 "ermöglichen, mit <command>groupmems</command> die Mitgliederliste ihrer "
 "eigenen Gruppe zu verwalten."
 
-#: groupmems.8.xml:153(programlisting)
+#: groupmems.8.xml:169(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -7968,11 +8184,11 @@
 "\t$ groupmems -g groups -a gk4\n"
 "    "
 
-#: groupmems.8.xml:185(para)
+#: groupmems.8.xml:201(para)
 msgid "secure group account information"
 msgstr "verschlüsselte Informationen zu den Gruppenkonten"
 
-#: groupmems.8.xml:193(para)
+#: groupmems.8.xml:209(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -8000,21 +8216,35 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: groupdel.8.xml:44(refpurpose)
+#: groupdel.8.xml:47(refpurpose)
 msgid "delete a group"
 msgstr "löscht eine Gruppe"
 
-#: groupdel.8.xml:58(para)
+#: groupdel.8.xml:62(para)
+#, fuzzy
+#| 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."
 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."
+"deleting all entries that refer to <replaceable>GROUP</replaceable>. The "
+"named group must exist."
 msgstr ""
 "Der Befehl <command>groupdel</command> bearbeitet die Kontodateien des "
 "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:66(para)
+#: groupdel.8.xml:70(para)
+#, fuzzy
+#| msgid ""
+#| "The options which apply to the <command>groupmod</command> command are:"
+msgid "The options which apply to the <command>groupdel</command> command are:"
+msgstr ""
+"Die Optionen, die vom Befehl <command>groupmod</command> unterstützt werden, "
+"sind:"
+
+#: groupdel.8.xml:99(para)
 msgid ""
 "You may not remove the primary group of any existing user. You must remove "
 "the user before you remove the group."
@@ -8022,7 +8252,7 @@
 "Sie können nicht die Hauptgruppe eines Benutzers entfernen. Dazu müssten Sie "
 "zunächst den betreffenden Benutzer löschen."
 
-#: groupdel.8.xml:70(para)
+#: groupdel.8.xml:103(para)
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this group."
@@ -8030,11 +8260,11 @@
 "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:132(para)
+#: groupdel.8.xml:165(para)
 msgid "can't remove user's primary group"
 msgstr "Die Hauptgruppe eines Benutzers kann nicht entfernen werden."
 
-#: groupdel.8.xml:108(para)
+#: groupdel.8.xml:141(para)
 msgid ""
 "The <command>groupdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -8042,7 +8272,23 @@
 "Der Befehl <command>groupdel</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: groupdel.8.xml:147(para)
+#: groupdel.8.xml:180(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>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -8057,7 +8303,7 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -8074,11 +8320,11 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>"
 
-#: groupadd.8.xml:47(refpurpose)
+#: groupadd.8.xml:49(refpurpose)
 msgid "create a new group"
 msgstr "erstellt eine neue Gruppe"
 
-#: groupadd.8.xml:64(para)
+#: groupadd.8.xml:66(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 "
@@ -8089,13 +8335,13 @@
 "oder die Standardwerte des Systems. Soweit es notwendig ist, wird die neue "
 "Gruppe den Systemdateien hinzugefügt."
 
-#: groupadd.8.xml:73(para)
+#: groupadd.8.xml:75(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:83(para)
+#: groupadd.8.xml:85(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 "
@@ -8108,7 +8354,7 @@
 "vergeben ist, wird eine andere, eindeutige GID gewählt (d.h. <option>-g</"
 "option> wird nicht beachtet)."
 
-#: groupadd.8.xml:97(para)
+#: groupadd.8.xml:99(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 "
@@ -8122,7 +8368,7 @@
 "größer als jeder andere Wert einer Gruppe verwendet. Typischerweise sind "
 "Werte zwischen 0 und 999 für Systemkonten reserviert."
 
-#: groupadd.8.xml:117(para)
+#: groupadd.8.xml:119(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (GID_MIN, GID_MAX "
 "and others). Multiple <option>-K</option> options can be specified."
@@ -8130,7 +8376,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:122(para)
+#: groupadd.8.xml:124(para)
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option>-K </"
@@ -8140,7 +8386,7 @@
 "replaceable>=<replaceable>100</replaceable><option>-K </"
 "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: groupadd.8.xml:126(para)
+#: groupadd.8.xml:128(para)
 msgid ""
 "Note: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
@@ -8150,17 +8396,17 @@
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
 "replaceable>=<replaceable>499</replaceable> funktioniert noch nicht."
 
-#: groupadd.8.xml:138(para)
+#: groupadd.8.xml:140(para)
 msgid "This option permits to add a group with a non-unique GID."
 msgstr ""
 "Diese Option erlaubt es, eine Gruppe mit einer nicht eindeutigen GID zu "
 "erstellen."
 
-#: groupadd.8.xml:170(para)
+#: groupadd.8.xml:172(para)
 msgid "Create a system group."
 msgstr "erstellt eine neue Systemgruppe"
 
-#: groupadd.8.xml:173(para)
+#: groupadd.8.xml:175(para)
 msgid ""
 "The numeric identifiers of new system groups are chosen in the "
 "<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
@@ -8172,7 +8418,7 @@
 "welche in <filename>login.defs</filename> festgelegt wird, anstelle von "
 "<option>GID_MIN</option> bis <option>GID_MAX</option>."
 
-#: groupadd.8.xml:224(para)
+#: groupadd.8.xml:239(para)
 msgid ""
 "Groupnames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
@@ -8183,12 +8429,12 @@
 "Gedankenstriche enthalten. Das letzte Zeichen darf auch ein Dollarzeichen "
 "sein. Als regulärer Ausdruck: [a-z_][a-z0-9_-]*[$]?"
 
-#: groupadd.8.xml:230(para)
+#: groupadd.8.xml:245(para)
 msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr ""
 "Gruppennamen dürfen nur bis zu &GROUP_NAME_MAX_LENGTH; Zeichen lang sein."
 
-#: groupadd.8.xml:233(para)
+#: groupadd.8.xml:248(para)
 msgid ""
 "You may not add a NIS or LDAP group. This must be performed on the "
 "corresponding server."
@@ -8196,7 +8442,7 @@
 "Sie können einen Benutzer nicht einer NIS- oder LDAP-Gruppe hinzufügen. Dies "
 "müssen Sie auf dem entsprechenden Server durchführen."
 
-#: groupadd.8.xml:237(para)
+#: groupadd.8.xml:252(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."
@@ -8205,15 +8451,15 @@
 "LDAP) vergeben ist, wird <command>groupadd</command> die Gruppe nicht "
 "erstellen."
 
-#: groupadd.8.xml:270(para)
+#: groupadd.8.xml:285(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:276(para)
+#: groupadd.8.xml:291(para)
 msgid "group name not unique"
 msgstr "Gruppenname nicht eindeutig"
 
-#: groupadd.8.xml:246(para)
+#: groupadd.8.xml:261(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -8221,7 +8467,7 @@
 "Der Befehl <command>groupadd</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: groupadd.8.xml:291(para)
+#: groupadd.8.xml:306(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -8255,19 +8501,19 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:49(phrase)
+#: gpasswd.1.xml:52(phrase)
 msgid "administer <placeholder-1/>"
 msgstr "verwaltet <placeholder-1/>"
 
-#: gpasswd.1.xml:52(phrase)
+#: gpasswd.1.xml:55(phrase)
 msgid "administer <placeholder-1/> and <placeholder-2/>"
 msgstr "verwaltet <placeholder-1/> und <placeholder-2/>"
 
-#: gpasswd.1.xml:63(replaceable)
+#: gpasswd.1.xml:66(replaceable) expiry.1.xml:57(replaceable)
 msgid "option"
 msgstr "Option"
 
-#: gpasswd.1.xml:73(para)
+#: gpasswd.1.xml:76(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -8279,7 +8525,7 @@
 "gshadow</filename></phrase>. Jede Gruppe kann <phrase condition=\"gshadow"
 "\">Gruppenverwalter,</phrase> Mitglieder und ein Passwort haben."
 
-#: gpasswd.1.xml:81(para)
+#: gpasswd.1.xml:84(para)
 msgid ""
 "System administrators can use the <option>-A</option> option to define group "
 "administrator(s) and the <option>-M</option> option to define members. They "
@@ -8290,7 +8536,7 @@
 "Mitglieder fest. Er besitzt alle Rechte, die Gruppenverwalter und Mitglieder "
 "haben können."
 
-#: gpasswd.1.xml:86(para)
+#: gpasswd.1.xml:89(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -8302,7 +8548,7 @@
 "command> nur mit dem Gruppennamen aufruft, wird er aufgefordert, für die "
 "<replaceable>Gruppe</replaceable> ein neues Passwort zu vergeben."
 
-#: gpasswd.1.xml:93(para)
+#: gpasswd.1.xml:96(para)
 msgid ""
 "If a password is set the members can still use "
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -8313,11 +8559,11 @@
 "manvolnum></citerefentry> ausführen. Alle anderen Benutzer benötigen dazu "
 "das Passwort."
 
-#: gpasswd.1.xml:101(title)
+#: gpasswd.1.xml:104(title)
 msgid "Notes about group passwords"
 msgstr "Hinweise zu Gruppenpasswörtern"
 
-#: gpasswd.1.xml:102(para)
+#: gpasswd.1.xml:105(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 "
@@ -8327,7 +8573,7 @@
 "Passwort kennen. Dennoch können sie sinnvoll sein, um die Zusammenarbeit "
 "zwischen Benutzern zu erleichtern."
 
-#: gpasswd.1.xml:113(para)
+#: gpasswd.1.xml:116(para)
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
 "options cannot be combined."
@@ -8335,24 +8581,24 @@
 "Außer die Optionen <option>-A</option> und <option>-M</option> können die "
 "übrigen Optionen nicht zusammen verwendet werden."
 
-#: gpasswd.1.xml:117(para)
+#: gpasswd.1.xml:120(para)
 msgid "The options cannot be combined."
 msgstr "Die Optionen können nicht zusammen verwendet werden."
 
-#: gpasswd.1.xml:120(para)
+#: gpasswd.1.xml:123(para)
 msgid "The options which apply to the <command>gpasswd</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>gpasswd</command> unterstützt werden, "
 "sind:"
 
-#: gpasswd.1.xml:125(term)
+#: gpasswd.1.xml:128(term)
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
 msgstr ""
 "<option>-a</option>, <option>--add</option><replaceable>Benutzer</"
 "replaceable>"
 
-#: gpasswd.1.xml:129(para)
+#: gpasswd.1.xml:132(para)
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
@@ -8360,14 +8606,14 @@
 "Fügt den <replaceable>Benutzer</replaceable> der bezeichneten "
 "<replaceable>Gruppe</replaceable> zu."
 
-#: gpasswd.1.xml:138(term)
+#: gpasswd.1.xml:141(term)
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
 msgstr ""
 "<option>-d</option>, <option>--delete</option><replaceable>Benutzer</"
 "replaceable>"
 
-#: gpasswd.1.xml:142(para)
+#: gpasswd.1.xml:145(para)
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
 "<replaceable>group</replaceable>."
@@ -8375,11 +8621,23 @@
 "entfernt den <replaceable>Benutzer</replaceable> aus der bezeichneten "
 "<replaceable>Gruppe</replaceable>"
 
-#: gpasswd.1.xml:159(term)
+#: gpasswd.1.xml:162(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-Q</option>, <option>--root</option><replaceable>CHROOT_DIR</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HOME_VERZ</"
+"replaceable>"
+
+#: gpasswd.1.xml:177(term)
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr "<option>-r</option>, <option>--remove-password</option>"
 
-#: gpasswd.1.xml:163(para)
+#: gpasswd.1.xml:181(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 "
@@ -8389,11 +8647,11 @@
 "Damit können nur noch Gruppenmitglieder mit <command>newgrp</command> zu der "
 "bezeichneten <replaceable>Gruppe</replaceable> wechseln."
 
-#: gpasswd.1.xml:174(term)
+#: gpasswd.1.xml:192(term)
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-R</option>, <option>--restrict</option>"
 
-#: gpasswd.1.xml:178(para)
+#: gpasswd.1.xml:196(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 "
@@ -8403,7 +8661,7 @@
 "Damit können nur noch Gruppenmitglieder mit <command>newgrp</command> zu der "
 "bezeichneten <replaceable>Gruppe</replaceable> wechseln."
 
-#: gpasswd.1.xml:189(term)
+#: gpasswd.1.xml:207(term)
 msgid ""
 "<option>-A</option>, <option>--administrators</option><replaceable>user</"
 "replaceable>,..."
@@ -8411,11 +8669,11 @@
 "<option>-A</option>, <option>--administrators</option><replaceable>Benutzer</"
 "replaceable>, ..."
 
-#: gpasswd.1.xml:193(para)
+#: gpasswd.1.xml:211(para)
 msgid "Set the list of administrative users."
 msgstr "Liste der Gruppenverwalter bestimmen"
 
-#: gpasswd.1.xml:201(term)
+#: gpasswd.1.xml:219(term)
 msgid ""
 "<option>-M</option>, <option>--members</option><replaceable>user</"
 "replaceable>,..."
@@ -8423,11 +8681,11 @@
 "<option>-M</option>, <option>--members</option><replaceable>Benutzer</"
 "replaceable>, ..."
 
-#: gpasswd.1.xml:205(para)
+#: gpasswd.1.xml:223(para)
 msgid "Set the list of group members."
 msgstr "Liste der Mitglieder der Gruppe bestimmen"
 
-#: gpasswd.1.xml:215(para)
+#: gpasswd.1.xml:233(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -8441,7 +8699,7 @@
 "filename></phrase>. Sie können daher keine NIS- oder LDAP-Gruppen "
 "bearbeiten. Dies muss auf dem entsprechenden Server durchgeführt werden."
 
-#: gpasswd.1.xml:260(para)
+#: gpasswd.1.xml:278(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>groupadd</"
@@ -8467,19 +8725,19 @@
 "\"gshadow\">, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry></phrase>."
 
-#: 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:86(refentrytitle)
+#: faillog.8.xml:38(refentrytitle) faillog.8.xml:45(refname)
+#: faillog.8.xml:51(command) faillog.5.xml:38(refentrytitle)
+#: faillog.5.xml:45(refname) faillog.5.xml:92(refentrytitle)
 msgid "faillog"
 msgstr "faillog"
 
-#: faillog.8.xml:40(refpurpose)
+#: faillog.8.xml:46(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:54(para)
+#: faillog.8.xml:60(para)
 msgid ""
 "<command>faillog</command> displays the contents of the failure log database "
 "(<filename>/var/log/faillog</filename>). It can also set the failure "
@@ -8494,13 +8752,13 @@
 "der fehlgeschlagenen Anmeldungen aller Benutzer angezeigt, deren Anmeldung "
 "jemals gescheitert ist."
 
-#: faillog.8.xml:65(para)
+#: faillog.8.xml:71(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:73(para)
+#: faillog.8.xml:79(para)
 msgid ""
 "Display (or act on) faillog records for all users having an entry in the "
 "<filename>faillog</filename> database."
@@ -8508,14 +8766,14 @@
 "zeigt (oder bearbeitet) die faillog-Einträge aller Benutzer, die einen "
 "Eintrag in der Datenbank <filename>faillog</filename> haben"
 
-#: faillog.8.xml:77(para)
+#: faillog.8.xml:83(para)
 msgid ""
 "The range of users can be restricted with the <option>-u</option> option."
 msgstr ""
 "Die Spanne der Benutzer kann mit der Option <option>-u</option> eingegrenzt "
 "werden."
 
-#: faillog.8.xml:81(para)
+#: faillog.8.xml:87(para)
 msgid ""
 "In display mode, this is still restricted to existing users but forces the "
 "display of the faillog entries even if they are empty."
@@ -8523,7 +8781,7 @@
 "Im Anzeigemodus ist dies auf vorhandene Benutzer beschränkt, erzwingt aber "
 "die Anzeige der Faillog-Einträge, auch wenn diese leer sind."
 
-#: faillog.8.xml:86(para)
+#: faillog.8.xml:92(para)
 msgid ""
 "With the <option>-l</option>, <option>-m</option>, <option>-r</option>, "
 "<option>-t</option> options, the users' records are changed, even if the "
@@ -8537,7 +8795,7 @@
 "werden sollen oder vorsorglich eine Richtlinie für eine Anzahl von Benutzern "
 "eingerichtet werden soll."
 
-#: faillog.8.xml:103(term)
+#: faillog.8.xml:109(term)
 msgid ""
 "<option>-l</option>, <option>--lock-secs</option><replaceable>SEC</"
 "replaceable>"
@@ -8545,14 +8803,14 @@
 "<option>-l</option>, <option>--lock-secs</option><replaceable>SEK</"
 "replaceable>"
 
-#: faillog.8.xml:108(para)
+#: faillog.8.xml:114(para)
 msgid ""
 "Lock account for <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
 "sperrt nach einer fehlgeschlagenen Anmeldung das Konto für <replaceable>SEK</"
 "replaceable> Sekunden"
 
-#: faillog.8.xml:112(para) faillog.8.xml:138(para) faillog.8.xml:150(para)
+#: faillog.8.xml:118(para) faillog.8.xml:144(para) faillog.8.xml:156(para)
 msgid ""
 "Write access to <filename>/var/log/faillog</filename> is required for this "
 "option."
@@ -8560,13 +8818,13 @@
 "Für diese Option muss ein Schreibzugriff auf <filename>/var/log/faillog</"
 "filename> bestehen."
 
-#: faillog.8.xml:119(term)
+#: faillog.8.xml:125(term)
 msgid ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 
-#: faillog.8.xml:124(para)
+#: faillog.8.xml:130(para)
 msgid ""
 "Set the maximum number of login failures after the account is disabled to "
 "<replaceable>MAX</replaceable>."
@@ -8574,7 +8832,7 @@
 "setzt den Zähler der fehlgeschlagene Anmeldungen, nach denen das Konto "
 "abgeschaltet wird, auf <replaceable>MAX</replaceable>"
 
-#: faillog.8.xml:128(para)
+#: faillog.8.xml:134(para)
 msgid ""
 "Selecting a <replaceable>MAX</replaceable> value of 0 has the effect of not "
 "placing a limit on the number of failed logins."
@@ -8582,7 +8840,7 @@
 "Wenn <replaceable>MAX</replaceable> den Wert 0 hat, besteht keine "
 "Beschränkung für die Anzahl fehlgeschlagener Anmeldeversuche."
 
-#: faillog.8.xml:133(para)
+#: faillog.8.xml:139(para)
 msgid ""
 "The maximum failure count should always be 0 for <emphasis>root</emphasis> "
 "to prevent a denial of services attack against the system."
@@ -8591,22 +8849,22 @@
 "immer 0 betragen, um eine durch einen Angriff ausgelöste Dienstverweigerung "
 "(denial of service) zu verhindern."
 
-#: faillog.8.xml:145(term)
+#: faillog.8.xml:151(term)
 msgid "<option>-r</option>, <option>--reset</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: faillog.8.xml:147(para)
+#: faillog.8.xml:153(para)
 msgid "Reset the counters of login failures."
 msgstr "setzt die Zählerstände der fehlgeschlagenen Anmeldeversuche zurück"
 
-#: faillog.8.xml:161(para)
+#: faillog.8.xml:180(para)
 msgid ""
 "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"
 
-#: faillog.8.xml:173(para)
+#: faillog.8.xml:192(para)
 msgid ""
 "Display faillog record or maintains failure counters and limits (if used "
 "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
@@ -8617,7 +8875,7 @@
 "option>, <option>-m</option> oder <option>-r</option> verwendet) nur deren "
 "Zählerstände und Beschränkungen"
 
-#: faillog.8.xml:191(para)
+#: faillog.8.xml:210(para)
 msgid ""
 "When none of the <option>-l</option>, <option>-m</option>, or <option>-r</"
 "option> options are used, <command>faillog</command> displays the faillog "
@@ -8628,7 +8886,7 @@
 "Aufzeichnung der fehlgeschlagenen Anmeldeversuche der angegebenen Benutzer "
 "an."
 
-#: faillog.8.xml:200(para)
+#: faillog.8.xml:219(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 "
@@ -8642,15 +8900,15 @@
 "<option>-u</option> benennen oder sich alle Benutzer mit der Option <option>-"
 "a</option> anzeigen lassen."
 
-#: faillog.8.xml:213(filename) faillog.5.xml:74(filename)
+#: faillog.8.xml:232(filename) faillog.5.xml:80(filename)
 msgid "/var/log/faillog"
 msgstr "/var/log/faillog"
 
-#: faillog.8.xml:215(para) faillog.5.xml:76(para)
+#: faillog.8.xml:234(para) faillog.5.xml:82(para)
 msgid "Failure logging file."
 msgstr "Datei mit fehlgeschlagenen Anmeldungen"
 
-#: faillog.8.xml:223(para)
+#: faillog.8.xml:242(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
@@ -8660,11 +8918,11 @@
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: faillog.5.xml:40(refpurpose)
+#: faillog.5.xml:46(refpurpose)
 msgid "login failure logging file"
 msgstr "Datei mit fehlgeschlagenen Anmeldungen"
 
-#: faillog.5.xml:45(para)
+#: faillog.5.xml:51(para)
 msgid ""
 "<filename>/var/log/faillog</filename> maintains a count of login failures "
 "and the limits for each account."
@@ -8673,12 +8931,20 @@
 "fehlgeschlagenen Anmeldungen und die Beschränkungen für jedes Konto "
 "niedergelegt."
 
-#: faillog.5.xml:49(para)
+#: faillog.5.xml:55(para)
+#, fuzzy
+#| msgid ""
+#| "The file contains fixed length records, indexed by numerical UID. Each "
+#| "record contains the count of login failures since the last successful "
+#| "login; the maximum number of failures before the account is disabled; the "
+#| "line on whiche the last login failure occurred; the date of the last "
+#| "login failure; and the duration (in seconds) during which the account "
+#| "will be locked after a failure."
 msgid ""
 "The file contains fixed length records, indexed by numerical UID. Each "
 "record contains the count of login failures since the last successful login; "
 "the maximum number of failures before the account is disabled; the line on "
-"whiche the last login failure occurred; the date of the last login failure; "
+"which the last login failure occurred; the date of the last login failure; "
 "and the duration (in seconds) during which the account will be locked after "
 "a failure."
 msgstr ""
@@ -8690,11 +8956,11 @@
 "letzten fehlgeschlagenen Anmeldung und die Dauer in Sekunden, für die das "
 "Konto nach einem Fehlschlag gesperrt ist."
 
-#: faillog.5.xml:59(para)
+#: faillog.5.xml:65(para)
 msgid "The structure of the file is:"
 msgstr "Die Datei ist so aufgebaut:"
 
-#: faillog.5.xml:60(programlisting)
+#: faillog.5.xml:66(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -8715,16 +8981,16 @@
 "\tlong    fail_locktime;\n"
 "};"
 
-#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
-#: expiry.1.xml:52(command)
+#: expiry.1.xml:42(refentrytitle) expiry.1.xml:49(refname)
+#: expiry.1.xml:55(command)
 msgid "expiry"
 msgstr "expiry"
 
-#: expiry.1.xml:47(refpurpose)
+#: expiry.1.xml:50(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:60(para)
+#: expiry.1.xml:64(para)
 msgid ""
 "The <command>expiry</command> command checks (<option>-c</option>) the "
 "current password expiration and forces (<option>-f</option>) changes when "
@@ -8735,7 +9001,37 @@
 "<option>-f</option> werden die notwendigen Veränderungen umgesetzt. Er kann "
 "von normalen Benutzern aufgerufen werden."
 
-#: expiry.1.xml:87(para) chage.1.xml:278(para)
+#: expiry.1.xml:73(para)
+#, fuzzy
+#| msgid "The options which apply to the <command>pwck</command> command are:"
+msgid "The options which apply to the <command>expiry</command> command are:"
+msgstr ""
+"Die Optionen, die vom Befehl <command>pwck</command> unterstützt werden, "
+"sind:"
+
+#: expiry.1.xml:78(term)
+#, fuzzy
+#| msgid "<option>-L</option>, <option>--lock</option>"
+msgid "<option>-c</option>, <option>--check</option>"
+msgstr "<option>-L</option>, <option>--lock</option>"
+
+#: expiry.1.xml:80(para)
+#, fuzzy
+#| msgid "check and enforce password expiration policy"
+msgid "Check the password expiration of the current user."
+msgstr "überprüft die Regeln für den Verfall des Passworts und setzt diese um"
+
+#: expiry.1.xml:86(para)
+#, fuzzy
+#| msgid ""
+#| "The maximum password age is the number of days after which the user will "
+#| "have to change her password."
+msgid "Force a password change if the current user has an expired password."
+msgstr ""
+"Das Höchstalter des Passworts ist die Anzahl von Tagen, nach welcher der "
+"Benutzer sein Passwort ändern muss."
+
+#: expiry.1.xml:121(para) chage.1.xml:294(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -8746,11 +9042,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:46(refpurpose)
+#: chsh.1.xml:49(refpurpose)
 msgid "change login shell"
 msgstr "ändert die Anmelde-Shell"
 
-#: chsh.1.xml:63(para)
+#: chsh.1.xml:66(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 "
@@ -8762,13 +9058,13 @@
 "Benutzer kann nur die Anmelde-Shell seines eigenen  Kontos ändern, während "
 "Root dies für alle Konten darf."
 
-#: chsh.1.xml:74(para)
+#: chsh.1.xml:77(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:96(para)
+#: chsh.1.xml:112(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 "
@@ -8783,7 +9079,7 @@
 "sie bei einer leeren Zeile beibehalten wird. Die aktuelle Shell wird "
 "zwischen einem Paar von <emphasis>[ ]</emphasis> angezeigt."
 
-#: chsh.1.xml:107(para)
+#: chsh.1.xml:123(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 "
@@ -8802,15 +9098,15 @@
 "nicht zu seiner ursprünglichen Anmelde-Shell zurückwechseln kann, falls er "
 "versehentlich eine beschränkte Shell als Anmelde-Shell auswählt."
 
-#: chsh.1.xml:142(filename)
+#: chsh.1.xml:158(filename)
 msgid "/etc/shells"
 msgstr "/etc/shells"
 
-#: chsh.1.xml:144(para)
+#: chsh.1.xml:160(para)
 msgid "List of valid login shells."
 msgstr "Liste der möglichen Anmelde-Shells"
 
-#: chsh.1.xml:158(para)
+#: chsh.1.xml:174(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -8824,11 +9120,11 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chpasswd.8.xml:47(refpurpose)
+#: chpasswd.8.xml:50(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "aktualisiert Passwörter im Batch-Modus"
 
-#: chpasswd.8.xml:61(para)
+#: chpasswd.8.xml:64(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 "
@@ -8838,7 +9134,7 @@
 "Passwort-Paaren von der Standardeingabe. Damit werden Benutzerdaten "
 "aktualisiert. Jede Zeile muss folgendes Format haben:"
 
-#: chpasswd.8.xml:66(para)
+#: chpasswd.8.xml:69(para)
 msgid ""
 "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -8846,7 +9142,7 @@
 "<emphasis remap=\"I\">Benutzername</emphasis>:<emphasis remap=\"I"
 "\">Passwort</emphasis>"
 
-#: chpasswd.8.xml:70(para)
+#: chpasswd.8.xml:73(para)
 msgid ""
 "By default the passwords must be supplied in clear-text, and are encrypted "
 "by <command>chpasswd</command>. Also the password age will be updated, if "
@@ -8856,7 +9152,7 @@
 "<command>chpasswd</command> verschlüsselt. Soweit vorhanden, wird auch das "
 "Alter des Passworts aktualisiert."
 
-#: chpasswd.8.xml:75(para)
+#: chpasswd.8.xml:78(para)
 msgid ""
 "The default encryption algorithm can be defined for the system with the "
 "<option>ENCRYPT_METHOD</option> or <option>MD5_CRYPT_ENAB</option> variables "
@@ -8869,7 +9165,7 @@
 "kann mit den Optionen <option>-e</option>, <option>-m</option> oder <option>-"
 "c</option> überschrieben werden."
 
-#: chpasswd.8.xml:83(para)
+#: chpasswd.8.xml:86(para)
 msgid ""
 "By default, passwords are encrypted by PAM, but (even if not recommended) "
 "you can select a different encryption method with the <option>-e</option>, "
@@ -8880,7 +9176,7 @@
 "<option>-m</option> oder <option>-c</option> festlegen (dies wird jedoch "
 "nicht angeraten)."
 
-#: chpasswd.8.xml:89(para)
+#: chpasswd.8.xml:92(para)
 msgid ""
 "<phrase condition=\"pam\">Except when PAM is used to encrypt the passwords,</"
 "phrase><command>chpasswd</command> first updates all the passwords in "
@@ -8892,7 +9188,7 @@
 "Passwörter im Arbeitsspeicher und schreibt dann die Änderungen auf das "
 "Speichermedium, falls keine Fehler aufgetreten sind."
 
-#: chpasswd.8.xml:95(para)
+#: chpasswd.8.xml:98(para)
 msgid ""
 "When PAM is used to encrypt the passwords (and update the passwords in the "
 "system database) then if a password cannot be updated <command>chpasswd</"
@@ -8904,7 +9200,7 @@
 "Aktualisierung der Passwörter auch dann fortsetzen, wenn ein Passwort nicht "
 "geändert werden kann, und beim Beenden eine Fehlermeldung zurückgeben."
 
-#: chpasswd.8.xml:101(para) chgpasswd.8.xml:81(para)
+#: chpasswd.8.xml:104(para) chgpasswd.8.xml:84(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
@@ -8912,13 +9208,13 @@
 "Dieser Befehl ist für den Einsatz in großen Umgebungen vorgesehen, in der "
 "viele Konten gleichzeitig erstellt werden müssen."
 
-#: chpasswd.8.xml:109(para)
+#: chpasswd.8.xml:112(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:115(term)
+#: chpasswd.8.xml:118(term)
 msgid ""
 "<option>-c</option>, <option>--crypt-method</option><replaceable>METHOD</"
 "replaceable>"
@@ -8926,15 +9222,15 @@
 "<option>-c</option>, <option>--crypt-method</option><replaceable>METHODE</"
 "replaceable>"
 
-#: chpasswd.8.xml:121(para) chgpasswd.8.xml:98(para)
+#: chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
 msgid "The available methods are DES, MD5, and NONE."
 msgstr "Die verfügbaren Methoden sind DES, MD5 und NONE."
 
-#: chpasswd.8.xml:128(para)
+#: chpasswd.8.xml:131(para)
 msgid "By default, PAM is used to encrypt the passwords."
 msgstr "Standardmäßig verschlüsselt PAM die Passwörter."
 
-#: chpasswd.8.xml:131(para)
+#: chpasswd.8.xml:134(para)
 msgid ""
 "By default (if none of the <option>-c</option>, <option>-m</option>, or "
 "<option>-e</option> options are specified), the encryption method is defined "
@@ -8947,19 +9243,19 @@
 "oder <option>MD5_CRYPT_ENAB</option> in <filename>/etc/login.defs</filename> "
 "bestimmt."
 
-#: chpasswd.8.xml:142(term) chgpasswd.8.xml:108(term)
+#: chpasswd.8.xml:145(term) chgpasswd.8.xml:111(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: chpasswd.8.xml:144(para) chgpasswd.8.xml:110(para)
+#: chpasswd.8.xml:147(para) chgpasswd.8.xml:113(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Passwörter werden verschlüsselt angegeben."
 
-#: chpasswd.8.xml:158(term) chgpasswd.8.xml:120(term)
+#: chpasswd.8.xml:161(term) chgpasswd.8.xml:123(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
-#: chpasswd.8.xml:160(para) chgpasswd.8.xml:122(para)
+#: chpasswd.8.xml:163(para) chgpasswd.8.xml:125(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -8967,7 +9263,7 @@
 "werwendet zur Verschlüsselung MD5 anstelle von DES, wenn die Passwörter "
 "unverschlüsselt angegeben werden"
 
-#: chpasswd.8.xml:167(term)
+#: chpasswd.8.xml:183(term)
 msgid ""
 "<option>-s</option>, <option>--sha-rounds</option><replaceable>ROUNDS</"
 "replaceable>"
@@ -8975,7 +9271,7 @@
 "<option>-s</option>, <option>--sha-rounds</option><replaceable>RUNDEN</"
 "replaceable>"
 
-#: chpasswd.8.xml:187(para)
+#: chpasswd.8.xml:203(para)
 msgid ""
 "By default, the number of rounds is defined by the "
 "<option>SHA_CRYPT_MIN_ROUNDS</option> and <option>SHA_CRYPT_MAX_ROUNDS</"
@@ -8985,7 +9281,7 @@
 "<option>SHA_CRYPT_MIN_ROUNDS</option> und <option>SHA_CRYPT_MAX_ROUNDS</"
 "option> <filename>/etc/login.defs</filename> bestimmt."
 
-#: chpasswd.8.xml:200(para) chgpasswd.8.xml:158(para)
+#: chpasswd.8.xml:216(para) chgpasswd.8.xml:174(para)
 msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
@@ -8993,15 +9289,15 @@
 "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:244(filename)
+#: chpasswd.8.xml:260(filename)
 msgid "/etc/pam.d/chpasswd"
 msgstr "/etc/pam.d/chpasswd"
 
-#: chpasswd.8.xml:246(para)
+#: chpasswd.8.xml:262(para)
 msgid "PAM configuration for <command>chpasswd</command>."
 msgstr "PAM-Konfiguration für <command>chpasswd</command>"
 
-#: chpasswd.8.xml:254(para)
+#: chpasswd.8.xml:270(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
@@ -9017,11 +9313,11 @@
 "manvolnum></citerefentry>, </phrase><citerefentry><refentrytitle>useradd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: chgpasswd.8.xml:48(refpurpose)
+#: chgpasswd.8.xml:51(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "aktualisiert Gruppenpasswörter im Batch-Modus"
 
-#: chgpasswd.8.xml:62(para)
+#: chgpasswd.8.xml:65(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 "
@@ -9031,7 +9327,7 @@
 "Passwort-Paaren von der Standardeingabe. Damit werden Gruppendaten "
 "aktualisiert. Jede Zeile muss folgendes Format haben:"
 
-#: chgpasswd.8.xml:67(para)
+#: chgpasswd.8.xml:70(para)
 msgid ""
 "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -9039,7 +9335,7 @@
 "<emphasis remap=\"I\">Gruppenname</emphasis>:<emphasis remap=\"I\">Passwort</"
 "emphasis>"
 
-#: chgpasswd.8.xml:71(para)
+#: chgpasswd.8.xml:74(para)
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
 "<command>chgpasswd</command>."
@@ -9047,26 +9343,32 @@
 "Das Passwort wird standardmäßig im Klartext angegeben. Die "
 "Standardalgorithmus zur Verschlüsselung ist DES."
 
-#: chgpasswd.8.xml:75(para)
+#: chgpasswd.8.xml:78(para)
+#, fuzzy
+#| 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 overwiten with the <option>-e</option>, <option>-m</option>, or "
+#| "<option>-c</option> options."
 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 "
-"overwiten with the <option>-e</option>, <option>-m</option>, or <option>-c</"
-"option> options."
+"<option>ENCRYPT_METHOD</option> variable of <filename>/etc/login.defs</"
+"filename>, and can be overwiten with the <option>-e</option>, <option>-m</"
+"option>, or <option>-c</option> options."
 msgstr ""
 "Der standardmäßige Verschlüsselungsalgorithmus wird systemweit mit der "
 "Variable ENCRYPT_METHOD in <filename>/etc/login.defs</filename> bestimmt. "
 "Dies kann mit den Optionen <option>-e</option>, <option>-m</option> oder "
 "<option>-c</option> überschrieben werden."
 
-#: chgpasswd.8.xml:89(para)
+#: chgpasswd.8.xml:92(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:209(para)
+#: chgpasswd.8.xml:225(para)
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
@@ -9081,47 +9383,28 @@
 "manvolnum></citerefentry>."
 
 # SB: Translation of chfn.1 based on Josef Spillner's (josef at ggzgamingzone.org) from 2003. Mention somewhere else as well?
-#: chfn.1.xml:47(refpurpose)
+#: chfn.1.xml:49(refpurpose)
 msgid "change real user name and information"
 msgstr "ändert den vollen Namen eines Benutzers und sonstige Informationen"
 
-#: chfn.1.xml:53(replaceable)
-msgid "full_name"
-msgstr "Voller_Name"
-
-#: 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:55(replaceable)
-msgid "work_ph"
-msgstr "Tel_dienstlich"
-
-#: chfn.1.xml:55(arg)
-msgid "-w <placeholder-1/>"
-msgstr "-w <placeholder-1/>"
-
-#: chfn.1.xml:56(replaceable)
-msgid "home_ph"
-msgstr "Tel_Privat"
-
-#: chfn.1.xml:57(replaceable)
-msgid "other"
-msgstr "sonstiges"
-
-#: chfn.1.xml:57(arg)
-msgid "-o <placeholder-1/>"
-msgstr "-o <placeholder-1/>"
-
-#: chfn.1.xml:64(para)
+#: chfn.1.xml:66(para)
+#, fuzzy
+#| msgid ""
+#| "The <command>chfn</command> command changes user fullname, office number, "
+#| "office extension, and home phone number information for a user's account. "
+#| "This information is typically printed by "
+#| "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry> and similar programs. A normal user may only "
+#| "change the fields for her own account, subject to the restrictions in "
+#| "<filename>/etc/login.defs</filename>. (The default configuration is to "
+#| "prevent users from changing their fullname.) The superuser may change any "
+#| "field for any account. Additionally, only the superuser may use the "
+#| "<option>-o</option> option to change the undefined portions of the GECOS "
+#| "field."
 msgid ""
-"The <command>chfn</command> command changes user fullname, office number, "
-"office extension, and home phone number information for a user's account. "
-"This information is typically printed by "
+"The <command>chfn</command> command changes user fullname, office room "
+"number, office phone number, and home phone number information for a user's "
+"account. This information is typically printed by "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and similar programs. A normal user may only change the fields "
 "for her own account, subject to the restrictions in <filename>/etc/login."
@@ -9141,7 +9424,7 @@
 "kann die Felder aller Konten verändern. Außerdem darf nur Root mittels der "
 "Option <option>-o</option> die undefinierten Teile des GECOS-Feldes ändern."
 
-#: chfn.1.xml:78(para)
+#: chfn.1.xml:80(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. "
@@ -9156,8 +9439,106 @@
 "Feld <emphasis remap=\"I\">sonstiges</emphasis> wird von anderen Anwendungen "
 "verwendet, um dort Informationen über das Konto abzuspeichern."
 
-#: chfn.1.xml:87(para)
+#: chfn.1.xml:93(para)
+#, fuzzy
+#| msgid "The options which apply to the <command>chsh</command> command are:"
+msgid "The options which apply to the <command>chfn</command> command are:"
+msgstr ""
+"Die Optionen, die vom Befehl <command>chsh</command> unterstützt werden, "
+"sind:"
+
+#: chfn.1.xml:98(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
+#| "replaceable>"
 msgid ""
+"<option>-f</option>, <option>--full-name</option><replaceable>FULL_NAME</"
+"replaceable>"
+msgstr ""
+"<option>-f</option>, <option>--inactive</option><replaceable>INAKTIV</"
+"replaceable>"
+
+#: chfn.1.xml:102(para)
+#, fuzzy
+#| msgid "Changing the default values"
+msgid "Change the user's full name."
+msgstr "Die Standardwerte verändern"
+
+#: chfn.1.xml:106(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-h</option>, <option>--home-phone</option><replaceable>HOME_PHONE</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HOME_VERZ</"
+"replaceable>"
+
+#: chfn.1.xml:110(para)
+msgid "Change the user's home phone number."
+msgstr ""
+
+#: chfn.1.xml:114(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-o</option>, <option>--other</option><replaceable>OTHER</replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HOME_VERZ</"
+"replaceable>"
+
+#: chfn.1.xml:118(para)
+msgid ""
+"Change the user's other GECOS information. This field is used to store "
+"accounting information used by other applications, and can be changed only "
+"by a superuser."
+msgstr ""
+
+#: chfn.1.xml:126(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-r</option>, <option>--room</option><replaceable>ROOM_NUMBER</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HOME_VERZ</"
+"replaceable>"
+
+#: chfn.1.xml:130(para)
+msgid "Change the user's room number."
+msgstr ""
+
+#: chfn.1.xml:147(term)
+#, fuzzy
+#| msgid "<option>-h</option>, <option>--help</option>"
+msgid "<option>-u</option>, <option>--help</option>"
+msgstr "<option>-h</option>, <option>--help</option>"
+
+#: chfn.1.xml:155(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-w</option>, <option>--work-phone</option><replaceable>WORK_PHONE</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HOME_VERZ</"
+"replaceable>"
+
+#: chfn.1.xml:159(para)
+msgid "Change the user's office phone number."
+msgstr ""
+
+#: chfn.1.xml:163(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 "
 "the fields. Enter the new value to change the field, or leave the line blank "
@@ -9172,7 +9553,7 @@
 "wird zwischen einem Paar von <emphasis remap=\"B\">[ ]</emphasis> angezeigt. "
 "Ohne Optionen fragt <command>chfn</command> nach einem Benutzerkonto."
 
-#: chfn.1.xml:132(para)
+#: chfn.1.xml:208(para)
 msgid ""
 "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -9186,11 +9567,11 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chage.1.xml:44(refpurpose)
+#: chage.1.xml:47(refpurpose)
 msgid "change user password expiry information"
 msgstr "ändert die Information zum Passwortverfall"
 
-#: chage.1.xml:60(para)
+#: chage.1.xml:63(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 "
@@ -9201,13 +9582,13 @@
 "Information bestimmt das System, wann ein Benutzer sein Passwort verändern "
 "muss."
 
-#: chage.1.xml:70(para)
+#: chage.1.xml:73(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:75(term)
+#: chage.1.xml:78(term)
 msgid ""
 "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
 "replaceable>"
@@ -9216,7 +9597,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:79(para)
+#: chage.1.xml:82(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 "
@@ -9227,7 +9608,7 @@
 "JJJJ-MM-TT (oder in dem Format, das in Ihrer Region verbreitet ist) "
 "angegeben werden."
 
-#: chage.1.xml:87(term)
+#: chage.1.xml:90(term)
 msgid ""
 "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -9235,7 +9616,7 @@
 "<option>-E</option>, <option>--expiredate</"
 "option><replaceable>VERFALLSDATUM</replaceable>"
 
-#: chage.1.xml:91(para)
+#: chage.1.xml:94(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 "
@@ -9250,7 +9631,7 @@
 "Systemadministrator in Verbindung setzen, ehe er sich wieder am System "
 "anmelden kann."
 
-#: chage.1.xml:99(para)
+#: chage.1.xml:102(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>EXPIRE_DATE</replaceable> will remove an account expiration "
@@ -9259,7 +9640,7 @@
 "Wenn <emphasis remap=\"I\">-1</emphasis> als <replaceable>VERFALLSDATUM</"
 "replaceable> angegeben wird, wird das Verfallsdatum für das Konto entfernt."
 
-#: chage.1.xml:113(term)
+#: chage.1.xml:116(term)
 msgid ""
 "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -9267,7 +9648,7 @@
 "<option>-I</option>, <option>--inactive</option><replaceable>INAKTIV</"
 "replaceable>"
 
-#: chage.1.xml:117(para)
+#: chage.1.xml:120(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 "
@@ -9281,7 +9662,7 @@
 "mit dem Systemadministrator in Verbindung setzen, ehe er sich wieder am "
 "System anmelden kann."
 
-#: chage.1.xml:124(para)
+#: chage.1.xml:127(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>INACTIVE</replaceable> will remove an account's inactivity."
@@ -9290,11 +9671,11 @@
 "replaceable> angegeben wird, wird die Überwachung der fehlenden Verwendung "
 "des Kontos entfernt."
 
-#: chage.1.xml:136(para)
+#: chage.1.xml:139(para)
 msgid "Show account aging information."
 msgstr "zeigt Informationen zur Kontoalterung an"
 
-#: chage.1.xml:142(term)
+#: chage.1.xml:145(term)
 msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -9302,7 +9683,7 @@
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_TAGE</"
 "replaceable>"
 
-#: chage.1.xml:154(term)
+#: chage.1.xml:157(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -9310,7 +9691,7 @@
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_TAGE</"
 "replaceable>"
 
-#: chage.1.xml:158(para)
+#: chage.1.xml:161(para)
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
@@ -9326,7 +9707,7 @@
 "option> werden die Benutzer vor dem drohenden Verfall ihres Passworts "
 "gewarnt."
 
-#: chage.1.xml:167(para)
+#: chage.1.xml:170(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as "
 "<replaceable>MAX_DAYS</replaceable> will remove checking a password's "
@@ -9335,7 +9716,7 @@
 "Wenn <emphasis remap=\"I\">-1</emphasis> als <replaceable>MAX_TAGE</"
 "replaceable> angegeben wird, wird der Passwortverfall entfernt."
 
-#: chage.1.xml:175(term)
+#: chage.1.xml:191(term)
 msgid ""
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -9343,7 +9724,7 @@
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_TAGE</"
 "replaceable>"
 
-#: chage.1.xml:179(para)
+#: chage.1.xml:195(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 "
@@ -9355,7 +9736,7 @@
 "replaceable> bezeichnet die Anzahl der Tage, für die ein Benutzer vor "
 "Verfall seines Passworts gewarnt wird."
 
-#: chage.1.xml:188(para)
+#: chage.1.xml:204(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 "
@@ -9370,7 +9751,7 @@
 "aktuelle Wert wird zwischen einem Paar von <emphasis remap=\"B\">[ ]</"
 "emphasis> angezeigt."
 
-#: chage.1.xml:198(para)
+#: chage.1.xml:214(para)
 msgid ""
 "The <command>chage</command> program requires a shadow password file to be "
 "available."
@@ -9378,7 +9759,7 @@
 "Für das Programm <command>chage</command> ist es notwendig, dass eine Shadow-"
 "Passwort-Datei vorhanden ist."
 
-#: chage.1.xml:202(para)
+#: chage.1.xml:218(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 "
@@ -9388,15 +9769,15 @@
 "Alle anderen Benutzer können nur die Option <option>-l</option> verwenden, "
 "um die Verfallsdaten für ihr Konto einzusehen."
 
-#: chage.1.xml:267(replaceable)
+#: chage.1.xml:283(replaceable)
 msgid "15"
 msgstr "15"
 
-#: chage.1.xml:269(para)
+#: chage.1.xml:285(para)
 msgid "can't find the shadow password file"
 msgstr "Eine Shadow-Passwort-Datei kann nicht gefunden werden."
 
-#: chage.1.xml:245(para)
+#: chage.1.xml:261(para)
 msgid ""
 "The <command>chage</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -9408,3 +9789,53 @@
 #: chage.1.xml:0(None)
 msgid "translator-credits"
 msgstr "Simon Brandmair (sbrandmair at gmx.net), 2005, 2007, 2011."
+
+#~ msgid "-q"
+#~ msgstr "-q"
+
+#~ msgid "-s"
+#~ msgstr "-s"
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+#~ "\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+#~ "phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+#~ "\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+#~ "phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid "new_users"
+#~ msgstr "neue_benutzer"
+
+#~ msgid "full_name"
+#~ msgstr "Voller_Name"
+
+#~ msgid "-f <placeholder-1/>"
+#~ msgstr "-f <placeholder-1/>"
+
+#~ msgid "room_no"
+#~ msgstr "Zimmer_Nr"
+
+#~ msgid "work_ph"
+#~ msgstr "Tel_dienstlich"
+
+#~ msgid "-w <placeholder-1/>"
+#~ msgstr "-w <placeholder-1/>"
+
+#~ msgid "home_ph"
+#~ msgstr "Tel_Privat"
+
+#~ msgid "other"
+#~ msgstr "sonstiges"
+
+#~ msgid "-o <placeholder-1/>"
+#~ msgstr "-o <placeholder-1/>"

Modified: upstream/trunk/man/po/fr.po
===================================================================
--- upstream/trunk/man/po/fr.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/man/po/fr.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow-man-pages 4.0.18\n"
-"POT-Creation-Date: 2010-08-29 17:54+0200\n"
+"POT-Creation-Date: 2011-11-13 18:43+0100\n"
 "PO-Revision-Date: 2011-07-14 16:13+0200\n"
 "Last-Translator: Thomas Blein <tblein at tblein.eu>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -32,75 +32,104 @@
 "X-Poedit-Country: FRANCE\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: vipw.8.xml:39(refentrytitle) vipw.8.xml:44(refname) vipw.8.xml:53(command)
-#: login.defs.5.xml:477(term)
+#: vipw.8.xml:40(refentrytitle) vipw.8.xml:47(refname) vipw.8.xml:56(command)
+#: login.defs.5.xml:480(term)
 msgid "vipw"
 msgstr "vipw"
 
-#: vipw.8.xml:40(manvolnum) usermod.8.xml:42(manvolnum)
-#: userdel.8.xml:44(manvolnum) userdel.8.xml:203(replaceable)
-#: useradd.8.xml:53(manvolnum) pwconv.8.xml:44(manvolnum)
-#: pwck.8.xml:44(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:130(replaceable)
-#: groupadd.8.xml:42(manvolnum) faillog.8.xml:35(manvolnum)
-#: faillog.5.xml:86(manvolnum) chpasswd.8.xml:42(manvolnum)
-#: chgpasswd.8.xml:43(manvolnum)
+#: vipw.8.xml:41(manvolnum) usermod.8.xml:43(manvolnum)
+#: userdel.8.xml:45(manvolnum) userdel.8.xml:219(replaceable)
+#: useradd.8.xml:54(manvolnum) pwconv.8.xml:45(manvolnum)
+#: pwck.8.xml:45(manvolnum) nologin.8.xml:39(manvolnum)
+#: newusers.8.xml:52(manvolnum) logoutd.8.xml:39(manvolnum)
+#: lastlog.8.xml:40(manvolnum) grpck.8.xml:40(manvolnum)
+#: groupmod.8.xml:40(manvolnum) groupmems.8.xml:40(manvolnum)
+#: groupdel.8.xml:40(manvolnum) groupdel.8.xml:163(replaceable)
+#: groupadd.8.xml:42(manvolnum) faillog.8.xml:39(manvolnum)
+#: faillog.5.xml:92(manvolnum) chpasswd.8.xml:43(manvolnum)
+#: chgpasswd.8.xml:44(manvolnum)
 msgid "8"
 msgstr "8"
 
-#: vipw.8.xml:41(refmiscinfo) usermod.8.xml:43(refmiscinfo)
-#: userdel.8.xml:45(refmiscinfo) useradd.8.xml:54(refmiscinfo)
-#: pwconv.8.xml:45(refmiscinfo) pwck.8.xml:45(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:43(refmiscinfo) faillog.8.xml:36(refmiscinfo)
-#: chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
+#: vipw.8.xml:42(refmiscinfo) usermod.8.xml:44(refmiscinfo)
+#: userdel.8.xml:46(refmiscinfo) useradd.8.xml:55(refmiscinfo)
+#: pwconv.8.xml:46(refmiscinfo) pwck.8.xml:46(refmiscinfo)
+#: nologin.8.xml:40(refmiscinfo) newusers.8.xml:53(refmiscinfo)
+#: logoutd.8.xml:40(refmiscinfo) lastlog.8.xml:41(refmiscinfo)
+#: grpck.8.xml:41(refmiscinfo) groupmod.8.xml:41(refmiscinfo)
+#: groupmems.8.xml:41(refmiscinfo) groupdel.8.xml:41(refmiscinfo)
+#: groupadd.8.xml:43(refmiscinfo) faillog.8.xml:40(refmiscinfo)
+#: chpasswd.8.xml:44(refmiscinfo) chgpasswd.8.xml:45(refmiscinfo)
 msgid "System Management Commands"
 msgstr "Commandes de gestion du système"
 
-#: vipw.8.xml:45(refname) vipw.8.xml:59(command)
+#: vipw.8.xml:43(refmiscinfo) usermod.8.xml:45(refmiscinfo)
+#: userdel.8.xml:47(refmiscinfo) useradd.8.xml:56(refmiscinfo)
+#: suauth.5.xml:41(refmiscinfo) su.1.xml:58(refmiscinfo)
+#: sg.1.xml:42(refmiscinfo) shadow.5.xml:41(refmiscinfo)
+#: shadow.3.xml:41(refmiscinfo) pwconv.8.xml:47(refmiscinfo)
+#: pwck.8.xml:47(refmiscinfo) porttime.5.xml:41(refmiscinfo)
+#: passwd.5.xml:41(refmiscinfo) passwd.1.xml:48(refmiscinfo)
+#: nologin.8.xml:41(refmiscinfo) newusers.8.xml:54(refmiscinfo)
+#: newgrp.1.xml:42(refmiscinfo) logoutd.8.xml:41(refmiscinfo)
+#: login.defs.5.xml:104(refmiscinfo) login.access.5.xml:42(refmiscinfo)
+#: login.1.xml:74(refmiscinfo) limits.5.xml:42(refmiscinfo)
+#: lastlog.8.xml:42(refmiscinfo) gshadow.5.xml:40(refmiscinfo)
+#: grpck.8.xml:42(refmiscinfo) groups.1.xml:41(refmiscinfo)
+#: groupmod.8.xml:42(refmiscinfo) groupmems.8.xml:42(refmiscinfo)
+#: groupdel.8.xml:42(refmiscinfo) groupadd.8.xml:44(refmiscinfo)
+#: gpasswd.1.xml:46(refmiscinfo) faillog.8.xml:41(refmiscinfo)
+#: faillog.5.xml:41(refmiscinfo) expiry.1.xml:45(refmiscinfo)
+#: chsh.1.xml:44(refmiscinfo) chpasswd.8.xml:45(refmiscinfo)
+#: chgpasswd.8.xml:46(refmiscinfo) chfn.1.xml:44(refmiscinfo)
+#: chage.1.xml:42(refmiscinfo)
+#, fuzzy
+#| msgid "shadow"
+msgid "shadow-utils"
+msgstr "shadow"
+
+#: vipw.8.xml:48(refname) vipw.8.xml:62(command)
 msgid "vigr"
 msgstr "vigr"
 
-#: vipw.8.xml:46(refpurpose)
+#: vipw.8.xml:49(refpurpose)
 msgid "edit the password, group, shadow-password or shadow-group file"
 msgstr "Éditer les fichiers passwd, group, shadow ou gshadow"
 
-#: vipw.8.xml:55(replaceable) vipw.8.xml:61(replaceable)
-#: usermod.8.xml:54(replaceable) userdel.8.xml:54(arg)
-#: useradd.8.xml:64(replaceable) useradd.8.xml:76(replaceable)
-#: su.1.xml:66(replaceable) passwd.1.xml:57(replaceable)
-#: newusers.8.xml:63(replaceable) lastlog.8.xml:48(replaceable)
-#: groupmod.8.xml:51(replaceable) groupadd.8.xml:54(replaceable)
-#: faillog.8.xml:47(replaceable) chsh.1.xml:53(replaceable)
-#: chpasswd.8.xml:54(replaceable) chgpasswd.8.xml:55(replaceable)
-#: chage.1.xml:50(replaceable)
+#: vipw.8.xml:58(replaceable) vipw.8.xml:64(replaceable)
+#: usermod.8.xml:57(replaceable) userdel.8.xml:57(arg)
+#: useradd.8.xml:67(replaceable) useradd.8.xml:79(replaceable)
+#: su.1.xml:69(replaceable) pwconv.8.xml:62(replaceable)
+#: pwconv.8.xml:68(replaceable) pwconv.8.xml:74(replaceable)
+#: pwconv.8.xml:80(replaceable) pwck.8.xml:58(arg)
+#: passwd.1.xml:60(replaceable) newusers.8.xml:66(replaceable)
+#: lastlog.8.xml:54(replaceable) grpck.8.xml:53(arg)
+#: groupmod.8.xml:54(replaceable) groupdel.8.xml:54(replaceable)
+#: groupadd.8.xml:56(replaceable) faillog.8.xml:53(replaceable)
+#: chsh.1.xml:56(replaceable) chpasswd.8.xml:57(replaceable)
+#: chgpasswd.8.xml:58(replaceable) chfn.1.xml:56(replaceable)
+#: chage.1.xml:53(replaceable)
 msgid "options"
 msgstr "options"
 
-#: vipw.8.xml:67(title) usermod.8.xml:61(title) userdel.8.xml:62(title)
-#: useradd.8.xml:82(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:71(title) pwck.8.xml:86(title)
-#: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
-#: nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title)
-#: logoutd.8.xml:50(title) login.defs.5.xml:110(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:63(title) gpasswd.1.xml:72(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:59(title)
+#: vipw.8.xml:70(title) usermod.8.xml:64(title) userdel.8.xml:65(title)
+#: useradd.8.xml:85(title) suauth.5.xml:56(title) su.1.xml:80(title)
+#: sg.1.xml:62(title) shadow.5.xml:50(title) shadow.3.xml:99(title)
+#: shadow.3.xml:155(title) pwconv.8.xml:86(title) pwck.8.xml:73(title)
+#: porttime.5.xml:50(title) passwd.5.xml:50(title) passwd.1.xml:69(title)
+#: nologin.8.xml:56(title) newusers.8.xml:75(title) newgrp.1.xml:58(title)
+#: logoutd.8.xml:56(title) login.defs.5.xml:113(title)
+#: login.access.5.xml:51(title) login.1.xml:106(title) limits.5.xml:52(title)
+#: lastlog.8.xml:60(title) gshadow.5.xml:49(title) grpck.8.xml:64(title)
+#: groups.1.xml:59(title) groupmod.8.xml:61(title) groupmems.8.xml:63(title)
+#: groupdel.8.xml:61(title) groupadd.8.xml:65(title) gpasswd.1.xml:75(title)
+#: faillog.8.xml:59(title) faillog.5.xml:50(title) expiry.1.xml:63(title)
+#: chsh.1.xml:65(title) chpasswd.8.xml:63(title) chgpasswd.8.xml:64(title)
+#: chfn.1.xml:65(title) chage.1.xml:62(title)
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
-#: vipw.8.xml:68(para)
+#: vipw.8.xml:71(para)
 msgid ""
 "The <command>vipw</command> and <command>vigr</command> commands edits the "
 "files <filename>/etc/passwd</filename> and <filename>/etc/group</filename>, "
@@ -125,17 +154,18 @@
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> est utilisé quand ces variables ne sont pas définie."
 
-#: vipw.8.xml:85(title) usermod.8.xml:69(title) userdel.8.xml:71(title)
-#: useradd.8.xml:100(title) su.1.xml:123(title) pwck.8.xml:170(title)
-#: passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title)
-#: lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title)
-#: groupmems.8.xml:75(title) groupadd.8.xml:72(title) gpasswd.1.xml:112(title)
-#: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:108(title)
-#: chgpasswd.8.xml:88(title) chage.1.xml:69(title)
+#: vipw.8.xml:88(title) usermod.8.xml:72(title) userdel.8.xml:74(title)
+#: useradd.8.xml:103(title) su.1.xml:126(title) pwconv.8.xml:168(title)
+#: pwck.8.xml:157(title) passwd.1.xml:155(title) newusers.8.xml:244(title)
+#: login.1.xml:191(title) lastlog.8.xml:72(title) grpck.8.xml:128(title)
+#: groupmod.8.xml:70(title) groupmems.8.xml:78(title) groupdel.8.xml:69(title)
+#: groupadd.8.xml:74(title) gpasswd.1.xml:115(title) faillog.8.xml:70(title)
+#: expiry.1.xml:72(title) chsh.1.xml:76(title) chpasswd.8.xml:111(title)
+#: chgpasswd.8.xml:91(title) chfn.1.xml:92(title) chage.1.xml:72(title)
 msgid "OPTIONS"
 msgstr "OPTIONS"
 
-#: vipw.8.xml:86(para)
+#: vipw.8.xml:89(para)
 msgid ""
 "The options which apply to the <command>vipw</command> and <command>vigr</"
 "command> commands are:"
@@ -143,81 +173,122 @@
 "Les options applicables aux commandes <command>vipw</command> et "
 "<command>vigr</command> sont :"
 
-#: vipw.8.xml:92(term)
+#: vipw.8.xml:95(term)
 msgid "<option>-g</option>, <option>--group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: vipw.8.xml:94(para)
+#: vipw.8.xml:97(para)
 msgid "Edit group database."
 msgstr "Éditer la base de données de groupes."
 
-#: vipw.8.xml:98(term) userdel.8.xml:101(term) useradd.8.xml:250(term)
-#: passwd.1.xml:192(term) newusers.8.xml:257(term) lastlog.8.xml:82(term)
-#: groupmod.8.xml:98(term) groupmems.8.xml:117(term) groupadd.8.xml:107(term)
-#: gpasswd.1.xml:151(term) faillog.8.xml:97(term) chsh.1.xml:79(term)
-#: chpasswd.8.xml:150(term) chgpasswd.8.xml:114(term) chage.1.xml:107(term)
+#: vipw.8.xml:101(term) userdel.8.xml:104(term) useradd.8.xml:253(term)
+#: pwconv.8.xml:176(term) pwck.8.xml:167(term) passwd.1.xml:195(term)
+#: newusers.8.xml:262(term) lastlog.8.xml:88(term) grpck.8.xml:138(term)
+#: groupmod.8.xml:105(term) groupmems.8.xml:120(term) groupdel.8.xml:76(term)
+#: groupadd.8.xml:109(term) gpasswd.1.xml:154(term) faillog.8.xml:103(term)
+#: expiry.1.xml:93(term) chsh.1.xml:82(term) chpasswd.8.xml:153(term)
+#: chgpasswd.8.xml:117(term) chage.1.xml:110(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
-#: vipw.8.xml:100(para) userdel.8.xml:103(para) useradd.8.xml:252(para)
-#: passwd.1.xml:194(para) newusers.8.xml:259(para) lastlog.8.xml:86(para)
-#: groupmod.8.xml:100(para) groupmems.8.xml:119(para) groupadd.8.xml:109(para)
-#: gpasswd.1.xml:153(para) faillog.8.xml:99(para) chsh.1.xml:81(para)
-#: chpasswd.8.xml:152(para) chgpasswd.8.xml:116(para) chage.1.xml:109(para)
+#: vipw.8.xml:103(para) userdel.8.xml:106(para) useradd.8.xml:255(para)
+#: pwconv.8.xml:178(para) pwck.8.xml:169(para) passwd.1.xml:197(para)
+#: newusers.8.xml:264(para) lastlog.8.xml:92(para) grpck.8.xml:140(para)
+#: groupmod.8.xml:107(para) groupmems.8.xml:122(para) groupdel.8.xml:78(para)
+#: groupadd.8.xml:111(para) gpasswd.1.xml:156(para) faillog.8.xml:105(para)
+#: expiry.1.xml:95(para) chsh.1.xml:84(para) chpasswd.8.xml:155(para)
+#: chgpasswd.8.xml:119(para) chfn.1.xml:151(para) chage.1.xml:112(para)
 msgid "Display help message and exit."
 msgstr "Afficher un message d'aide et quitter."
 
-#: vipw.8.xml:104(term)
+#: vipw.8.xml:107(term)
 msgid "<option>-p</option>, <option>--passwd</option>"
 msgstr "<option>-p</option>, <option>--passwd</option>"
 
-#: vipw.8.xml:106(para)
+#: vipw.8.xml:109(para)
 msgid "Edit passwd database."
 msgstr "Éditer la base de données passwd."
 
-#: vipw.8.xml:110(term) passwd.1.xml:259(term)
+#: vipw.8.xml:113(term) pwck.8.xml:173(term) passwd.1.xml:262(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:112(para) passwd.1.xml:263(para)
+#: vipw.8.xml:115(para) passwd.1.xml:266(para)
 msgid "Quiet mode."
 msgstr "Mode silencieux."
 
-#: vipw.8.xml:116(term)
+#: vipw.8.xml:119(term) usermod.8.xml:298(term) userdel.8.xml:127(term)
+#: useradd.8.xml:438(term) pwconv.8.xml:182(term) pwck.8.xml:190(term)
+#: passwd.1.xml:282(term) newusers.8.xml:287(term) lastlog.8.xml:96(term)
+#: grpck.8.xml:154(term) groupmod.8.xml:156(term) groupmems.8.xml:143(term)
+#: groupdel.8.xml:82(term) groupadd.8.xml:184(term) faillog.8.xml:163(term)
+#: chsh.1.xml:88(term) chpasswd.8.xml:170(term) chgpasswd.8.xml:132(term)
+#: chfn.1.xml:134(term) chage.1.xml:178(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-R</option>, <option>--root</option><replaceable>CHROOT_DIR</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option> <replaceable>RÉP_PERSO</"
+"replaceable>"
+
+#: vipw.8.xml:124(para) usermod.8.xml:303(para) userdel.8.xml:132(para)
+#: useradd.8.xml:443(para) pwconv.8.xml:187(para) pwck.8.xml:195(para)
+#: passwd.1.xml:287(para) newusers.8.xml:292(para) lastlog.8.xml:101(para)
+#: grpck.8.xml:159(para) groupmod.8.xml:161(para) groupmems.8.xml:148(para)
+#: groupdel.8.xml:87(para) groupadd.8.xml:189(para) gpasswd.1.xml:167(para)
+#: faillog.8.xml:168(para) chsh.1.xml:93(para) chpasswd.8.xml:175(para)
+#: chgpasswd.8.xml:137(para) chfn.1.xml:139(para) chage.1.xml:183(para)
+#, fuzzy
+#| msgid ""
+#| "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
+#| "replaceable>."
+msgid ""
+"Apply changes in the <replaceable>CHROOT_DIR</replaceable> directory and use "
+"the configuration files from the <replaceable>CHROOT_DIR</replaceable> "
+"directory."
+msgstr ""
+"Ajouter l'<replaceable>utilisateur</replaceable> à ce <replaceable>groupe</"
+"replaceable>."
+
+#: vipw.8.xml:132(term)
 msgid "<option>-s</option>, <option>--shadow</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: vipw.8.xml:118(para)
+#: vipw.8.xml:134(para)
 msgid "Edit shadow or gshadow database."
 msgstr "Éditer les bases de données shadow ou gshadow."
 
-#: vipw.8.xml:122(term)
+#: vipw.8.xml:138(term)
 msgid "<option>-u</option>, <option>--user</option>"
 msgstr "<option>-u</option>, <option>--user</option>"
 
-#: vipw.8.xml:124(para)
+#: vipw.8.xml:140(para)
 msgid "Indicates which user's tcb shadow file to edit."
 msgstr "Indique l'utilisateur dont le fichier shadow de tcb doit être édité."
 
-#: vipw.8.xml:131(title) usermod.8.xml:374(title) userdel.8.xml:127(title)
-#: useradd.8.xml:629(title) su.1.xml:310(title) sg.1.xml:76(title)
-#: pwconv.8.xml:164(title) pwck.8.xml:230(title) passwd.1.xml:356(title)
-#: newusers.8.xml:324(title) newgrp.1.xml:87(title) login.1.xml:272(title)
-#: grpck.8.xml:173(title) groupmod.8.xml:152(title) groupmems.8.xml:162(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:185(title) gpasswd.1.xml:226(title)
-#: chsh.1.xml:120(title) chpasswd.8.xml:207(title) chgpasswd.8.xml:169(title)
-#: chfn.1.xml:99(title) chage.1.xml:210(title)
+#: vipw.8.xml:147(title) usermod.8.xml:404(title) userdel.8.xml:143(title)
+#: useradd.8.xml:645(title) su.1.xml:320(title) sg.1.xml:79(title)
+#: pwconv.8.xml:209(title) pwck.8.xml:234(title) passwd.1.xml:372(title)
+#: newusers.8.xml:342(title) newgrp.1.xml:90(title) login.1.xml:275(title)
+#: grpck.8.xml:191(title) groupmod.8.xml:172(title) groupmems.8.xml:178(title)
+#: groupdel.8.xml:110(title) groupadd.8.xml:200(title)
+#: gpasswd.1.xml:244(title) chsh.1.xml:136(title) chpasswd.8.xml:223(title)
+#: chgpasswd.8.xml:185(title) chfn.1.xml:175(title) chage.1.xml:226(title)
 msgid "CONFIGURATION"
 msgstr "CONFIGURATION"
 
-#: vipw.8.xml:132(para) usermod.8.xml:375(para) userdel.8.xml:128(para)
-#: useradd.8.xml:630(para) su.1.xml:311(para) sg.1.xml:77(para)
-#: pwck.8.xml:231(para) passwd.1.xml:357(para) newusers.8.xml:325(para)
-#: newgrp.1.xml:88(para) login.1.xml:273(para) grpck.8.xml:174(para)
-#: groupmod.8.xml:153(para) groupmems.8.xml:163(para) groupdel.8.xml:78(para)
-#: groupadd.8.xml:186(para) gpasswd.1.xml:227(para) chsh.1.xml:121(para)
-#: chpasswd.8.xml:208(para) chgpasswd.8.xml:170(para) chfn.1.xml:100(para)
-#: chage.1.xml:211(para)
+#: vipw.8.xml:148(para) usermod.8.xml:405(para) userdel.8.xml:144(para)
+#: useradd.8.xml:646(para) su.1.xml:321(para) sg.1.xml:80(para)
+#: pwck.8.xml:235(para) passwd.1.xml:373(para) newusers.8.xml:343(para)
+#: newgrp.1.xml:91(para) login.1.xml:276(para) grpck.8.xml:192(para)
+#: groupmod.8.xml:173(para) groupmems.8.xml:179(para) groupdel.8.xml:111(para)
+#: groupadd.8.xml:201(para) gpasswd.1.xml:245(para) chsh.1.xml:137(para)
+#: chpasswd.8.xml:224(para) chgpasswd.8.xml:186(para) chfn.1.xml:176(para)
+#: chage.1.xml:227(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of this tool:"
@@ -243,143 +314,145 @@
 "shadow de <citerefentry><refentrytitle>tcb</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry> sera utilisé."
 
-#: vipw.8.xml:143(title)
+#: vipw.8.xml:159(title)
 msgid "ENVIRONMENT"
 msgstr "ENVIRONNEMENT"
 
-#: vipw.8.xml:146(option)
+#: vipw.8.xml:162(option)
 msgid "VISUAL"
 msgstr "VISUAL"
 
-#: vipw.8.xml:148(para)
+#: vipw.8.xml:164(para)
 msgid "Editor to be used."
 msgstr "L'éditeur à utiliser"
 
-#: vipw.8.xml:152(option)
+#: vipw.8.xml:168(option)
 msgid "EDITOR"
 msgstr "EDITOR"
 
-#: vipw.8.xml:154(para)
+#: vipw.8.xml:170(para)
 msgid "Editor to be used if <option>VISUAL</option> is not set."
 msgstr "L'éditeur à utiliser si <option>VISUAL</option> n'est pas définie."
 
-#: vipw.8.xml:161(title) usermod.8.xml:389(title) userdel.8.xml:144(title)
-#: useradd.8.xml:655(title) suauth.5.xml:168(title) su.1.xml:338(title)
-#: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
-#: pwconv.8.xml:187(title) pwck.8.xml:247(title) porttime.5.xml:105(title)
-#: passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(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:170(title) lastlog.8.xml:147(title)
-#: gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title)
-#: groupmod.8.xml:164(title) groupmems.8.xml:174(title)
-#: groupdel.8.xml:89(title) groupadd.8.xml:199(title) gpasswd.1.xml:241(title)
-#: faillog.8.xml:210(title) faillog.5.xml:71(title) expiry.1.xml:68(title)
-#: chsh.1.xml:133(title) chpasswd.8.xml:223(title) chgpasswd.8.xml:184(title)
-#: chfn.1.xml:113(title) chage.1.xml:222(title)
+#: vipw.8.xml:177(title) usermod.8.xml:419(title) userdel.8.xml:160(title)
+#: useradd.8.xml:671(title) suauth.5.xml:174(title) su.1.xml:348(title)
+#: sg.1.xml:91(title) shadow.5.xml:236(title) shadow.3.xml:207(title)
+#: pwconv.8.xml:232(title) pwck.8.xml:251(title) porttime.5.xml:111(title)
+#: passwd.5.xml:122(title) passwd.1.xml:390(title) newusers.8.xml:375(title)
+#: newgrp.1.xml:102(title) logoutd.8.xml:70(title)
+#: login.access.5.xml:102(title) login.1.xml:319(title)
+#: limits.5.xml:176(title) lastlog.8.xml:166(title) gshadow.5.xml:147(title)
+#: grpck.8.xml:203(title) groups.1.xml:81(title) groupmod.8.xml:184(title)
+#: groupmems.8.xml:190(title) groupdel.8.xml:122(title)
+#: groupadd.8.xml:214(title) gpasswd.1.xml:259(title) faillog.8.xml:229(title)
+#: faillog.5.xml:77(title) expiry.1.xml:102(title) chsh.1.xml:149(title)
+#: chpasswd.8.xml:239(title) chgpasswd.8.xml:200(title) chfn.1.xml:189(title)
+#: chage.1.xml:238(title)
 msgid "FILES"
 msgstr "FICHIERS"
 
-#: vipw.8.xml:164(filename) usermod.8.xml:392(filename)
-#: userdel.8.xml:147(filename) useradd.8.xml:670(filename)
-#: sg.1.xml:103(filename) pwck.8.xml:250(filename)
-#: newusers.8.xml:372(filename) newgrp.1.xml:114(filename)
-#: gshadow.5.xml:144(filename) grpck.8.xml:188(filename)
-#: groups.1.xml:78(filename) groupmod.8.xml:167(filename)
-#: groupmems.8.xml:177(filename) groupdel.8.xml:92(filename)
-#: groupadd.8.xml:202(filename) gpasswd.1.xml:50(filename)
-#: gpasswd.1.xml:53(filename) gpasswd.1.xml:244(filename)
-#: chgpasswd.8.xml:187(filename)
+#: vipw.8.xml:180(filename) usermod.8.xml:422(filename)
+#: userdel.8.xml:163(filename) useradd.8.xml:686(filename)
+#: sg.1.xml:106(filename) pwck.8.xml:254(filename)
+#: newusers.8.xml:390(filename) newgrp.1.xml:117(filename)
+#: gshadow.5.xml:150(filename) grpck.8.xml:206(filename)
+#: groups.1.xml:84(filename) groupmod.8.xml:187(filename)
+#: groupmems.8.xml:193(filename) groupdel.8.xml:125(filename)
+#: groupadd.8.xml:217(filename) gpasswd.1.xml:53(filename)
+#: gpasswd.1.xml:56(filename) gpasswd.1.xml:262(filename)
+#: chgpasswd.8.xml:203(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
-#: vipw.8.xml:166(para) usermod.8.xml:394(para) userdel.8.xml:149(para)
-#: useradd.8.xml:672(para) sg.1.xml:105(para) pwck.8.xml:252(para)
-#: newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para)
-#: grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
-#: groupmems.8.xml:179(para) groupdel.8.xml:94(para) groupadd.8.xml:204(para)
-#: gpasswd.1.xml:246(para) chgpasswd.8.xml:189(para)
+#: vipw.8.xml:182(para) usermod.8.xml:424(para) userdel.8.xml:165(para)
+#: useradd.8.xml:688(para) sg.1.xml:108(para) pwck.8.xml:256(para)
+#: newusers.8.xml:392(para) newgrp.1.xml:119(para) gshadow.5.xml:152(para)
+#: grpck.8.xml:208(para) groups.1.xml:86(para) groupmod.8.xml:189(para)
+#: groupmems.8.xml:195(para) groupdel.8.xml:127(para) groupadd.8.xml:219(para)
+#: gpasswd.1.xml:264(para) chgpasswd.8.xml:205(para)
 msgid "Group account information."
 msgstr "Informations sur les groupes."
 
-#: vipw.8.xml:170(filename) usermod.8.xml:398(filename)
-#: useradd.8.xml:676(filename) sg.1.xml:109(filename)
-#: newusers.8.xml:378(filename) newgrp.1.xml:120(filename)
-#: gshadow.5.xml:150(filename) grpck.8.xml:194(filename)
-#: groupmod.8.xml:173(filename) groupmems.8.xml:183(filename)
-#: groupdel.8.xml:98(filename) groupadd.8.xml:208(filename)
-#: gpasswd.1.xml:54(filename) gpasswd.1.xml:250(filename)
-#: chgpasswd.8.xml:193(filename)
+#: vipw.8.xml:186(filename) usermod.8.xml:428(filename)
+#: useradd.8.xml:692(filename) sg.1.xml:112(filename)
+#: newusers.8.xml:396(filename) newgrp.1.xml:123(filename)
+#: gshadow.5.xml:156(filename) grpck.8.xml:212(filename)
+#: groupmod.8.xml:193(filename) groupmems.8.xml:199(filename)
+#: groupdel.8.xml:131(filename) groupadd.8.xml:223(filename)
+#: gpasswd.1.xml:57(filename) gpasswd.1.xml:268(filename)
+#: chgpasswd.8.xml:209(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
-#: vipw.8.xml:172(para) usermod.8.xml:400(para) useradd.8.xml:678(para)
-#: sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para)
-#: gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para)
-#: groupdel.8.xml:100(para) groupadd.8.xml:210(para) gpasswd.1.xml:252(para)
-#: chgpasswd.8.xml:195(para)
+#: vipw.8.xml:188(para) usermod.8.xml:430(para) useradd.8.xml:694(para)
+#: sg.1.xml:114(para) newusers.8.xml:398(para) newgrp.1.xml:125(para)
+#: gshadow.5.xml:158(para) grpck.8.xml:214(para) groupmod.8.xml:195(para)
+#: groupdel.8.xml:133(para) groupadd.8.xml:225(para) gpasswd.1.xml:270(para)
+#: chgpasswd.8.xml:211(para)
 msgid "Secure group account information."
 msgstr "Informations sécurisées sur les groupes."
 
-#: vipw.8.xml:176(filename) usermod.8.xml:404(filename)
-#: userdel.8.xml:159(filename) useradd.8.xml:658(filename)
-#: su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
-#: pwck.8.xml:256(filename) passwd.5.xml:119(filename)
-#: passwd.1.xml:377(filename) newusers.8.xml:360(filename)
-#: newgrp.1.xml:102(filename) login.1.xml:331(filename)
-#: grpck.8.xml:200(filename) expiry.1.xml:71(filename)
-#: chsh.1.xml:136(filename) chpasswd.8.xml:226(filename)
-#: chfn.1.xml:122(filename) chage.1.xml:226(filename)
+#: vipw.8.xml:192(filename) usermod.8.xml:434(filename)
+#: userdel.8.xml:175(filename) useradd.8.xml:674(filename)
+#: su.1.xml:351(filename) sg.1.xml:94(filename) shadow.5.xml:239(filename)
+#: pwck.8.xml:260(filename) passwd.5.xml:125(filename)
+#: passwd.1.xml:393(filename) newusers.8.xml:378(filename)
+#: newgrp.1.xml:105(filename) login.1.xml:334(filename)
+#: grpck.8.xml:218(filename) groupmod.8.xml:199(filename)
+#: expiry.1.xml:105(filename) chsh.1.xml:152(filename)
+#: chpasswd.8.xml:242(filename) chfn.1.xml:198(filename)
+#: chage.1.xml:242(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
-#: vipw.8.xml:178(para) usermod.8.xml:406(para) userdel.8.xml:161(para)
-#: useradd.8.xml:660(para) su.1.xml:343(para) sg.1.xml:93(para)
-#: shadow.5.xml:235(para) pwck.8.xml:258(para) passwd.5.xml:121(para)
-#: passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
-#: login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para)
-#: chsh.1.xml:138(para) chpasswd.8.xml:228(para) chfn.1.xml:124(para)
-#: chage.1.xml:229(para)
+#: vipw.8.xml:194(para) usermod.8.xml:436(para) userdel.8.xml:177(para)
+#: useradd.8.xml:676(para) su.1.xml:353(para) sg.1.xml:96(para)
+#: shadow.5.xml:241(para) pwck.8.xml:262(para) passwd.5.xml:127(para)
+#: passwd.1.xml:395(para) newusers.8.xml:380(para) newgrp.1.xml:107(para)
+#: login.1.xml:336(para) grpck.8.xml:220(para) groupmod.8.xml:201(para)
+#: expiry.1.xml:107(para) chsh.1.xml:154(para) chpasswd.8.xml:244(para)
+#: chfn.1.xml:200(para) chage.1.xml:245(para)
 msgid "User account information."
 msgstr "Informations sur les comptes des utilisateurs."
 
-#: vipw.8.xml:182(filename) usermod.8.xml:410(filename)
-#: userdel.8.xml:165(filename) useradd.8.xml:664(filename)
-#: su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
-#: shadow.3.xml:204(filename) pwck.8.xml:262(filename)
-#: passwd.5.xml:125(filename) passwd.1.xml:383(filename)
-#: newusers.8.xml:366(filename) newgrp.1.xml:108(filename)
-#: login.1.xml:337(filename) expiry.1.xml:77(filename)
-#: chpasswd.8.xml:232(filename) chage.1.xml:234(filename)
+#: vipw.8.xml:198(filename) usermod.8.xml:440(filename)
+#: userdel.8.xml:181(filename) useradd.8.xml:680(filename)
+#: su.1.xml:357(filename) sg.1.xml:100(filename) shadow.5.xml:245(filename)
+#: shadow.3.xml:210(filename) pwck.8.xml:266(filename)
+#: passwd.5.xml:131(filename) passwd.1.xml:399(filename)
+#: newusers.8.xml:384(filename) newgrp.1.xml:111(filename)
+#: login.1.xml:340(filename) expiry.1.xml:111(filename)
+#: chpasswd.8.xml:248(filename) chage.1.xml:250(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
-#: vipw.8.xml:184(para) usermod.8.xml:412(para) userdel.8.xml:167(para)
-#: useradd.8.xml:666(para) su.1.xml:349(para) sg.1.xml:99(para)
-#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:264(para)
-#: passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
-#: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:234(para)
-#: chage.1.xml:237(para)
+#: vipw.8.xml:200(para) usermod.8.xml:442(para) userdel.8.xml:183(para)
+#: useradd.8.xml:682(para) su.1.xml:359(para) sg.1.xml:102(para)
+#: shadow.5.xml:247(para) shadow.3.xml:212(para) pwck.8.xml:268(para)
+#: passwd.1.xml:401(para) newusers.8.xml:386(para) newgrp.1.xml:113(para)
+#: login.1.xml:342(para) expiry.1.xml:113(para) chpasswd.8.xml:250(para)
+#: chage.1.xml:253(para)
 msgid "Secure user account information."
 msgstr "Informations sécurisées sur les comptes utilisateurs."
 
-#: vipw.8.xml:191(title) usermod.8.xml:419(title) userdel.8.xml:252(title)
-#: useradd.8.xml:772(title) suauth.5.xml:197(title) su.1.xml:409(title)
-#: sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title)
-#: pwconv.8.xml:199(title) pwck.8.xml:322(title) porttime.5.xml:117(title)
-#: passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title)
-#: newusers.8.xml:399(title) newgrp.1.xml:129(title)
-#: login.defs.5.xml:504(title) login.access.5.xml:108(title)
-#: login.1.xml:376(title) limits.5.xml:180(title) gshadow.5.xml:159(title)
-#: grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
-#: groupmems.8.xml:192(title) groupdel.8.xml:146(title)
-#: groupadd.8.xml:290(title) gpasswd.1.xml:259(title) faillog.8.xml:222(title)
-#: faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
-#: chpasswd.8.xml:253(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title)
-#: chage.1.xml:277(title)
+#: vipw.8.xml:207(title) usermod.8.xml:449(title) userdel.8.xml:268(title)
+#: useradd.8.xml:788(title) suauth.5.xml:203(title) su.1.xml:419(title)
+#: sg.1.xml:121(title) shadow.5.xml:264(title) shadow.3.xml:219(title)
+#: pwconv.8.xml:244(title) pwck.8.xml:326(title) porttime.5.xml:123(title)
+#: passwd.5.xml:150(title) passwd.1.xml:471(title) nologin.8.xml:70(title)
+#: newusers.8.xml:417(title) newgrp.1.xml:132(title)
+#: login.defs.5.xml:507(title) login.access.5.xml:114(title)
+#: login.1.xml:379(title) limits.5.xml:186(title) gshadow.5.xml:165(title)
+#: grpck.8.xml:272(title) groups.1.xml:93(title) groupmod.8.xml:259(title)
+#: groupmems.8.xml:208(title) groupdel.8.xml:179(title)
+#: groupadd.8.xml:305(title) gpasswd.1.xml:277(title) faillog.8.xml:241(title)
+#: faillog.5.xml:89(title) expiry.1.xml:120(title) chsh.1.xml:173(title)
+#: chpasswd.8.xml:269(title) chgpasswd.8.xml:224(title) chfn.1.xml:207(title)
+#: chage.1.xml:293(title)
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
-#: vipw.8.xml:192(para)
+#: vipw.8.xml:208(para)
 msgid ""
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -405,22 +478,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: usermod.8.xml:41(refentrytitle) usermod.8.xml:46(refname)
-#: usermod.8.xml:52(command) login.defs.5.xml:468(term)
+#: usermod.8.xml:42(refentrytitle) usermod.8.xml:49(refname)
+#: usermod.8.xml:55(command) login.defs.5.xml:471(term)
 msgid "usermod"
 msgstr "usermod"
 
-#: usermod.8.xml:47(refpurpose)
+#: usermod.8.xml:50(refpurpose)
 msgid "modify a user account"
 msgstr "Modifier un compte utilisateur"
 
-#: usermod.8.xml:56(replaceable) userdel.8.xml:56(replaceable)
-#: useradd.8.xml:66(replaceable) passwd.1.xml:60(replaceable)
-#: chsh.1.xml:56(replaceable) chage.1.xml:53(replaceable)
+#: usermod.8.xml:59(replaceable) userdel.8.xml:59(replaceable)
+#: useradd.8.xml:69(replaceable) passwd.1.xml:63(replaceable)
+#: chsh.1.xml:59(replaceable) chfn.1.xml:59(replaceable)
+#: chage.1.xml:56(replaceable)
 msgid "LOGIN"
 msgstr "LOGIN"
 
-#: usermod.8.xml:62(para)
+#: usermod.8.xml:65(para)
 msgid ""
 "The <command>usermod</command> command modifies the system account files to "
 "reflect the changes that are specified on the command line."
@@ -429,16 +503,16 @@
 "des comptes du système selon les modifications qui ont été indiquées sur la "
 "ligne de commande."
 
-#: usermod.8.xml:70(para)
+#: usermod.8.xml:73(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:76(term)
+#: usermod.8.xml:79(term)
 msgid "<option>-a</option>, <option>--append</option>"
 msgstr "<option>-a</option>, <option>--append</option>"
 
-#: usermod.8.xml:80(para)
+#: usermod.8.xml:83(para)
 msgid ""
 "Add the user to the supplementary group(s). Use only with the <option>-G</"
 "option> option."
@@ -446,7 +520,7 @@
 "Ajouter l'utilisateur aux groupes supplémentaires. N'utilisez cette option "
 "qu'avec l'option <option>-G</option>."
 
-#: usermod.8.xml:87(term) useradd.8.xml:128(term)
+#: usermod.8.xml:90(term) useradd.8.xml:131(term)
 msgid ""
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
@@ -454,7 +528,7 @@
 "<option>-c</option>, <option>--comment</option> <replaceable>COMMENTAIRE</"
 "replaceable>"
 
-#: usermod.8.xml:92(para)
+#: usermod.8.xml:95(para)
 msgid ""
 "The new value of the user's password file comment field. It is normally "
 "modified using the <citerefentry><refentrytitle>chfn</"
@@ -465,7 +539,7 @@
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: usermod.8.xml:101(term) useradd.8.xml:141(term)
+#: usermod.8.xml:104(term) useradd.8.xml:144(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -473,11 +547,11 @@
 "<option>-d</option>, <option>--home</option> <replaceable>RÉP_PERSO</"
 "replaceable>"
 
-#: usermod.8.xml:106(para)
+#: usermod.8.xml:109(para)
 msgid "The user's new login directory."
 msgstr "Le nouveau répertoire personnel de l'utilisateur."
 
-#: usermod.8.xml:109(para)
+#: usermod.8.xml:112(para)
 msgid ""
 "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 "
@@ -487,7 +561,7 @@
 "personnel actuel sera déplacé dans le nouveau répertoire personnel, qui sera "
 "créé si nécessaire."
 
-#: usermod.8.xml:118(term) useradd.8.xml:168(term) useradd.8.xml:526(term)
+#: usermod.8.xml:121(term) useradd.8.xml:171(term) useradd.8.xml:542(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -495,7 +569,7 @@
 "<option>-e</option>, <option>--expiredate</option> "
 "<replaceable>DATE_FIN_VALIDITÉ</replaceable>"
 
-#: usermod.8.xml:123(para) useradd.8.xml:173(para)
+#: usermod.8.xml:126(para) useradd.8.xml:176(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>."
@@ -503,15 +577,34 @@
 "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:130(term) useradd.8.xml:186(term) useradd.8.xml:539(term)
+#: usermod.8.xml:130(para)
 msgid ""
+"An empty <replaceable>EXPIRE_DATE</replaceable> argument will disable the "
+"expiration of the account."
+msgstr ""
+
+#: usermod.8.xml:134(para) usermod.8.xml:156(para)
+#, fuzzy
+#| 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."
+msgid ""
+"This option requires a <filename>/etc/shadow</filename> file. A <filename>/"
+"etc/shadow</filename> entry will be created if there were none."
+msgstr ""
+"Si le fichier <filename>/etc/gshadow</filename> existe, et que le groupe n'y "
+"a pas d'entrée, une nouvelle entrée sera créée."
+
+#: usermod.8.xml:142(term) useradd.8.xml:189(term) useradd.8.xml:555(term)
+msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 msgstr ""
 "<option>-f</option>, <option>--inactive</option> "
 "<replaceable>DURÉE_INACTIVITÉ</replaceable>"
 
-#: usermod.8.xml:135(para)
+#: usermod.8.xml:147(para)
 msgid ""
 "The number of days after a password expires until the account is permanently "
 "disabled."
@@ -519,7 +612,7 @@
 "Nombre de jours suivant la fin de validité d'un mot de passe après lequel le "
 "compte est définitivement désactivé."
 
-#: usermod.8.xml:139(para)
+#: usermod.8.xml:151(para)
 msgid ""
 "A value of 0 disables the account as soon as the password has expired, and a "
 "value of -1 disables the feature."
@@ -527,13 +620,13 @@
 "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é."
 
-#: usermod.8.xml:147(term) useradd.8.xml:206(term) useradd.8.xml:555(term)
+#: usermod.8.xml:164(term) useradd.8.xml:209(term) useradd.8.xml:571(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option> <replaceable>GROUPE</replaceable>"
 
-#: usermod.8.xml:152(para)
+#: usermod.8.xml:169(para)
 msgid ""
 "The group name or number of the user's new initial login group. The group "
 "must exist."
@@ -541,7 +634,7 @@
 "Nom du groupe ou identifiant numérique du groupe de connexion initial de "
 "l'utilisateur. Le groupe doit exister."
 
-#: usermod.8.xml:156(para)
+#: usermod.8.xml:173(para)
 msgid ""
 "Any file from the user's home directory owned by the previous primary group "
 "of the user will be owned by this new group."
@@ -549,7 +642,7 @@
 "Tout fichier du répertoire personnel de l'utilisateur appartenant au groupe "
 "primaire précédent de l'utilisateur appartiendra à ce nouveau groupe."
 
-#: usermod.8.xml:160(para)
+#: usermod.8.xml:177(para)
 msgid ""
 "The group ownership of files outside of the user's home directory must be "
 "fixed manually."
@@ -557,7 +650,7 @@
 "Le groupe propriétaire des fichiers en dehors du répertoire personnel de "
 "l'utilisateur doit être modifié manuellement."
 
-#: usermod.8.xml:167(term) useradd.8.xml:234(term)
+#: usermod.8.xml:184(term) useradd.8.xml:237(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -567,7 +660,7 @@
 "replaceable>[<emphasis remap=\"I\">,GROUPE2,...</emphasis>[<emphasis remap="
 "\"I\">,GROUPEN</emphasis>]]]"
 
-#: usermod.8.xml:172(para)
+#: usermod.8.xml:189(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. "
@@ -579,7 +672,7 @@
 "espace entre eux. Les groupes sont soumis aux mêmes restrictions que celles "
 "de l'option <option>-g</option>."
 
-#: usermod.8.xml:179(para)
+#: usermod.8.xml:196(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 "
@@ -591,7 +684,7 @@
 "l'option <option>-a</option>, qui permet d'ajouter l'utilisateur à la liste "
 "actuelle des groupes supplémentaires."
 
-#: usermod.8.xml:188(term)
+#: usermod.8.xml:205(term)
 msgid ""
 "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
 "replaceable>"
@@ -599,23 +692,29 @@
 "<option>-l</option>, <option>--login</option> <replaceable>NOUVEAU_LOGIN</"
 "replaceable>"
 
-#: usermod.8.xml:193(para)
+#: usermod.8.xml:210(para)
+#, fuzzy
+#| msgid ""
+#| "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."
 msgid ""
 "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."
+"particular, the user's home directory or mail spool should probably be "
+"renamed 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:203(term)
+#: usermod.8.xml:220(term)
 msgid "<option>-L</option>, <option>--lock</option>"
 msgstr "<option>-L</option>, <option>--lock</option>"
 
-#: usermod.8.xml:207(para)
+#: usermod.8.xml:224(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>-"
@@ -626,7 +725,7 @@
 "pouvez pas utiliser cette option avec <option>-p</option> ou <option>-U</"
 "option>."
 
-#: usermod.8.xml:213(para)
+#: usermod.8.xml:230(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 "
@@ -636,17 +735,17 @@
 "par un mot de passe), il est également nécessaire de placer "
 "<replaceable>DATE_FIN_VALIDITÉ</replaceable> à <replaceable>1</replaceable>."
 
-#: usermod.8.xml:222(term)
+#: usermod.8.xml:239(term)
 msgid "<option>-m</option>, <option>--move-home</option>"
 msgstr "<option>-m</option>, <option>--move-home</option>"
 
-#: usermod.8.xml:226(para)
+#: usermod.8.xml:243(para)
 msgid "Move the content of the user's home directory to the new location."
 msgstr ""
 "Déplacer le contenu du répertoire personnel de l'utilisateur vers un nouveau "
 "emplacement."
 
-#: usermod.8.xml:230(para)
+#: usermod.8.xml:247(para)
 msgid ""
 "This option is only valid in combination with the <option>-d</option> (or "
 "<option>--home</option>) option."
@@ -654,7 +753,7 @@
 "Cette option ne fonctionne que lorsqu'elle est combinée avec l'option "
 "<option>-d</option> (ou <option>--home</option>)."
 
-#: usermod.8.xml:234(para)
+#: usermod.8.xml:251(para)
 msgid ""
 "<command>usermod</command> will try to adapt the ownership of the files and "
 "to copy the modes, ACL and extended attributes, but manual changes might be "
@@ -664,12 +763,12 @@
 "et de copier les modes, ACL et attributs étendus. Cependant, vous risquez de "
 "devoir procéder à des modifications vous-même."
 
-#: usermod.8.xml:242(term) useradd.8.xml:374(term) groupmod.8.xml:116(term)
-#: groupadd.8.xml:134(term)
+#: usermod.8.xml:259(term) useradd.8.xml:377(term) groupmod.8.xml:123(term)
+#: groupadd.8.xml:136(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
-#: usermod.8.xml:246(para)
+#: usermod.8.xml:263(para)
 msgid ""
 "When used with the <option>-u</option> option, this option allows to change "
 "the user ID to a non-unique value."
@@ -677,8 +776,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:253(term) useradd.8.xml:386(term) groupmod.8.xml:127(term)
-#: groupadd.8.xml:144(term)
+#: usermod.8.xml:270(term) useradd.8.xml:389(term) groupmod.8.xml:134(term)
+#: groupadd.8.xml:146(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -686,7 +785,7 @@
 "<option>-p</option>, <option>--password</option> <replaceable>MOT_DE_PASSE</"
 "replaceable>"
 
-#: usermod.8.xml:258(para) groupmod.8.xml:132(para)
+#: usermod.8.xml:275(para) groupmod.8.xml:139(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
@@ -694,8 +793,8 @@
 "Mot de passe chiffré, comme renvoyé par <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
 
-#: usermod.8.xml:263(para) useradd.8.xml:396(para) groupmod.8.xml:137(para)
-#: groupadd.8.xml:154(para)
+#: usermod.8.xml:280(para) useradd.8.xml:399(para) groupmod.8.xml:144(para)
+#: groupadd.8.xml:156(para)
 msgid ""
 "<emphasis role=\"bold\">Note:</emphasis> This option is not recommended "
 "because the password (or encrypted password) will be visible by users "
@@ -705,7 +804,7 @@
 "est déconseillée car le mot de passe (ou le mot de passe chiffré) peut être "
 "visible des utilisateurs qui affichent la liste des processus. "
 
-#: usermod.8.xml:268(para)
+#: usermod.8.xml:285(para)
 msgid ""
 "The password will be written in the local <filename>/etc/passwd</filename> "
 "or <filename>/etc/shadow</filename> file. This might differ from the "
@@ -716,23 +815,23 @@
 "différent de la base de données de mots de passe définie dans la "
 "configuration de PAM."
 
-#: usermod.8.xml:274(para) useradd.8.xml:401(para) groupmod.8.xml:142(para)
-#: groupadd.8.xml:159(para)
+#: usermod.8.xml:291(para) useradd.8.xml:404(para) groupmod.8.xml:149(para)
+#: groupadd.8.xml:161(para)
 msgid ""
 "You should make sure the password respects the system's password policy."
 msgstr ""
 "Il est nécessaire de vérifier si le mot de passe respecte la politique de "
 "mots de passe du système."
 
-#: usermod.8.xml:281(term) useradd.8.xml:435(term) useradd.8.xml:576(term)
-#: su.1.xml:157(term) chsh.1.xml:85(term)
+#: usermod.8.xml:311(term) useradd.8.xml:451(term) useradd.8.xml:592(term)
+#: su.1.xml:167(term) chsh.1.xml:101(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:286(para) chsh.1.xml:89(para)
+#: usermod.8.xml:316(para) chsh.1.xml:105(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."
@@ -741,17 +840,17 @@
 "l'utilisateur. Si ce champ est vide, le système sélectionnera l'interpréteur "
 "de commandes initial par défaut."
 
-#: usermod.8.xml:293(term) useradd.8.xml:450(term)
+#: usermod.8.xml:323(term) useradd.8.xml:466(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option> <replaceable>UID</replaceable>"
 
-#: usermod.8.xml:298(para)
+#: usermod.8.xml:328(para)
 msgid "The new numerical value of the user's ID."
 msgstr "La valeur numérique de l'identifiant de l'utilisateur."
 
-#: usermod.8.xml:301(para)
+#: usermod.8.xml:331(para)
 msgid ""
 "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 "
@@ -761,7 +860,7 @@
 "soit utilisée. La valeur ne doit pas être négative. Les valeurs comprises "
 "entre 0 et 999 sont généralement réservées aux comptes système."
 
-#: usermod.8.xml:307(para)
+#: usermod.8.xml:337(para)
 msgid ""
 "The user's mailbox, and any files which the user owns and which are located "
 "in the user's home directory will have the file user ID changed "
@@ -771,7 +870,7 @@
 "sont situés dans son répertoire personnel verront leur identifiant "
 "d'utilisateur automatiquement modifié."
 
-#: usermod.8.xml:312(para)
+#: usermod.8.xml:342(para)
 msgid ""
 "The ownership of files outside of the user's home directory must be fixed "
 "manually."
@@ -779,11 +878,11 @@
 "Le propriétaire des fichiers en dehors du répertoire personnel de "
 "l'utilisateur doit être modifié manuellement."
 
-#: usermod.8.xml:319(term)
+#: usermod.8.xml:349(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:323(para)
+#: usermod.8.xml:353(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</"
@@ -793,7 +892,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:328(para)
+#: usermod.8.xml:358(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 "
@@ -806,7 +905,7 @@
 "<replaceable>99999</replaceable> ou à la valeur <option>EXPIRE</option> dans "
 "<filename>/etc/default/useradd</filename>)."
 
-#: usermod.8.xml:339(term) useradd.8.xml:482(term)
+#: usermod.8.xml:369(term) useradd.8.xml:498(term)
 msgid ""
 "<option>-Z</option>, <option>--selinux-user</option><replaceable>SEUSER</"
 "replaceable>"
@@ -814,7 +913,7 @@
 "<option>-Z</option>, <option>--selinux-user</option> "
 "<replaceable>UTILISATEUR_SELINUX</replaceable>"
 
-#: usermod.8.xml:344(para)
+#: usermod.8.xml:374(para)
 msgid ""
 "The SELinux user for the user's login. The default is to leave this field "
 "the blank, which causes the system to select the default SELinux user."
@@ -822,16 +921,16 @@
 "Identifiant SELinux du nouvel utilisateur. Cette valeur est vide par défaut "
 "et, dans ce cas, le système sélectionnera l'utilisateur SELinux par défaut."
 
-#: usermod.8.xml:355(title) userdel.8.xml:225(title) useradd.8.xml:605(title)
-#: su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
-#: newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title)
-#: groupdel.8.xml:65(title) groupadd.8.xml:223(title) gpasswd.1.xml:214(title)
-#: faillog.8.xml:199(title) chpasswd.8.xml:199(title)
-#: chgpasswd.8.xml:157(title)
+#: usermod.8.xml:385(title) userdel.8.xml:241(title) useradd.8.xml:621(title)
+#: su.1.xml:312(title) shadow.3.xml:199(title) passwd.1.xml:354(title)
+#: newusers.8.xml:330(title) login.1.xml:241(title) lastlog.8.xml:178(title)
+#: groupdel.8.xml:98(title) groupadd.8.xml:238(title) gpasswd.1.xml:232(title)
+#: faillog.8.xml:218(title) chpasswd.8.xml:215(title)
+#: chgpasswd.8.xml:173(title)
 msgid "CAVEATS"
 msgstr "AVERTISSEMENTS"
 
-#: usermod.8.xml:356(para)
+#: usermod.8.xml:386(para)
 msgid ""
 "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, the "
@@ -846,7 +945,7 @@
 "Linux mais contrôle seulement les informations de utmp sur les autres "
 "architectures."
 
-#: usermod.8.xml:364(para)
+#: usermod.8.xml:394(para)
 msgid ""
 "You must change the owner of any <command>crontab</command> files or "
 "<command>at</command> jobs manually."
@@ -855,7 +954,7 @@
 "<command>crontab</command> ou des travaux programmés par <command>at</"
 "command>."
 
-#: usermod.8.xml:368(para)
+#: usermod.8.xml:398(para)
 msgid "You must make any changes involving NIS on the NIS server."
 msgstr ""
 "Les modifications qui concernent NIS doivent être effectuées sur le serveur "
@@ -1041,7 +1140,7 @@
 "user, mais sera calculé en fonction de l'UID de l'utilisateur, à l'aide de "
 "l'algorithme suivant : <placeholder-1/>"
 
-#: usermod.8.xml:420(para)
+#: usermod.8.xml:450(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1079,16 +1178,16 @@
 "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: userdel.8.xml:43(refentrytitle) userdel.8.xml:48(refname)
-#: userdel.8.xml:53(command) login.defs.5.xml:458(term)
+#: userdel.8.xml:44(refentrytitle) userdel.8.xml:51(refname)
+#: userdel.8.xml:56(command) login.defs.5.xml:461(term)
 msgid "userdel"
 msgstr "userdel"
 
-#: userdel.8.xml:49(refpurpose)
+#: userdel.8.xml:52(refpurpose)
 msgid "delete a user account and related files"
 msgstr "supprimer un compte utilisateur et les fichiers associés"
 
-#: userdel.8.xml:63(para)
+#: userdel.8.xml:66(para)
 msgid ""
 "The <command>userdel</command> command modifies the system account files, "
 "deleting all entries that refer to the user name <emphasis remap=\"I"
@@ -1098,16 +1197,16 @@
 "des comptes du système, en supprimant les entrées qui se réfèrent à "
 "<emphasis remap=\"I\">LOGIN</emphasis>. L'utilisateur nommé doit exister."
 
-#: userdel.8.xml:72(para)
+#: userdel.8.xml:75(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:77(term) groupadd.8.xml:79(term)
+#: userdel.8.xml:80(term) groupadd.8.xml:81(term) expiry.1.xml:84(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option>"
 
-#: userdel.8.xml:81(para)
+#: userdel.8.xml:84(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 "
@@ -1128,7 +1227,7 @@
 "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:94(para)
+#: userdel.8.xml:97(para)
 msgid ""
 "<emphasis>Note:</emphasis> This option is dangerous and may leave your "
 "system in an inconsistent state."
@@ -1136,11 +1235,11 @@
 "<emphasis>Remarque :</emphasis> Cette option est dangereuse, elle peut "
 "laisser votre système dans un état incohérent."
 
-#: userdel.8.xml:107(term)
+#: userdel.8.xml:110(term)
 msgid "<option>-r</option>, <option>--remove</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
-#: userdel.8.xml:111(para)
+#: userdel.8.xml:114(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 "
@@ -1151,7 +1250,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:117(para)
+#: userdel.8.xml:120(para)
 msgid ""
 "The mail spool is defined by the <option>MAIL_DIR</option> variable in the "
 "<filename>login.defs</filename> file."
@@ -1269,110 +1368,110 @@
 "contient pas d'autres membres, et <command>useradd</command> créera par "
 "défaut un groupe portant le nom de l'utilisateur."
 
-#: userdel.8.xml:153(filename) useradd.8.xml:694(filename)
-#: su.1.xml:353(filename) pwconv.8.xml:190(filename)
-#: passwd.1.xml:389(filename) newusers.8.xml:384(filename)
-#: login.access.5.xml:99(filename) login.1.xml:367(filename)
-#: groupadd.8.xml:214(filename) chsh.1.xml:148(filename)
-#: chpasswd.8.xml:238(filename) chgpasswd.8.xml:199(filename)
-#: chfn.1.xml:116(filename)
+#: userdel.8.xml:169(filename) useradd.8.xml:710(filename)
+#: su.1.xml:363(filename) pwconv.8.xml:235(filename)
+#: passwd.1.xml:405(filename) newusers.8.xml:402(filename)
+#: login.access.5.xml:105(filename) login.1.xml:370(filename)
+#: groupadd.8.xml:229(filename) chsh.1.xml:164(filename)
+#: chpasswd.8.xml:254(filename) chgpasswd.8.xml:215(filename)
+#: chfn.1.xml:192(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:155(para) useradd.8.xml:696(para) su.1.xml:355(para)
-#: pwconv.8.xml:192(para) passwd.1.xml:391(para) newusers.8.xml:386(para)
-#: login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:216(para)
-#: chsh.1.xml:150(para) chpasswd.8.xml:240(para) chgpasswd.8.xml:201(para)
-#: chfn.1.xml:118(para)
+#: userdel.8.xml:171(para) useradd.8.xml:712(para) su.1.xml:365(para)
+#: pwconv.8.xml:237(para) passwd.1.xml:407(para) newusers.8.xml:404(para)
+#: login.access.5.xml:107(para) login.1.xml:372(para) groupadd.8.xml:231(para)
+#: chsh.1.xml:166(para) chpasswd.8.xml:256(para) chgpasswd.8.xml:217(para)
+#: chfn.1.xml:194(para)
 msgid "Shadow password suite configuration."
 msgstr ""
 "Configuration de la suite des mots de passe cachés « shadow password »."
 
-#: userdel.8.xml:174(title) useradd.8.xml:703(title) su.1.xml:362(title)
-#: pwck.8.xml:271(title) passwd.1.xml:404(title) grpck.8.xml:209(title)
-#: groupmod.8.xml:182(title) groupdel.8.xml:107(title)
-#: groupadd.8.xml:245(title) chage.1.xml:244(title)
+#: userdel.8.xml:190(title) useradd.8.xml:719(title) su.1.xml:372(title)
+#: pwck.8.xml:275(title) passwd.1.xml:420(title) grpck.8.xml:227(title)
+#: groupmod.8.xml:208(title) groupdel.8.xml:140(title)
+#: groupadd.8.xml:260(title) chage.1.xml:260(title)
 msgid "EXIT VALUES"
 msgstr "VALEURS DE RETOUR"
 
-#: userdel.8.xml:179(replaceable) useradd.8.xml:708(replaceable)
-#: su.1.xml:381(replaceable) pwck.8.xml:276(replaceable)
-#: passwd.1.xml:409(replaceable) grpck.8.xml:214(replaceable)
-#: groupmod.8.xml:187(replaceable) groupdel.8.xml:112(replaceable)
-#: groupadd.8.xml:250(replaceable) chage.1.xml:249(replaceable)
+#: userdel.8.xml:195(replaceable) useradd.8.xml:724(replaceable)
+#: su.1.xml:391(replaceable) pwck.8.xml:280(replaceable)
+#: passwd.1.xml:425(replaceable) grpck.8.xml:232(replaceable)
+#: groupmod.8.xml:213(replaceable) groupdel.8.xml:145(replaceable)
+#: groupadd.8.xml:265(replaceable) chage.1.xml:265(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:181(para) useradd.8.xml:710(para) pwck.8.xml:278(para)
-#: passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para)
-#: groupdel.8.xml:114(para) groupadd.8.xml:252(para) chage.1.xml:251(para)
+#: userdel.8.xml:197(para) useradd.8.xml:726(para) pwck.8.xml:282(para)
+#: passwd.1.xml:427(para) grpck.8.xml:234(para) groupmod.8.xml:215(para)
+#: groupdel.8.xml:147(para) groupadd.8.xml:267(para) chage.1.xml:267(para)
 msgid "success"
 msgstr "succès"
 
-#: userdel.8.xml:185(replaceable) useradd.8.xml:714(replaceable)
-#: su.1.xml:55(manvolnum) su.1.xml:387(replaceable) sg.1.xml:39(manvolnum)
-#: pwck.8.xml:282(replaceable) passwd.1.xml:45(manvolnum)
-#: passwd.1.xml:415(replaceable) newgrp.1.xml:39(manvolnum)
-#: login.1.xml:71(manvolnum) grpck.8.xml:220(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:39(manvolnum)
-#: chage.1.xml:255(replaceable)
+#: userdel.8.xml:201(replaceable) useradd.8.xml:730(replaceable)
+#: su.1.xml:56(manvolnum) su.1.xml:397(replaceable) sg.1.xml:40(manvolnum)
+#: pwck.8.xml:286(replaceable) passwd.1.xml:46(manvolnum)
+#: passwd.1.xml:431(replaceable) newgrp.1.xml:40(manvolnum)
+#: login.1.xml:72(manvolnum) grpck.8.xml:238(replaceable)
+#: groups.1.xml:39(manvolnum) gpasswd.1.xml:44(manvolnum)
+#: expiry.1.xml:43(manvolnum) chsh.1.xml:42(manvolnum)
+#: chfn.1.xml:42(manvolnum) chage.1.xml:40(manvolnum)
+#: chage.1.xml:271(replaceable)
 msgid "1"
 msgstr "1"
 
-#: userdel.8.xml:187(para) useradd.8.xml:716(para)
+#: userdel.8.xml:203(para) useradd.8.xml:732(para)
 msgid "can't update password file"
 msgstr "impossible de mettre à jour le fichier des mots de passe"
 
-#: userdel.8.xml:191(replaceable) useradd.8.xml:720(replaceable)
-#: pwck.8.xml:288(replaceable) passwd.1.xml:421(replaceable)
-#: grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable)
-#: groupdel.8.xml:118(replaceable) groupadd.8.xml:256(replaceable)
-#: chage.1.xml:261(replaceable)
+#: userdel.8.xml:207(replaceable) useradd.8.xml:736(replaceable)
+#: pwck.8.xml:292(replaceable) passwd.1.xml:437(replaceable)
+#: grpck.8.xml:244(replaceable) groupmod.8.xml:219(replaceable)
+#: groupdel.8.xml:151(replaceable) groupadd.8.xml:271(replaceable)
+#: chage.1.xml:277(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:193(para) useradd.8.xml:722(para) pwck.8.xml:284(para)
-#: grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
-#: groupadd.8.xml:258(para) chage.1.xml:263(para)
+#: userdel.8.xml:209(para) useradd.8.xml:738(para) pwck.8.xml:288(para)
+#: grpck.8.xml:240(para) groupmod.8.xml:221(para) groupdel.8.xml:153(para)
+#: groupadd.8.xml:273(para) chage.1.xml:279(para)
 msgid "invalid command syntax"
 msgstr "erreur de syntaxe"
 
-#: userdel.8.xml:197(replaceable) useradd.8.xml:738(replaceable)
-#: pwck.8.xml:312(replaceable) passwd.1.xml:445(replaceable)
-#: groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
+#: userdel.8.xml:213(replaceable) useradd.8.xml:754(replaceable)
+#: pwck.8.xml:316(replaceable) passwd.1.xml:461(replaceable)
+#: groupmod.8.xml:237(replaceable) groupdel.8.xml:157(replaceable)
 msgid "6"
 msgstr "6"
 
-#: userdel.8.xml:199(para)
+#: userdel.8.xml:215(para)
 msgid "specified user doesn't exist"
 msgstr "l'utilisateur indiqué n'existe pas"
 
-#: userdel.8.xml:205(para)
+#: userdel.8.xml:221(para)
 msgid "user currently logged in"
 msgstr "l'utilisateur est actuellement connecté"
 
-#: userdel.8.xml:209(replaceable) useradd.8.xml:750(replaceable)
-#: groupmod.8.xml:223(replaceable) groupdel.8.xml:136(replaceable)
-#: groupadd.8.xml:280(replaceable)
+#: userdel.8.xml:225(replaceable) useradd.8.xml:766(replaceable)
+#: groupmod.8.xml:249(replaceable) groupdel.8.xml:169(replaceable)
+#: groupadd.8.xml:295(replaceable)
 msgid "10"
 msgstr "10"
 
-#: userdel.8.xml:211(para) useradd.8.xml:752(para) groupmod.8.xml:225(para)
-#: groupdel.8.xml:138(para) groupadd.8.xml:282(para)
+#: userdel.8.xml:227(para) useradd.8.xml:768(para) groupmod.8.xml:251(para)
+#: groupdel.8.xml:171(para) groupadd.8.xml:297(para)
 msgid "can't update group file"
 msgstr "impossible de mettre à jour le fichier des groupes"
 
-#: userdel.8.xml:215(replaceable) useradd.8.xml:756(replaceable)
+#: userdel.8.xml:231(replaceable) useradd.8.xml:772(replaceable)
 msgid "12"
 msgstr "12"
 
-#: userdel.8.xml:217(para)
+#: userdel.8.xml:233(para)
 msgid "can't remove home directory"
 msgstr "impossible de supprimer le répertoire personnel"
 
-#: userdel.8.xml:175(para)
+#: userdel.8.xml:191(para)
 msgid ""
 "The <command>userdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1380,7 +1479,7 @@
 "La commande <command>userdel</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: userdel.8.xml:226(para)
+#: userdel.8.xml:242(para)
 msgid ""
 "<command>userdel</command> will not allow you to remove an account if there "
 "are running processes which belong to this account. In that case, you may "
@@ -1394,7 +1493,7 @@
 "passe ou le compte de l'utilisateur, afin de supprimer le compte plus tard. "
 "L'option <option>-f</option> permet de forcer la suppression du compte."
 
-#: userdel.8.xml:233(para)
+#: userdel.8.xml:249(para)
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this user."
@@ -1402,7 +1501,7 @@
 "Vous devez vérifier vous-même qu'aucun fichier possédé par l'utilisateur ne "
 "subsiste sur tous les systèmes de fichiers."
 
-#: userdel.8.xml:237(para)
+#: userdel.8.xml:253(para)
 msgid ""
 "You may not remove any NIS attributes on a NIS client. This must be "
 "performed on the NIS server."
@@ -1410,7 +1509,7 @@
 "Vous ne pouvez supprimer aucun attribut NIS d'un client NIS. Cela doit être "
 "effectué sur le serveur NIS."
 
-#: userdel.8.xml:240(para)
+#: userdel.8.xml:256(para)
 msgid ""
 "If <option>USERGROUPS_ENAB</option> is defined to <emphasis remap=\"I\">yes</"
 "emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -1429,7 +1528,7 @@
 "avertissement sera affiché et le groupe ne sera pas supprimé. L'option "
 "<option>-f</option> permet d'imposer la suppression du groupe."
 
-#: userdel.8.xml:253(para)
+#: userdel.8.xml:269(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1463,23 +1562,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: useradd.8.xml:52(refentrytitle) useradd.8.xml:57(refname)
-#: useradd.8.xml:62(command) useradd.8.xml:69(command)
-#: useradd.8.xml:73(command) login.defs.5.xml:444(term)
+#: useradd.8.xml:53(refentrytitle) useradd.8.xml:60(refname)
+#: useradd.8.xml:65(command) useradd.8.xml:72(command)
+#: useradd.8.xml:76(command) login.defs.5.xml:447(term)
 msgid "useradd"
 msgstr "useradd"
 
-#: useradd.8.xml:58(refpurpose)
+#: useradd.8.xml:61(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:70(arg) useradd.8.xml:74(arg)
+#: useradd.8.xml:73(arg) useradd.8.xml:77(arg)
 msgid "-D"
 msgstr "-D"
 
-#: useradd.8.xml:83(para)
+#: useradd.8.xml:86(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 "
@@ -1495,7 +1594,7 @@
 "<command>useradd</command> 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:92(para)
+#: useradd.8.xml:95(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 "
@@ -1505,12 +1604,12 @@
 "<option>-g</option>, <option>-N</option>, <option>-U</option>, et "
 "<option>USERGROUPS_ENAB</option>)"
 
-#: useradd.8.xml:101(para)
+#: useradd.8.xml:104(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:105(term) useradd.8.xml:507(term)
+#: useradd.8.xml:108(term) useradd.8.xml:523(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
@@ -1518,7 +1617,7 @@
 "<option>-b</option>, <option>--base-dir</option> <replaceable>RÉP_BASE</"
 "replaceable>"
 
-#: useradd.8.xml:110(para)
+#: useradd.8.xml:113(para)
 msgid ""
 "The default base directory for the system if <option>-d</"
 "option><replaceable>HOME_DIR</replaceable> is not specified. "
@@ -1532,7 +1631,7 @@
 "définir le répertoire personnel. Quand l'option <option>-m</option> n'est "
 "pas utilisée, <replaceable>RÉP_BASE</replaceable> doit exister."
 
-#: useradd.8.xml:118(para)
+#: useradd.8.xml:121(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>/"
@@ -1543,7 +1642,7 @@
 "<filename>/etc/default/useradd</filename> ou <filename>/home</filename> par "
 "défaut."
 
-#: useradd.8.xml:133(para)
+#: useradd.8.xml:136(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."
@@ -1552,7 +1651,7 @@
 "elle est actuellement utilisée comme champ pour le nom complet de "
 "l'utilisateur."
 
-#: useradd.8.xml:146(para)
+#: useradd.8.xml:149(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 "
@@ -1569,16 +1668,16 @@
 "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:158(term)
+#: useradd.8.xml:161(term)
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr "<option>-D</option>, <option>--defaults</option>"
 
-#: useradd.8.xml:162(para)
+#: useradd.8.xml:165(para)
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr ""
 "Consultez ci-dessous la sous-section « Modifier les valeurs par défaut »."
 
-#: useradd.8.xml:177(para)
+#: useradd.8.xml:180(para)
 msgid ""
 "If not specified, <command>useradd</command> will use the default expiry "
 "date specified by the <option>EXPIRE</option> variable in <filename>/etc/"
@@ -1589,7 +1688,7 @@
 "etc/default/useradd</filename> ou une chaîne vide (pas d'expiration) par "
 "défaut."
 
-#: useradd.8.xml:191(para)
+#: useradd.8.xml:194(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 "
@@ -1600,7 +1699,7 @@
 "que le mot de passe a dépassé sa fin de validité, et une valeur de -1 "
 "désactive cette fonctionnalité."
 
-#: useradd.8.xml:197(para)
+#: useradd.8.xml:200(para)
 msgid ""
 "If not specified, <command>useradd</command> will use the default inactivity "
 "period specified by the <option>INACTIVE</option> variable in <filename>/etc/"
@@ -1610,7 +1709,7 @@
 "par défaut précisée par la variable <option>INACTIVE</option> dans "
 "<filename>/etc/default/useradd</filename>, ou -1 par défaut."
 
-#: useradd.8.xml:211(para)
+#: useradd.8.xml:214(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."
@@ -1619,7 +1718,7 @@
 "l'utilisateur. Le nom du groupe doit exister. Un numéro de groupe doit se "
 "référer à un groupe déjà existant."
 
-#: useradd.8.xml:216(para)
+#: useradd.8.xml:219(para)
 msgid ""
 "If not specified, the behavior of <command>useradd</command> will depend on "
 "the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
@@ -1643,7 +1742,7 @@
 "la valeur précisée par la variable <option>GROUP</option> dans <filename>/"
 "etc/default/useradd</filename>, ou 100 par défaut."
 
-#: useradd.8.xml:239(para)
+#: useradd.8.xml:242(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. "
@@ -1657,7 +1756,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:256(term)
+#: useradd.8.xml:259(term)
 msgid ""
 "<option>-k</option>, <option>--skel</option><replaceable>SKEL_DIR</"
 "replaceable>"
@@ -1665,7 +1764,7 @@
 "<option>-k</option>, <option>--skel</option> <replaceable>RÉP_SQUELETTE</"
 "replaceable>"
 
-#: useradd.8.xml:261(para)
+#: useradd.8.xml:264(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 "
@@ -1675,7 +1774,7 @@
 "copiés dans le répertoire personnel de l'utilisateur, quand le répertoire "
 "personnel est créé par <command>useradd</command>."
 
-#: useradd.8.xml:266(para)
+#: useradd.8.xml:269(para)
 msgid ""
 "This option is only valid if the <option>-m</option> (or <option>--create-"
 "home</option>) option is specified."
@@ -1683,7 +1782,7 @@
 "Cette option n'est valable que si l'option <option>-m</option> (ou <option>--"
 "create-home</option>) est utilisée."
 
-#: useradd.8.xml:270(para)
+#: useradd.8.xml:273(para)
 msgid ""
 "If this option is not set, the skeleton directory is defined by the "
 "<option>SKEL</option> variable in <filename>/etc/default/useradd</filename> "
@@ -1693,11 +1792,11 @@
 "la variable <option>SKEL</option> dans <filename>/etc/default/useradd</"
 "filename> ou, par défaut, <filename>/etc/skel</filename>."
 
-#: useradd.8.xml:276(para)
+#: useradd.8.xml:279(para)
 msgid "If possible, the ACLs and extended attributes are copied."
 msgstr "Si possible, les ACL et les attributs étendus seront copiés."
 
-#: useradd.8.xml:282(term) groupadd.8.xml:113(term)
+#: useradd.8.xml:285(term) groupadd.8.xml:115(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -1705,7 +1804,7 @@
 "<option>-K</option>, <option>--key</option> <replaceable>CLÉ</"
 "replaceable>=<replaceable>VALEUR</replaceable>"
 
-#: useradd.8.xml:287(para)
+#: useradd.8.xml:290(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (<option>UID_MIN</"
 "option>, <option>UID_MAX</option>, <option>UMASK</option>, "
@@ -1730,15 +1829,15 @@
 "replaceable>=<replaceable>100</replaceable> <option>-K</option> "
 "<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: useradd.8.xml:311(term)
+#: useradd.8.xml:314(term)
 msgid "<option>-l</option>, <option>--no-log-init</option>"
 msgstr "<option>-l</option>, <option>--no-log-init</option>"
 
-#: useradd.8.xml:313(para)
+#: useradd.8.xml:316(para)
 msgid "Do not add the user to the lastlog and faillog databases."
 msgstr "N'ajoute pas l'utilisateur aux bases de données lastlog et faillog."
 
-#: useradd.8.xml:316(para)
+#: useradd.8.xml:319(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."
@@ -1747,11 +1846,11 @@
 "et faillog sont remises à zéro pour éviter de réutiliser les entrées d'un "
 "utilisateur précédemment supprimé."
 
-#: useradd.8.xml:324(term)
+#: useradd.8.xml:327(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:328(para)
+#: useradd.8.xml:331(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 "
@@ -1762,7 +1861,7 @@
 "être défini avec l'option <option>-k</option>) sera copié dans le répertoire "
 "personnel."
 
-#: useradd.8.xml:334(para)
+#: useradd.8.xml:337(para)
 msgid ""
 "By default, if this option is not specified and <option>CREATE_HOME</option> "
 "is not enabled, no home directories are created."
@@ -1770,11 +1869,11 @@
 "Par défaut, si cette option n'est pas précisée et si <option>CREATE_HOME</"
 "option> n'est pas activée, aucun répertoire personnel ne sera créé."
 
-#: useradd.8.xml:343(option)
+#: useradd.8.xml:346(option)
 msgid "-M"
 msgstr "-M"
 
-#: useradd.8.xml:346(para)
+#: useradd.8.xml:349(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 "
@@ -1785,11 +1884,11 @@
 "filename> (<option>CREATE_HOME</option>) est configurée à <replaceable>yes</"
 "replaceable>."
 
-#: useradd.8.xml:355(term)
+#: useradd.8.xml:358(term)
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr "<option>-N</option>, <option>--no-user-group</option>"
 
-#: useradd.8.xml:359(para)
+#: useradd.8.xml:362(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 "
@@ -1800,7 +1899,7 @@
 "par la variable <option>GROUP</option> dans <filename>/etc/default/useradd</"
 "filename>."
 
-#: useradd.8.xml:365(para) useradd.8.xml:473(para)
+#: useradd.8.xml:368(para) useradd.8.xml:489(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 "
@@ -1812,18 +1911,18 @@
 "variable <option>USERGROUPS_ENAB</option> dans <filename>/etc/login.defs</"
 "filename>."
 
-#: useradd.8.xml:378(para)
+#: useradd.8.xml:381(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:379(para)
+#: useradd.8.xml:382(para)
 msgid ""
 "This option is only valid in combination with the <option>-u</option> option."
 msgstr "Cette option n'est valable qu'avec l'option <option>-u</option>."
 
-#: useradd.8.xml:391(para) groupadd.8.xml:149(para)
+#: useradd.8.xml:394(para) groupadd.8.xml:151(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
@@ -1833,15 +1932,15 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>. Le comportement par défaut est de désactiver le mot de passe."
 
-#: useradd.8.xml:408(term) newusers.8.xml:263(term) groupadd.8.xml:166(term)
+#: useradd.8.xml:411(term) newusers.8.xml:268(term) groupadd.8.xml:168(term)
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr "<option>-r</option>, <option>--system</option>"
 
-#: useradd.8.xml:412(para) newusers.8.xml:267(para)
+#: useradd.8.xml:415(para) newusers.8.xml:272(para)
 msgid "Create a system account."
 msgstr "Créer un compte système."
 
-#: useradd.8.xml:415(para)
+#: useradd.8.xml:418(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are chosen in the "
@@ -1857,7 +1956,7 @@
 "<option>UID_MIN</option>-<option>UID_MAX</option> (et leurs équivalents "
 "<option>GID</option> pour la création des groupes)."
 
-#: useradd.8.xml:424(para)
+#: useradd.8.xml:427(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."
@@ -1871,7 +1970,7 @@
 "devez préciser l'option <option>-m</option> si vous voulez qu'un répertoire "
 "personnel soit créé pour un compte système."
 
-#: useradd.8.xml:440(para)
+#: useradd.8.xml:456(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 specified "
@@ -1884,7 +1983,7 @@
 "variable <option>SHELL</option> dans <filename>/etc/default/useradd</"
 "filename>, ou une chaîne vide par défaut."
 
-#: useradd.8.xml:455(para)
+#: useradd.8.xml:471(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 "
@@ -1900,11 +1999,11 @@
 "comprises entre 0 et 999 sont généralement réservées pour les comptes "
 "systèmes."
 
-#: useradd.8.xml:465(term)
+#: useradd.8.xml:481(term)
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr "<option>-U</option>, <option>--user-group</option>"
 
-#: useradd.8.xml:469(para)
+#: useradd.8.xml:485(para)
 msgid ""
 "Create a group with the same name as the user, and add the user to this "
 "group."
@@ -1912,7 +2011,7 @@
 "Crée un groupe avec le même nom que celui de l'utilisateur, et ajoute "
 "l'utilisateur à ce groupe."
 
-#: useradd.8.xml:487(para)
+#: useradd.8.xml:503(para)
 msgid ""
 "The SELinux user for the user's login. The default is to leave this field "
 "blank, which causes the system to select the default SELinux user."
@@ -1921,11 +2020,11 @@
 "comportement par défaut est de laisser ce champ vide. Le système "
 "sélectionnera alors l'utilisateur SELinux par défaut."
 
-#: useradd.8.xml:497(title)
+#: useradd.8.xml:513(title)
 msgid "Changing the default values"
 msgstr "Modifier les valeurs par défaut"
 
-#: useradd.8.xml:498(para)
+#: useradd.8.xml:514(para)
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
 "command> will display the current default values. When invoked with <option>-"
@@ -1938,7 +2037,7 @@
 "<command>useradd</command> mettra à jour les valeurs par défaut des options "
 "précisées. Les options valables sont :"
 
-#: useradd.8.xml:512(para)
+#: useradd.8.xml:528(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 "
@@ -1951,7 +2050,7 @@
 "<option>-d</option> n'est pas utilisée pendant la création d'un nouveau "
 "compte."
 
-#: useradd.8.xml:519(para)
+#: useradd.8.xml:535(para)
 msgid ""
 "This option sets the <option>HOME</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -1959,11 +2058,11 @@
 "Cette option configure la variable <option>HOME</option> dans <filename>/etc/"
 "default/useradd</filename>."
 
-#: useradd.8.xml:531(para)
+#: useradd.8.xml:547(para)
 msgid "The date on which the user account is disabled."
 msgstr "Date à laquelle le compte utilisateur sera désactivé."
 
-#: useradd.8.xml:532(para)
+#: useradd.8.xml:548(para)
 msgid ""
 "This option sets the <option>EXPIRE</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -1971,7 +2070,7 @@
 "Cette option configure la variable <option>EXPIRE</option> dans <filename>/"
 "etc/default/useradd</filename>."
 
-#: useradd.8.xml:544(para)
+#: useradd.8.xml:560(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
@@ -1979,7 +2078,7 @@
 "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:548(para)
+#: useradd.8.xml:564(para)
 msgid ""
 "This option sets the <option>INACTIVE</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -1987,7 +2086,7 @@
 "Cette option configure la variable <option>INACTIVE</option> dans <filename>/"
 "etc/default/useradd</filename>."
 
-#: useradd.8.xml:560(para)
+#: useradd.8.xml:576(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> "
@@ -2002,7 +2101,7 @@
 "nom du groupe doit exister, et un identifiant de groupe numérique doit avoir "
 "une entrée existante."
 
-#: useradd.8.xml:569(para)
+#: useradd.8.xml:585(para)
 msgid ""
 "This option sets the <option>GROUP</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -2010,11 +2109,11 @@
 "Cette option configure la variable <option>GROUP</option> dans <filename>/"
 "etc/default/useradd</filename>."
 
-#: useradd.8.xml:581(para)
+#: useradd.8.xml:597(para)
 msgid "The name of a new user's login shell."
 msgstr "Le nom de l'interpréteur de commandes du nouvel utilisateur."
 
-#: useradd.8.xml:584(para)
+#: useradd.8.xml:600(para)
 msgid ""
 "This option sets the <option>SHELL</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -2022,11 +2121,11 @@
 "Cette option configure la variable <option>SHELL</option> dans <filename>/"
 "etc/default/useradd</filename>."
 
-#: useradd.8.xml:596(title)
+#: useradd.8.xml:612(title)
 msgid "NOTES"
 msgstr "NOTES"
 
-#: useradd.8.xml:597(para)
+#: useradd.8.xml:613(para)
 msgid ""
 "The system administrator is responsible for placing the default user files "
 "in the <filename>/etc/skel/</filename> directory (or any other skeleton "
@@ -2038,7 +2137,7 @@
 "de modèles indiqué dans <filename>/etc/default/useradd</filename> ou sur la "
 "ligne de commande)."
 
-#: useradd.8.xml:606(para)
+#: useradd.8.xml:622(para)
 msgid ""
 "You may not add a user to a NIS or LDAP group. This must be performed on the "
 "corresponding server."
@@ -2046,7 +2145,7 @@
 "Vous ne pouvez pas ajouter d'utilisateur à un groupe NIS ou LDAP. Cela doit "
 "être effectué sur le serveur correspondant."
 
-#: useradd.8.xml:611(para)
+#: useradd.8.xml:627(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 "
@@ -2056,7 +2155,7 @@
 "externe, telle que NIS ou LDAP, <command>useradd</command> refusera de créer "
 "le compte d'utilisateur."
 
-#: useradd.8.xml:617(para)
+#: useradd.8.xml:633(para)
 msgid ""
 "Usernames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
@@ -2068,7 +2167,7 @@
 "par un signe dollar. Soit, sous la forme d'une expression rationnelle : [a-"
 "z_][a-z0-9_-]*[$]?"
 
-#: useradd.8.xml:623(para)
+#: useradd.8.xml:639(para)
 msgid "Usernames may only be up to 32 characters long."
 msgstr "Les noms d'utilisateur sont limités à 16 caractères."
 
@@ -2280,71 +2379,71 @@
 "Il est également utilisé par <command>pam_umask</command> en tant que valeur "
 "d'umask par défaut."
 
-#: useradd.8.xml:682(filename)
+#: useradd.8.xml:698(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
-#: useradd.8.xml:684(para)
+#: useradd.8.xml:700(para)
 msgid "Default values for account creation."
 msgstr "Valeurs par défaut pour la création de comptes."
 
-#: useradd.8.xml:688(filename)
+#: useradd.8.xml:704(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
-#: useradd.8.xml:690(para)
+#: useradd.8.xml:706(para)
 msgid "Directory containing default files."
 msgstr "Répertoire contenant les fichiers par défaut."
 
-#: useradd.8.xml:726(replaceable) shadow.3.xml:35(manvolnum)
-#: pwck.8.xml:294(replaceable) passwd.1.xml:427(replaceable)
-#: grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable)
-#: groupadd.8.xml:262(replaceable)
+#: useradd.8.xml:742(replaceable) shadow.3.xml:39(manvolnum)
+#: pwck.8.xml:298(replaceable) passwd.1.xml:443(replaceable)
+#: grpck.8.xml:250(replaceable) groupmod.8.xml:225(replaceable)
+#: groupadd.8.xml:277(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:728(para) passwd.1.xml:447(para) groupmod.8.xml:201(para)
-#: groupadd.8.xml:264(para)
+#: useradd.8.xml:744(para) passwd.1.xml:463(para) groupmod.8.xml:227(para)
+#: groupadd.8.xml:279(para)
 msgid "invalid argument to option"
 msgstr "paramètre non valable pour l'option"
 
-#: useradd.8.xml:732(replaceable) pwck.8.xml:300(replaceable)
-#: passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable)
-#: groupmod.8.xml:205(replaceable) groupadd.8.xml:268(replaceable)
+#: useradd.8.xml:748(replaceable) pwck.8.xml:304(replaceable)
+#: passwd.1.xml:449(replaceable) grpck.8.xml:256(replaceable)
+#: groupmod.8.xml:231(replaceable) groupadd.8.xml:283(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:734(para)
+#: useradd.8.xml:750(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:740(para) groupmod.8.xml:207(para) groupmod.8.xml:213(para)
-#: groupdel.8.xml:126(para)
+#: useradd.8.xml:756(para) groupmod.8.xml:233(para) groupmod.8.xml:239(para)
+#: groupdel.8.xml:159(para)
 msgid "specified group doesn't exist"
 msgstr "le groupe spécifié n'existe pas"
 
-#: useradd.8.xml:744(replaceable) groupmod.8.xml:217(replaceable)
-#: groupadd.8.xml:274(replaceable)
+#: useradd.8.xml:760(replaceable) groupmod.8.xml:243(replaceable)
+#: groupadd.8.xml:289(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:746(para)
+#: useradd.8.xml:762(para)
 msgid "username already in use"
 msgstr "nom d'utilisateur déjà utilisé"
 
-#: useradd.8.xml:758(para)
+#: useradd.8.xml:774(para)
 msgid "can't create home directory"
 msgstr "impossible de créer le répertoire personnel"
 
-#: useradd.8.xml:762(replaceable)
+#: useradd.8.xml:778(replaceable)
 msgid "13"
 msgstr "13"
 
-#: useradd.8.xml:764(para)
+#: useradd.8.xml:780(para)
 msgid "can't create mail spool"
 msgstr "impossible de créer le répertoire d'attente des courriels"
 
-#: useradd.8.xml:704(para)
+#: useradd.8.xml:720(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -2352,7 +2451,7 @@
 "La commande <command>useradd</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: useradd.8.xml:773(para)
+#: useradd.8.xml:789(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -2390,36 +2489,36 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
+#: suauth.5.xml:38(refentrytitle) suauth.5.xml:45(refname)
 msgid "suauth"
 msgstr "suauth"
 
-#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
-#: pwck.8.xml:306(replaceable) porttime.5.xml:35(manvolnum)
-#: passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable)
-#: login.defs.5.xml:101(manvolnum) login.access.5.xml:36(manvolnum)
-#: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
-#: grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
+#: suauth.5.xml:39(manvolnum) shadow.5.xml:39(manvolnum)
+#: pwck.8.xml:310(replaceable) porttime.5.xml:39(manvolnum)
+#: passwd.5.xml:39(manvolnum) passwd.1.xml:455(replaceable)
+#: login.defs.5.xml:102(manvolnum) login.access.5.xml:40(manvolnum)
+#: limits.5.xml:40(manvolnum) gshadow.5.xml:38(manvolnum)
+#: grpck.8.xml:262(replaceable) faillog.5.xml:39(manvolnum)
 msgid "5"
 msgstr "5"
 
-#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo)
-#: porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo)
-#: login.defs.5.xml:102(refmiscinfo) login.access.5.xml:37(refmiscinfo)
-#: limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo)
-#: faillog.5.xml:36(refmiscinfo)
+#: suauth.5.xml:40(refmiscinfo) shadow.5.xml:40(refmiscinfo)
+#: porttime.5.xml:40(refmiscinfo) passwd.5.xml:40(refmiscinfo)
+#: login.defs.5.xml:103(refmiscinfo) login.access.5.xml:41(refmiscinfo)
+#: limits.5.xml:41(refmiscinfo) gshadow.5.xml:39(refmiscinfo)
+#: faillog.5.xml:40(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr "Formats et conversions de fichiers"
 
-#: suauth.5.xml:40(refpurpose)
+#: suauth.5.xml:46(refpurpose)
 msgid "detailed su control file"
 msgstr "Fichier de contrôle détaillé de su"
 
-#: suauth.5.xml:45(command) suauth.5.xml:171(filename)
+#: suauth.5.xml:51(command) suauth.5.xml:177(filename)
 msgid "/etc/suauth"
 msgstr "/etc/suauth"
 
-#: suauth.5.xml:51(para)
+#: suauth.5.xml:57(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:"
@@ -2429,7 +2528,7 @@
 "fonction de :"
 
 #. .RS
-#: suauth.5.xml:58(literallayout)
+#: suauth.5.xml:64(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2441,13 +2540,13 @@
 "    "
 
 #. .fi
-#: suauth.5.xml:62(para)
+#: suauth.5.xml:68(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:67(para)
+#: suauth.5.xml:73(para)
 msgid ""
 "The file is formatted like this, with lines starting with a # being treated "
 "as comment lines and ignored;"
@@ -2455,7 +2554,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:72(literallayout)
+#: suauth.5.xml:78(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2466,17 +2565,22 @@
 "      vers-id:par-id:ACTION\n"
 "    "
 
-#: suauth.5.xml:76(para)
+#: suauth.5.xml:82(para)
+#, fuzzy
+#| 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 \",\""
 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 \",\""
+"a list of usernames delimited by \",\"."
 msgstr ""
 "Où vers-id peut être le mot <emphasis>ALL</emphasis>, une liste de noms "
 "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:82(para)
+#: suauth.5.xml:88(para)
 msgid ""
 "from-id is formatted the same as to-id except the extra word "
 "<emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</"
@@ -2494,35 +2598,35 @@
 "<citerefentry><refentrytitle>/etc/group</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry> est nécessaire."
 
-#: suauth.5.xml:93(para)
+#: suauth.5.xml:99(para)
 msgid "Action can be one only of the following currently supported options."
 msgstr "Les valeurs d'ACTION valables sont :"
 
-#: suauth.5.xml:99(emphasis)
+#: suauth.5.xml:105(emphasis)
 msgid "DENY"
 msgstr "DENY"
 
-#: suauth.5.xml:102(para)
+#: suauth.5.xml:108(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:109(emphasis)
+#: suauth.5.xml:115(emphasis)
 msgid "NOPASS"
 msgstr "NOPASS"
 
-#: suauth.5.xml:112(para)
+#: suauth.5.xml:118(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:120(emphasis)
+#: suauth.5.xml:126(emphasis)
 msgid "OWNPASS"
 msgstr "OWNPASS"
 
-#: suauth.5.xml:123(para)
+#: suauth.5.xml:129(para)
 msgid ""
 "For the su command to be successful, the user must enter his or her own "
 "password. They are told this."
@@ -2530,7 +2634,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:131(para)
+#: suauth.5.xml:137(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 "
@@ -2544,11 +2648,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:141(title)
+#: suauth.5.xml:147(title)
 msgid "EXAMPLE"
 msgstr "EXEMPLE"
 
-#: suauth.5.xml:142(literallayout)
+#: suauth.5.xml:148(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2598,11 +2702,11 @@
 "      #\n"
 "    "
 
-#: suauth.5.xml:178(title) pwconv.8.xml:153(title) login.defs.5.xml:488(title)
+#: suauth.5.xml:184(title) pwconv.8.xml:198(title) login.defs.5.xml:491(title)
 msgid "BUGS"
 msgstr "BOGUES"
 
-#: suauth.5.xml:179(para)
+#: suauth.5.xml:185(para)
 msgid ""
 "There could be plenty lurking. The file parser is particularly unforgiving "
 "about syntax errors, expecting no spurious whitespace (apart from beginning "
@@ -2612,11 +2716,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:188(title) shadow.3.xml:183(title)
+#: suauth.5.xml:194(title) shadow.3.xml:189(title)
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSTICS"
 
-#: suauth.5.xml:189(para)
+#: suauth.5.xml:195(para)
 msgid ""
 "An error parsing the file is reported using "
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
@@ -2626,7 +2730,7 @@
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry> au niveau ERR dans la catégorie AUTH."
 
-#: suauth.5.xml:198(para)
+#: suauth.5.xml:204(para)
 msgid ""
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -2634,30 +2738,30 @@
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command)
-#: login.defs.5.xml:418(term)
+#: su.1.xml:55(refentrytitle) su.1.xml:62(refname) su.1.xml:67(command)
+#: login.defs.5.xml:421(term)
 msgid "su"
 msgstr "su"
 
-#: 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:40(refmiscinfo)
+#: su.1.xml:57(refmiscinfo) sg.1.xml:41(refmiscinfo)
+#: passwd.1.xml:47(refmiscinfo) newgrp.1.xml:41(refmiscinfo)
+#: login.1.xml:73(refmiscinfo) groups.1.xml:40(refmiscinfo)
+#: gpasswd.1.xml:45(refmiscinfo) expiry.1.xml:44(refmiscinfo)
+#: chsh.1.xml:43(refmiscinfo) chfn.1.xml:43(refmiscinfo)
+#: chage.1.xml:41(refmiscinfo)
 msgid "User Commands"
 msgstr "Commandes utilisateur"
 
-#: su.1.xml:60(refpurpose)
+#: su.1.xml:63(refpurpose)
 msgid "change user ID or become superuser"
 msgstr "Changer d'identifiant d'utilisateur ou devenir superutilisateur"
 
-#: su.1.xml:70(replaceable) login.1.xml:85(replaceable)
-#: login.1.xml:93(replaceable)
+#: su.1.xml:73(replaceable) login.1.xml:88(replaceable)
+#: login.1.xml:96(replaceable)
 msgid "username"
 msgstr "nom_utilisateur"
 
-#: su.1.xml:78(para)
+#: su.1.xml:81(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</"
@@ -2672,7 +2776,7 @@
 "un environnement similaire à celui que l'utilisateur aurait obtenu lors "
 "d'une connexion directe."
 
-#: su.1.xml:87(para)
+#: su.1.xml:90(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 "
@@ -2688,7 +2792,7 @@
 "l'interpréteur indiqué dans <filename>/etc/passwd</filename> pour "
 "l'utilisateur cible."
 
-#: su.1.xml:96(para)
+#: su.1.xml:99(para)
 msgid ""
 "You can use the <option>--</option> argument to separate <command>su</"
 "command> options from the arguments supplied to the shell."
@@ -2697,7 +2801,7 @@
 "options de <command>su</command> des paramètres fournis par l'interpréteur "
 "de commandes."
 
-#: su.1.xml:101(para)
+#: su.1.xml:104(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 "
@@ -2707,7 +2811,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:106(para)
+#: su.1.xml:109(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 "
@@ -2723,7 +2827,7 @@
 "modifié avec les paramètres <emphasis>ENV_PATH</emphasis> et "
 "<emphasis>ENV_SUPATH</emphasis> dans <filename>/etc/login.defs</filename>. "
 
-#: su.1.xml:115(para) login.1.xml:166(para)
+#: su.1.xml:118(para) login.1.xml:169(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 "
@@ -2734,11 +2838,11 @@
 "répertoire personnel sera utilisé comme racine d'un nouveau système de "
 "fichiers dans lequel l'utilisateur sera connecté."
 
-#: su.1.xml:124(para)
+#: su.1.xml:127(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:128(term)
+#: su.1.xml:131(term)
 msgid ""
 "<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
 "replaceable>"
@@ -2746,7 +2850,7 @@
 "<option>-c</option>, <option>--commande</option> <replaceable>COMMANDE</"
 "replaceable>"
 
-#: su.1.xml:133(para)
+#: su.1.xml:136(para)
 msgid ""
 "Specify a command that will be invoked by the shell using its <option>-c</"
 "option>."
@@ -2754,11 +2858,17 @@
 "Indiquer une commande qui sera invoquée par l'interpréteur de commandes en "
 "utilisant son option <option>-c</option>"
 
-#: su.1.xml:140(term)
+#: su.1.xml:140(para)
+msgid ""
+"The executed command will have no controlling terminal. This option cannot "
+"be used to execute interractive programs which need a controlling TTY."
+msgstr ""
+
+#: su.1.xml:150(term)
 msgid "<option>-</option>, <option>-l</option>, <option>--login</option>"
 msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
 
-#: su.1.xml:144(para)
+#: su.1.xml:154(para)
 msgid ""
 "Provide an environment similar to what the user would expect had the user "
 "logged in directly."
@@ -2766,7 +2876,7 @@
 "Fournir à l'utilisateur un environnement similaire à celui qu'il aurait "
 "obtenu s'il s'était connecté directement."
 
-#: su.1.xml:148(para)
+#: su.1.xml:158(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 "
@@ -2776,15 +2886,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:162(para)
+#: su.1.xml:172(para)
 msgid "The shell that will be invoked."
 msgstr "Interpréteur de commande devant être appelé."
 
-#: su.1.xml:170(para)
+#: su.1.xml:180(para)
 msgid "The shell specified with --shell."
 msgstr "Interpréteur de commande indiqué par --shell."
 
-#: su.1.xml:173(para)
+#: su.1.xml:183(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
@@ -2793,7 +2903,7 @@
 "commandes indiqué par la variable d'environnement <envar>$SHELL</envar> sera "
 "utilisé."
 
-#: su.1.xml:180(para)
+#: su.1.xml:190(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
@@ -2801,7 +2911,7 @@
 "Interpréteur de commandes indiqué dans <filename>/etc/passwd</filename> pour "
 "l'utilisateur cible."
 
-#: su.1.xml:186(para)
+#: su.1.xml:196(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
@@ -2809,14 +2919,14 @@
 "<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:163(para)
+#: su.1.xml:173(para)
 msgid ""
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 "L'interpréteur de commandes a appeler est choisi parmi (le choix de plus "
 "haute priorité en tête) : <placeholder-1/>"
 
-#: su.1.xml:191(para)
+#: su.1.xml:201(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>/"
@@ -2831,7 +2941,7 @@
 "$SHELL</envar> ne seront prises en compte à moins que <command>su</command> "
 "ne soit appelé par le superutilisateur."
 
-#: su.1.xml:202(term)
+#: su.1.xml:212(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2839,11 +2949,11 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:211(envar)
+#: su.1.xml:221(envar)
 msgid "$PATH"
 msgstr "$PATH"
 
-#: su.1.xml:213(para)
+#: su.1.xml:223(para)
 msgid ""
 "reset according to the <filename>/etc/login.defs</filename> options "
 "<option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
@@ -2852,11 +2962,11 @@
 "<option>ENV_SUPATH</option> dans <filename>/etc/login.defs</filename> (voir "
 "ci-dessous) :"
 
-#: su.1.xml:222(envar)
+#: su.1.xml:232(envar)
 msgid "$IFS"
 msgstr "$IFS"
 
-#: su.1.xml:224(para)
+#: su.1.xml:234(para)
 msgid ""
 "reset to <quote><space><tab><newline></quote>, if it was "
 "set."
@@ -2864,11 +2974,11 @@
 "réinitialise à <quote><space><tab><newline></quote>, s'il "
 "a été défini."
 
-#: su.1.xml:207(para)
+#: su.1.xml:217(para)
 msgid "Preserve the current environment, except for: <placeholder-1/>"
 msgstr "Préserver l'environnement actuel, sauf pour : <placeholder-1/>"
 
-#: su.1.xml:233(para)
+#: su.1.xml:243(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
@@ -2877,7 +2987,7 @@
 "option n'a aucun effet (à moins que <command>su</command> ne soit appelé par "
 "le superutilisateur)."
 
-#: su.1.xml:242(para)
+#: su.1.xml:252(para)
 msgid ""
 "The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, "
 "<envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> "
@@ -2887,7 +2997,7 @@
 "<envar>$USER</envar>, <envar>$LOGNAME</envar>, <envar>$PATH</envar> et "
 "<envar>$IFS</envar> sont réinitialisées."
 
-#: su.1.xml:251(para)
+#: su.1.xml:261(para)
 msgid ""
 "If <option>--login</option> is not used, the environment is copied, except "
 "for the variables above."
@@ -2895,7 +3005,7 @@
 "Si <option>--login</option> n'est pas utilisée, l'environnement est copié "
 "sauf pour les variables ci-dessus."
 
-#: su.1.xml:258(para)
+#: su.1.xml:268(para)
 msgid ""
 "If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>"
 "$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> "
@@ -2905,7 +3015,7 @@
 "<envar>$TERM</envar>, <envar>$COLORTERM</envar>, <envar>$DISPLAY</envar> et "
 "<envar>$XAUTHORITY</envar> sont copiées si elles ont été définies."
 
-#: su.1.xml:268(para)
+#: su.1.xml:278(para)
 msgid ""
 "If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</"
 "envar>, and <envar>$MAIL</envar> environment variables are set according to "
@@ -2919,7 +3029,7 @@
 "<option>ENV_HZ</option>, <option>MAIL_DIR</option> et <option>MAIL_FILE</"
 "option> de <filename>/etc/login.defs</filename> (voir ci-dessous)."
 
-#: su.1.xml:281(para)
+#: su.1.xml:291(para)
 msgid ""
 "If <option>--login</option> is used, other environment variables might be "
 "set by the <option>ENVIRON_FILE</option> file (see below)."
@@ -2928,11 +3038,11 @@
 "d'environnement peuvent être configurées par le fichier "
 "<option>ENVIRON_FILE</option> (voir ci-dessous)."
 
-#: su.1.xml:289(para)
+#: su.1.xml:299(para)
 msgid "Other environments might be set by PAM modules."
 msgstr "D'autres environnements peuvent être configurés par des modules PAM."
 
-#: su.1.xml:237(para)
+#: su.1.xml:247(para)
 msgid ""
 "Note that the default behavior for the environment is the following: "
 "<placeholder-1/>"
@@ -2940,7 +3050,7 @@
 "Notez que le comportement par défaut pour l'environnement est le suivant : "
 "<placeholder-1/>"
 
-#: su.1.xml:303(para)
+#: su.1.xml:313(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -2996,9 +3106,13 @@
 msgstr "<option>DEFAULT_HOME</option> (booléen)"
 
 #: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+#, fuzzy
+#| msgid ""
+#| "Indicate if login is allowed if we can't cd to the home directory. "
+#| "Default in no."
 msgid ""
 "Indicate if login is allowed if we can't cd to the home directory. Default "
-"in no."
+"is no."
 msgstr ""
 "Indiquer si la connexion est permise si on ne peut pas accéder au répertoire "
 "personnel. Le réglage par défaut est « no »."
@@ -3129,10 +3243,15 @@
 
 #: 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)
+#, fuzzy
+#| 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."
 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."
+"will not be translated."
 msgstr ""
 "La chaîne de caractères utilisée pour l'invite de mot de passe. La valeur "
 "par défaut est d'utiliser \"Password: \" (« mot de passe : »), ou une "
@@ -3171,7 +3290,12 @@
 msgstr "<option>QUOTAS_ENAB</option> (booléen)"
 
 #: 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."
+#, fuzzy
+#| msgid ""
+#| "Enable setting of ulimit, umask, and niceness from passwd gecos field."
+msgid ""
+"Enable setting of resource limits from <filename>/etc/limits</filename> and "
+"ulimit, umask, and niceness from the user's passwd gecos field."
 msgstr ""
 "Activer la mise en place de ulimit, umask et niveau nice depuis les champs "
 "gecos de passwd"
@@ -3231,7 +3355,7 @@
 "Activer la journalisation « syslog » de l'activité de <command>su</command> "
 "- en plus de la journalisation sulog."
 
-#: su.1.xml:363(para)
+#: su.1.xml:373(para)
 msgid ""
 "On success, <command>su</command> returns the exit value of the command it "
 "executed."
@@ -3239,7 +3363,7 @@
 "En cas de succès, <command>su</command> renvoie la valeur de sortie de la "
 "commande qu'il a exécuté."
 
-#: su.1.xml:367(para)
+#: su.1.xml:377(para)
 msgid ""
 "If this command was terminated by a signal, <command>su</command> returns "
 "the number of this signal plus 128."
@@ -3247,7 +3371,7 @@
 "Si cette commande s'est terminée par un signal, <command>su</command> y "
 "ajoute 128 et renvoie le résultat."
 
-#: su.1.xml:371(para)
+#: su.1.xml:381(para)
 msgid ""
 "If su has to kill the command (because it was asked to terminate, and the "
 "command did not terminate in time), <command>su</command> returns 255."
@@ -3256,31 +3380,31 @@
 "terminer et que la commande ne s'est pas terminée à temps), <command>su</"
 "command> renvoie 255."
 
-#: su.1.xml:383(para)
+#: su.1.xml:393(para)
 msgid "success (<option>--help</option> only)"
 msgstr "succès (<option>--help</option> uniquement)"
 
-#: su.1.xml:389(para)
+#: su.1.xml:399(para)
 msgid "System or authentication failure"
 msgstr "Échec système ou d'authentification"
 
-#: su.1.xml:393(replaceable)
+#: su.1.xml:403(replaceable)
 msgid "126"
 msgstr "126"
 
-#: su.1.xml:395(para)
+#: su.1.xml:405(para)
 msgid "The requested command was not found"
 msgstr "La commande demandée n'a pas été trouvée."
 
-#: su.1.xml:399(replaceable)
+#: su.1.xml:409(replaceable)
 msgid "127"
 msgstr "127"
 
-#: su.1.xml:401(para)
+#: su.1.xml:411(para)
 msgid "The requested command could not be executed"
 msgstr "La commande demandée n'a pas pu être exécutée."
 
-#: su.1.xml:376(para)
+#: su.1.xml:386(para)
 msgid ""
 "Some exit values from <command>su</command> are independent from the "
 "executed command: <placeholder-1/>"
@@ -3288,7 +3412,7 @@
 "Certaines valeurs de retour de <command>su</command> sont indépendantes de "
 "la commande exécutée : <placeholder-1/>"
 
-#: su.1.xml:410(para)
+#: su.1.xml:420(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -3304,27 +3428,27 @@
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>."
 
-#: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command)
+#: sg.1.xml:39(refentrytitle) sg.1.xml:46(refname) sg.1.xml:52(command)
 msgid "sg"
 msgstr "sg"
 
-#: sg.1.xml:44(refpurpose)
+#: sg.1.xml:47(refpurpose)
 msgid "execute command as different group ID"
 msgstr "exécuter une commande avec un autre identifiant de groupe"
 
-#: sg.1.xml:50(arg) newgrp.1.xml:49(arg)
+#: sg.1.xml:53(arg) newgrp.1.xml:52(arg)
 msgid "-"
 msgstr "-"
 
-#: sg.1.xml:52(arg) expiry.1.xml:53(arg)
+#: sg.1.xml:55(arg)
 msgid "-c"
 msgstr "-c"
 
-#: sg.1.xml:51(arg)
+#: sg.1.xml:54(arg)
 msgid "group <placeholder-1/> command"
 msgstr "groupe <placeholder-1/> commande"
 
-#: sg.1.xml:60(para)
+#: sg.1.xml:63(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/"
@@ -3358,7 +3482,7 @@
 msgstr ""
 "Activer la journalisation « syslog » de l'activité de <command>sg</command>."
 
-#: sg.1.xml:119(para)
+#: sg.1.xml:122(para)
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -3384,18 +3508,17 @@
 "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry></phrase>."
 
-#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
-#: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
-#: pwck.8.xml:63(replaceable) pwck.8.xml:78(replaceable)
-#: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
+#: shadow.5.xml:38(refentrytitle) shadow.5.xml:45(refname)
+#: shadow.3.xml:38(refentrytitle) shadow.3.xml:45(refname)
+#: pwck.8.xml:65(replaceable) grpck.8.xml:57(replaceable)
 msgid "shadow"
 msgstr "shadow"
 
-#: shadow.5.xml:40(refpurpose)
+#: shadow.5.xml:46(refpurpose)
 msgid "shadowed password file"
 msgstr "fichier des mots de passe cachés"
 
-#: shadow.5.xml:45(para)
+#: shadow.5.xml:51(para)
 msgid ""
 "<filename>shadow</filename> is a file which contains the password "
 "information for the system's accounts and optional aging information."
@@ -3404,7 +3527,7 @@
 "cachées concernant les mots de passe des utilisateurs et leurs dates de "
 "validité."
 
-#: shadow.5.xml:51(para) gshadow.5.xml:49(para)
+#: shadow.5.xml:57(para) gshadow.5.xml:55(para)
 msgid ""
 "This file must not be readable by regular users if password security is to "
 "be maintained."
@@ -3413,7 +3536,7 @@
 "normaux afin de maintenir la sécurité des mots de passe, en particuliers "
 "pour prévenir les attaques par dictionnaires."
 
-#: shadow.5.xml:56(para)
+#: shadow.5.xml:62(para)
 msgid ""
 "Each line of this file contains 9 fields, separated by colons (<quote>:</"
 "quote>), in the following order:"
@@ -3421,19 +3544,19 @@
 "Chaque ligne de ce fichier contient 9 champs, séparés par des deux-points "
 "(<quote>:</quote>), dans l'ordre suivant :"
 
-#: shadow.5.xml:63(emphasis) passwd.5.xml:53(para)
+#: shadow.5.xml:69(emphasis) passwd.5.xml:59(para)
 msgid "login name"
 msgstr "nom de connexion de l'utilisateur (« login »)"
 
-#: shadow.5.xml:65(para)
+#: shadow.5.xml:71(para)
 msgid "It must be a valid account name, which exist on the system."
 msgstr "Ce doit être un nom de compte valable, qui existe sur le système."
 
-#: shadow.5.xml:71(emphasis) gshadow.5.xml:68(emphasis)
+#: shadow.5.xml:77(emphasis) gshadow.5.xml:74(emphasis)
 msgid "encrypted password"
 msgstr "mot de passe chiffré"
 
-#: shadow.5.xml:73(para) gshadow.5.xml:70(para)
+#: shadow.5.xml:79(para) gshadow.5.xml:76(para)
 msgid ""
 "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry> for details on how this string is interpreted."
@@ -3442,7 +3565,7 @@
 "manvolnum></citerefentry> pour plus d'informations sur le traitement de "
 "cette chaîne."
 
-#: shadow.5.xml:78(para)
+#: shadow.5.xml:84(para)
 msgid ""
 "If the password field contains some string that is not a valid result of "
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
@@ -3456,7 +3579,7 @@
 "son mot de passe UNIX pour se connecter (mais il se peut que l'utilisateur "
 "puisse se connecter au système par d'autres moyens)."
 
-#: shadow.5.xml:85(para)
+#: shadow.5.xml:91(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 "
@@ -3468,7 +3591,7 @@
 "certaines applications qui lisent le fichier <filename>/etc/shadow</"
 "filename> peuvent n'autoriser aucun accès si le mot de passe est vide."
 
-#: shadow.5.xml:92(para) gshadow.5.xml:92(para)
+#: shadow.5.xml:98(para) gshadow.5.xml:98(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 "
@@ -3479,11 +3602,11 @@
 "représentent le champ de mot de passe avant que le mot de passe n'ait été "
 "bloqué."
 
-#: shadow.5.xml:102(emphasis)
+#: shadow.5.xml:108(emphasis)
 msgid "date of last password change"
 msgstr "date du dernier changement de mot de passe"
 
-#: shadow.5.xml:105(para)
+#: shadow.5.xml:111(para)
 msgid ""
 "The date of the last password change, expressed as the number of days since "
 "Jan 1, 1970."
@@ -3491,7 +3614,7 @@
 "La date du dernier changement de mot de passe, exprimée en nombre de jours "
 "depuis le 1er janvier 1970."
 
-#: shadow.5.xml:109(para)
+#: shadow.5.xml:115(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."
@@ -3499,17 +3622,17 @@
 "La valeur 0 a une signification particulière : l'utilisateur devra changer "
 "son mot de passe la prochaine fois qu'il se connectera au système."
 
-#: shadow.5.xml:114(para)
+#: shadow.5.xml:120(para)
 msgid "An empty field means that password aging features are disabled."
 msgstr ""
 "Un champ vide indique que les fonctionnalités de vieillissement de mot de "
 "passe sont désactivées."
 
-#: shadow.5.xml:121(emphasis)
+#: shadow.5.xml:127(emphasis)
 msgid "minimum password age"
 msgstr "âge minimum du mot de passe"
 
-#: shadow.5.xml:123(para)
+#: shadow.5.xml:129(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."
@@ -3517,17 +3640,17 @@
 "L'âge minimum du mot de passe est la durée (en jour) que l'utilisateur devra "
 "attendre avant de pouvoir le changer de nouveau."
 
-#: shadow.5.xml:128(para)
+#: shadow.5.xml:134(para)
 msgid "An empty field and value 0 mean that there are no minimum password age."
 msgstr ""
 "Un champ vide ou une valeur de 0 signifie qu'il n'y a pas d'âge minimum pour "
 "le mot de passe."
 
-#: shadow.5.xml:135(emphasis)
+#: shadow.5.xml:141(emphasis)
 msgid "maximum password age"
 msgstr "âge maximum du mot de passe"
 
-#: shadow.5.xml:137(para)
+#: shadow.5.xml:143(para)
 msgid ""
 "The maximum password age is the number of days after which the user will "
 "have to change her password."
@@ -3535,7 +3658,7 @@
 "L'âge maximum du mot de passe est la durée (en jour) après laquelle "
 "l'utilisateur devra changer son mot de passe."
 
-#: shadow.5.xml:141(para)
+#: shadow.5.xml:147(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."
@@ -3543,7 +3666,7 @@
 "Une fois cette durée écoulée, le mot de passe restera valable. Il sera "
 "demandé à l'utilisateur de le changer la prochaine fois qu'il se connectera."
 
-#: shadow.5.xml:146(para)
+#: shadow.5.xml:152(para)
 msgid ""
 "An empty field means that there are no maximum password age, no password "
 "warning period, and no password inactivity period (see below)."
@@ -3552,7 +3675,7 @@
 "aucune période d'avertissement d'expiration et aucune période d'inactivité "
 "(voir ci-dessous)."
 
-#: shadow.5.xml:151(para)
+#: shadow.5.xml:157(para)
 msgid ""
 "If the maximum password age is lower than the minimum password age, the user "
 "cannot change her password."
@@ -3560,11 +3683,11 @@
 "Si l'âge maximum du mot de passe est plus petit que l'âge minimum du mot de "
 "passe, l'utilisateur ne pourra pas changer son mot de passe."
 
-#: shadow.5.xml:159(emphasis)
+#: shadow.5.xml:165(emphasis)
 msgid "password warning period"
 msgstr "période d'avertissement d'expiration du mot de passe"
 
-#: shadow.5.xml:162(para)
+#: shadow.5.xml:168(para)
 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."
@@ -3572,18 +3695,18 @@
 "La durée (en jour) pendant laquelle l'utilisateur sera averti avant que le "
 "mot de passe n'expire (voir l'âge maximum du mot de passe ci-dessus)."
 
-#: shadow.5.xml:167(para)
+#: shadow.5.xml:173(para)
 msgid ""
 "An empty field and value 0 mean that there are no password warning period."
 msgstr ""
 "Un champ vide ou une valeur de 0 signifie qu'il n'y aura pas de période "
 "d'avertissement d'expiration du mot de passe."
 
-#: shadow.5.xml:175(emphasis)
+#: shadow.5.xml:181(emphasis)
 msgid "password inactivity period"
 msgstr "période d'inactivité du mot de passe"
 
-#: shadow.5.xml:178(para)
+#: shadow.5.xml:184(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 "
@@ -3593,7 +3716,7 @@
 "après son expiration (voir l'âge maximum du mot de passe ci-dessus). "
 "L'utilisateur devra mettre à jour son mot de passe à la prochaine connexion."
 
-#: shadow.5.xml:184(para)
+#: shadow.5.xml:190(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 "
@@ -3603,16 +3726,16 @@
 "aucune connexion n'est possible en utilisant le mot de passe de "
 "l'utilisateur. L'utilisateur doit contacter son administrateur."
 
-#: shadow.5.xml:189(para)
+#: shadow.5.xml:195(para)
 msgid ""
 "An empty field means that there are no enforcement of an inactivity period."
 msgstr "Un champ vide signifie qu'aucune période d'inactivité n'est imposée."
 
-#: shadow.5.xml:197(emphasis)
+#: shadow.5.xml:203(emphasis)
 msgid "account expiration date"
 msgstr "date de fin de validité du compte"
 
-#: shadow.5.xml:200(para)
+#: shadow.5.xml:206(para)
 msgid ""
 "The date of expiration of the account, expressed as the number of days since "
 "Jan 1, 1970."
@@ -3620,7 +3743,7 @@
 "La date d'expiration du compte, exprimé en nombre de jours depuis le "
 "1er janvier 1970."
 
-#: shadow.5.xml:204(para)
+#: shadow.5.xml:210(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 "
@@ -3632,11 +3755,11 @@
 "l'utilisateur n'est pas autoriser à se connecter en utilisant son mot de "
 "passe."
 
-#: shadow.5.xml:210(para)
+#: shadow.5.xml:216(para)
 msgid "An empty field means that the account will never expire."
 msgstr "Un champ vide signifie que le compte n'expirera jamais."
 
-#: shadow.5.xml:213(para)
+#: shadow.5.xml:219(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."
@@ -3644,23 +3767,23 @@
 "La valeur 0 ne doit pas être utilisée puisqu'elle peut être interprétée soit "
 "comme un compte sans expiration, soit comme ayant expiré le 1er janvier 1970."
 
-#: shadow.5.xml:221(emphasis)
+#: shadow.5.xml:227(emphasis)
 msgid "reserved field"
 msgstr "champ réservé"
 
-#: shadow.5.xml:223(para)
+#: shadow.5.xml:229(para)
 msgid "This field is reserved for future use."
 msgstr "Ce champ est réservé pour une utilisation future."
 
-#: shadow.5.xml:245(filename)
+#: shadow.5.xml:251(filename)
 msgid "/etc/shadow-"
 msgstr "/etc/shadow-"
 
-#: shadow.5.xml:247(para)
+#: shadow.5.xml:253(para)
 msgid "Backup file for /etc/shadow."
 msgstr "Fichier de sauvegarde pour /etc/shadow."
 
-#: shadow.5.xml:248(para) passwd.5.xml:134(para)
+#: shadow.5.xml:254(para) passwd.5.xml:140(para)
 msgid ""
 "Note that this file is used by the tools of the shadow toolsuite, but not by "
 "all user and password management tools."
@@ -3668,7 +3791,7 @@
 "Notez que ce fichier est utilisé par les outils de la suite d'outils shadow, "
 "mais pas par tous les outils de gestion d'utilisateurs et de mot de passes."
 
-#: shadow.5.xml:259(para)
+#: shadow.5.xml:265(para)
 msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -3700,88 +3823,88 @@
 "<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: shadow.3.xml:36(refmiscinfo)
+#: shadow.3.xml:40(refmiscinfo)
 msgid "Library Calls"
 msgstr "Appels de bibliothèque"
 
-#: shadow.3.xml:40(refname)
+#: shadow.3.xml:46(refname)
 msgid "getspnam"
 msgstr "getspnam"
 
-#: shadow.3.xml:41(refpurpose)
+#: shadow.3.xml:47(refpurpose)
 msgid "encrypted password file routines"
 msgstr "routines d'utilisation des mots de passe cachés"
 
-#: shadow.3.xml:45(title)
+#: shadow.3.xml:51(title)
 msgid "SYNTAX"
 msgstr "SYNTAX"
 
-#: shadow.3.xml:47(emphasis)
+#: shadow.3.xml:53(emphasis)
 msgid "#include <shadow.h>"
 msgstr "#include <shadow.h>"
 
-#: shadow.3.xml:51(emphasis)
+#: shadow.3.xml:57(emphasis)
 msgid "struct spwd *getspent();"
 msgstr "struct spwd *getspent();"
 
-#: shadow.3.xml:55(emphasis)
+#: shadow.3.xml:61(emphasis)
 msgid "struct spwd *getspnam(char"
 msgstr "struct spwd *getspnam(char"
 
-#: shadow.3.xml:56(emphasis)
+#: shadow.3.xml:62(emphasis)
 msgid "*name"
 msgstr "*nom"
 
-#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis)
-#: shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:62(emphasis) shadow.3.xml:75(emphasis)
+#: shadow.3.xml:80(emphasis) shadow.3.xml:86(emphasis)
 msgid ");"
 msgstr ");"
 
-#: shadow.3.xml:60(emphasis)
+#: shadow.3.xml:66(emphasis)
 msgid "void setspent();"
 msgstr "void setspent();"
 
-#: shadow.3.xml:64(emphasis)
+#: shadow.3.xml:70(emphasis)
 msgid "void endspent();"
 msgstr "void endspent();"
 
-#: shadow.3.xml:68(emphasis)
+#: shadow.3.xml:74(emphasis)
 msgid "struct spwd *fgetspent(FILE"
 msgstr "struct spwd *fgetspent(FILE"
 
-#: shadow.3.xml:69(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:75(emphasis) shadow.3.xml:86(emphasis)
 msgid "*fp"
 msgstr "*fp"
 
-#: shadow.3.xml:73(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "struct spwd *sgetspent(char"
 msgstr "struct spwd *sgetspent(char"
 
-#: shadow.3.xml:74(emphasis)
+#: shadow.3.xml:80(emphasis)
 msgid "*cp"
 msgstr "*cp"
 
-#: shadow.3.xml:78(emphasis)
+#: shadow.3.xml:84(emphasis)
 msgid "int putspent(struct spwd"
 msgstr "int putspent(struct spwd"
 
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "*p,"
 msgstr "*p,"
 
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "FILE"
 msgstr "FICHIER"
 
-#: shadow.3.xml:84(emphasis)
+#: shadow.3.xml:90(emphasis)
 msgid "int lckpwdf();"
 msgstr "int lckpwdf();"
 
-#: shadow.3.xml:88(emphasis)
+#: shadow.3.xml:94(emphasis)
 msgid "int ulckpwdf();"
 msgstr "int ulckpwdf();"
 
-#: shadow.3.xml:94(para)
+#: shadow.3.xml:100(para)
 msgid ""
 "<emphasis remap=\"I\">shadow</emphasis> manipulates the contents of the "
 "shadow password file, <filename>/etc/shadow</filename>. The structure in the "
@@ -3791,7 +3914,7 @@
 "mots de passe cachés, <filename>/etc/shadow</filename>. La structure définie "
 "dans le fichier inclus est :"
 
-#: shadow.3.xml:99(programlisting)
+#: shadow.3.xml:105(programlisting)
 #, no-wrap
 msgid ""
 "struct spwd {\n"
@@ -3820,40 +3943,40 @@
 "}\n"
 "    "
 
-#: shadow.3.xml:111(para)
+#: shadow.3.xml:117(para)
 msgid "The meanings of each field are:"
 msgstr "La signification de chaque champ est la suivante :"
 
-#: shadow.3.xml:114(para)
+#: shadow.3.xml:120(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:117(para)
+#: shadow.3.xml:123(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:120(para)
+#: shadow.3.xml:126(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:123(para)
+#: shadow.3.xml:129(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:126(para)
+#: shadow.3.xml:132(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:129(para)
+#: shadow.3.xml:135(para)
 msgid ""
 "sp_warn - days before password is to expire that user is warned of pending "
 "password expiration"
@@ -3862,7 +3985,7 @@
 "validité pendant lesquels l'utilisateur est averti de la fin prochaine de la "
 "validité de son mot de passe"
 
-#: shadow.3.xml:134(para)
+#: shadow.3.xml:140(para)
 msgid ""
 "sp_inact - days after password expires that account is considered inactive "
 "and disabled"
@@ -3870,17 +3993,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:139(para)
+#: shadow.3.xml:145(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:142(para)
+#: shadow.3.xml:148(para)
 msgid "sp_flag - reserved for future use"
 msgstr "sp_flag - réservé pour une utilisation future"
 
-#: shadow.3.xml:150(para)
+#: shadow.3.xml:156(para)
 msgid ""
 "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, "
 "<emphasis>fgetspent</emphasis>, and <emphasis>sgetspent</emphasis> each "
@@ -3904,7 +4027,7 @@
 "entrée correspondant à <emphasis>nom</emphasis> dans le fichier fourni en "
 "entrée."
 
-#: shadow.3.xml:163(para)
+#: shadow.3.xml:169(para)
 msgid ""
 "<emphasis>setspent</emphasis> and <emphasis>endspent</emphasis> may be used "
 "to begin and end, respectively, access to the shadow password file."
@@ -3913,7 +4036,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:169(para)
+#: shadow.3.xml:175(para)
 msgid ""
 "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines "
 "should be used to insure exclusive access to the <filename>/etc/shadow</"
@@ -3933,7 +4056,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:184(para)
+#: shadow.3.xml:190(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 "
@@ -3944,7 +4067,7 @@
 "retour est un <emphasis>int</emphasis> renvoient 0 en cas de succès et -1 en "
 "cas d'échec."
 
-#: shadow.3.xml:194(para)
+#: shadow.3.xml:200(para)
 msgid ""
 "These routines may only be used by the superuser as access to the shadow "
 "password file is restricted."
@@ -3952,7 +4075,7 @@
 "Ces fonctions peuvent n'être utilisées que par le superutilisateur car "
 "l'accès au fichier de mots de passe cachés est restreint."
 
-#: shadow.3.xml:214(para)
+#: shadow.3.xml:220(para)
 msgid ""
 "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -3962,32 +4085,32 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: pwconv.8.xml:43(refentrytitle) pwconv.8.xml:48(refname)
-#: pwconv.8.xml:57(command) login.defs.5.xml:401(term)
+#: pwconv.8.xml:44(refentrytitle) pwconv.8.xml:51(refname)
+#: pwconv.8.xml:60(command) login.defs.5.xml:404(term)
 msgid "pwconv"
 msgstr "pwconv"
 
-#: pwconv.8.xml:49(refname) pwconv.8.xml:60(command)
-#: login.defs.5.xml:410(term)
+#: pwconv.8.xml:52(refname) pwconv.8.xml:66(command)
+#: login.defs.5.xml:413(term)
 msgid "pwunconv"
 msgstr "pwunconv"
 
-#: pwconv.8.xml:50(refname) pwconv.8.xml:63(command)
-#: login.defs.5.xml:314(term)
+#: pwconv.8.xml:53(refname) pwconv.8.xml:72(command)
+#: login.defs.5.xml:317(term)
 msgid "grpconv"
 msgstr "grpconv"
 
-#: pwconv.8.xml:51(refname) pwconv.8.xml:66(command)
-#: login.defs.5.xml:320(term)
+#: pwconv.8.xml:54(refname) pwconv.8.xml:78(command)
+#: login.defs.5.xml:323(term)
 msgid "grpunconv"
 msgstr "grpunconv"
 
-#: pwconv.8.xml:52(refpurpose)
+#: pwconv.8.xml:55(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:72(para)
+#: pwconv.8.xml:87(para)
 msgid ""
 "The <command>pwconv</command> command creates <emphasis remap=\"I\">shadow</"
 "emphasis> from <emphasis remap=\"I\">passwd</emphasis> and an optionally "
@@ -3997,7 +4120,7 @@
 "\">shadow</emphasis> à partir du fichier <emphasis remap=\"I\">passwd</"
 "emphasis> et d'un éventuel fichier <emphasis remap=\"I\">shadow</emphasis>."
 
-#: pwconv.8.xml:77(para)
+#: pwconv.8.xml:92(para)
 msgid ""
 "<command>pwconv</command> does not work with <option>USE_TCB</option> "
 "enabled. To convert to tcb passwords, you should first use <command>pwconv</"
@@ -4014,7 +4137,7 @@
 "command> (et en réactivant <option>USE_TCB</option> dans <filename>login."
 "defs</filename>)."
 
-#: pwconv.8.xml:87(para)
+#: pwconv.8.xml:102(para)
 msgid ""
 "The <command>pwunconv</command> command creates <emphasis remap=\"I"
 "\">passwd</emphasis> from <emphasis remap=\"I\">passwd</emphasis> and "
@@ -4026,7 +4149,7 @@
 "emphasis> et <emphasis remap=\"I\">shadow</emphasis> puis supprime <emphasis "
 "remap=\"I\">shadow</emphasis>."
 
-#: pwconv.8.xml:93(para)
+#: pwconv.8.xml:108(para)
 msgid ""
 "<command>pwunconv</command> does not work with <option>USE_TCB</option> "
 "enabled. You should first switch back from tcb to shadowed passwords using "
@@ -4039,7 +4162,7 @@
 "désactiver <option>USE_TCB</option> dans <filename>login.defs</filename> "
 "avant d'utiliser <command>pwunconv</command>."
 
-#: pwconv.8.xml:102(para)
+#: pwconv.8.xml:117(para)
 msgid ""
 "The <command>grpconv</command> command creates <emphasis remap=\"I"
 "\">gshadow</emphasis> from <emphasis remap=\"I\">group</emphasis> and an "
@@ -4049,7 +4172,7 @@
 "emphasis> à partir de <emphasis remap=\"I\">group</emphasis> et d'un "
 "éventuel fichier <emphasis remap=\"I\">gshadow</emphasis>."
 
-#: pwconv.8.xml:108(para)
+#: pwconv.8.xml:123(para)
 msgid ""
 "The <command>grpunconv</command> command creates <emphasis remap=\"I"
 "\">group</emphasis> from <emphasis remap=\"I\">group</emphasis> and "
@@ -4061,7 +4184,7 @@
 "<emphasis remap=\"I\">gshadow</emphasis> puis supprime <emphasis remap=\"I"
 "\">gshadow</emphasis>."
 
-#: pwconv.8.xml:115(para)
+#: pwconv.8.xml:130(para)
 msgid ""
 "These four programs all operate on the normal and shadow password and group "
 "files: <filename>/etc/passwd</filename>, <filename>/etc/group</filename>, "
@@ -4072,7 +4195,7 @@
 "filename>, <filename>/etc/group</filename>, <filename>/etc/shadow</"
 "filename>, et <filename>/etc/gshadow</filename>."
 
-#: pwconv.8.xml:122(para)
+#: pwconv.8.xml:137(para)
 msgid ""
 "Each program acquires the necessary locks before conversion. "
 "<command>pwconv</command> and <command>grpconv</command> are similar. First, "
@@ -4096,7 +4219,7 @@
 "bien pour une mise à jour, si les fichiers principaux [ NdT : non cachés ] "
 "ont été édités à la main."
 
-#: pwconv.8.xml:133(para)
+#: pwconv.8.xml:148(para)
 msgid ""
 "<command>pwconv</command> will use the values of <emphasis remap=\"I"
 "\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis>, "
@@ -4109,7 +4232,7 @@
 "et <emphasis remap=\"I\">PASS_WARN_AGE</emphasis> définies dans le fichier "
 "<filename>/etc/login.defs</filename>."
 
-#: pwconv.8.xml:142(para)
+#: pwconv.8.xml:157(para)
 msgid ""
 "Likewise <command>pwunconv</command> and <command>grpunconv</command> are "
 "similar. Passwords in the main file are updated from the shadowed file. "
@@ -4126,8 +4249,21 @@
 "des mots de passe sont perdues par <command>pwunconv</command>. Il ne "
 "convertit que ce qu'il peut."
 
-#: pwconv.8.xml:154(para)
+#: pwconv.8.xml:169(para)
+#, fuzzy
+#| msgid ""
+#| "The options which apply to the <command>vipw</command> and <command>vigr</"
+#| "command> commands are:"
 msgid ""
+"The options which apply to the <command>pwconv</command>, <command>pwunconv</"
+"command>, <command>grpconv</command>, and <command>grpunconv</command> "
+"commands are:"
+msgstr ""
+"Les options applicables aux commandes <command>vipw</command> et "
+"<command>vigr</command> sont :"
+
+#: pwconv.8.xml:199(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. "
 "Please run <command>pwck</command> and <command>grpck</command> to correct "
@@ -4139,7 +4275,7 @@
 "étrange. Veuillez exécuter <command>pwck</command> et <command>grpck</"
 "command> pour corriger ces erreurs avant lancer toute conversion."
 
-#: pwconv.8.xml:165(para)
+#: pwconv.8.xml:210(para)
 msgid ""
 "The following configuration variable in <filename>/etc/login.defs</filename> "
 "changes the behavior of <command>grpconv</command> and <command>grpunconv</"
@@ -4149,7 +4285,7 @@
 "filename> change le comportement de <command>grpconv</command> et "
 "<command>grpunconv</command> :"
 
-#: pwconv.8.xml:173(para)
+#: pwconv.8.xml:218(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of <command>pwconv</command>:"
@@ -4157,7 +4293,7 @@
 "Les variables de configuration suivantes dans <filename>/etc/login.defs</"
 "filename> changent le comportement de <command>pwconv</command> :"
 
-#: pwconv.8.xml:200(para)
+#: pwconv.8.xml:245(para)
 msgid ""
 "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -4177,37 +4313,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>tcb_unconvert</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry></phrase>."
 
-#: pwck.8.xml:43(refentrytitle) pwck.8.xml:48(refname) pwck.8.xml:54(command)
-#: pwck.8.xml:69(command) login.defs.5.xml:392(term)
+#: pwck.8.xml:44(refentrytitle) pwck.8.xml:51(refname) pwck.8.xml:57(command)
+#: login.defs.5.xml:395(term)
 msgid "pwck"
 msgstr "pwck"
 
-#: pwck.8.xml:49(refpurpose)
+#: pwck.8.xml:52(refpurpose)
 msgid "verify integrity of password files"
 msgstr "Vérifier l'intégrité des fichiers de mots de passe"
 
-#: pwck.8.xml:55(arg) pwck.8.xml:70(arg) pwck.8.xml:177(option)
-msgid "-q"
-msgstr "-q"
-
-#: pwck.8.xml:56(arg) pwck.8.xml:198(option) grpck.8.xml:58(arg)
-#: grpck.8.xml:149(option)
-msgid "-s"
-msgstr "-s"
-
-#: pwck.8.xml:59(replaceable) pwck.8.xml:74(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:381(term)
+#: pwck.8.xml:61(replaceable) passwd.5.xml:38(refentrytitle)
+#: passwd.5.xml:45(refname) passwd.1.xml:45(refentrytitle)
+#: passwd.1.xml:52(refname) passwd.1.xml:58(command)
+#: login.defs.5.xml:384(term)
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:71(arg) pwck.8.xml:188(option) login.1.xml:222(option)
-#: grpck.8.xml:49(arg) grpck.8.xml:139(option)
-msgid "-r"
-msgstr "-r"
-
-#: pwck.8.xml:87(para)
+#: pwck.8.xml:74(para)
 msgid ""
 "The <command>pwck</command> command verifies the integrity of the users and "
 "authentication information. It checks that all entries in <filename>/etc/"
@@ -4225,35 +4347,35 @@
 "confirmation de l'utilisateur sera demandée pour détruire les entrées mal "
 "formatées ou ayant d'autres erreurs non récupérables."
 
-#: pwck.8.xml:99(para) grpck.8.xml:80(para)
+#: pwck.8.xml:86(para) grpck.8.xml:75(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr "Voici les vérifications effectuées :"
 
-#: pwck.8.xml:102(para) grpck.8.xml:84(para)
+#: pwck.8.xml:89(para) grpck.8.xml:79(para)
 msgid "the correct number of fields"
 msgstr "nombre correct de champs ;"
 
-#: pwck.8.xml:105(para)
+#: pwck.8.xml:92(para)
 msgid "a unique and valid user name"
 msgstr "unicité et validité des noms d'utilisateur ;"
 
-#: pwck.8.xml:108(para)
+#: pwck.8.xml:95(para)
 msgid "a valid user and group identifier"
 msgstr "validité des identifiants d'utilisateur et de groupe ;"
 
-#: pwck.8.xml:111(para)
+#: pwck.8.xml:98(para)
 msgid "a valid primary group"
 msgstr "validité du groupe primaire ;"
 
-#: pwck.8.xml:114(para)
+#: pwck.8.xml:101(para)
 msgid "a valid home directory"
 msgstr "validité du répertoire personnel ;"
 
-#: pwck.8.xml:117(para)
+#: pwck.8.xml:104(para)
 msgid "a valid login shell"
 msgstr "validité de l'interpréteur de commandes initial (« login shell »)."
 
-#: pwck.8.xml:121(para)
+#: pwck.8.xml:108(para)
 msgid ""
 "<filename>shadow</filename> checks are enabled when a second file parameter "
 "is specified or when <filename>/etc/shadow</filename> exists on the system."
@@ -4262,11 +4384,11 @@
 "second paramètre de fichier est indiqué ou quand <filename>/etc/shadow</"
 "filename> existe sur le système."
 
-#: pwck.8.xml:126(para)
+#: pwck.8.xml:113(para)
 msgid "These checks are the following:"
 msgstr "Ces vérifications sont les suivantes :"
 
-#: pwck.8.xml:131(para)
+#: pwck.8.xml:118(para)
 msgid ""
 "every passwd entry has a matching shadow entry, and every shadow entry has a "
 "matching passwd entry"
@@ -4274,24 +4396,24 @@
 "chaque entrée de passwd a une entrée correspondante dans shadow, et chaque "
 "entrée shadow a une entrée passwd correspondante ;"
 
-#: pwck.8.xml:137(para)
+#: pwck.8.xml:124(para)
 msgid "passwords are specified in the shadowed file"
 msgstr ""
 "les mots de passe sont indiqués dans le fichier des mot de passe cachés ;"
 
-#: pwck.8.xml:140(para)
+#: pwck.8.xml:127(para)
 msgid "shadow entries have the correct number of fields"
 msgstr "les entrées de shadow ont le bon nombre de champs ;"
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:130(para)
 msgid "shadow entries are unique in shadow"
 msgstr "les entrées de shadow sont uniques dans shadow ;"
 
-#: pwck.8.xml:146(para)
+#: pwck.8.xml:133(para)
 msgid "the last password changes are not in the future"
 msgstr "la date du dernier changement de mot de passe n'est pas dans le futur."
 
-#: pwck.8.xml:150(para)
+#: pwck.8.xml:137(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 "
@@ -4311,7 +4433,7 @@
 "l'utilisateur est encouragé à utiliser <command>usermod</command> pour les "
 "corriger."
 
-#: pwck.8.xml:161(para)
+#: pwck.8.xml:148(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> "
@@ -4321,12 +4443,23 @@
 "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:171(para)
+#: pwck.8.xml:158(para) grpck.8.xml:129(para)
+#, fuzzy
+#| msgid ""
+#| "Except for the <option>-A</option> and <option>-M</option> options, the "
+#| "options cannot be combined."
+msgid ""
+"The <option>-r</option> and <option>-s</option> options cannot be combined."
+msgstr ""
+"À part les options <option>-A</option> et <option>-M</option>, les options "
+"ne peuvent pas être combinées."
+
+#: pwck.8.xml:162(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:180(para)
+#: pwck.8.xml:175(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
@@ -4334,11 +4467,23 @@
 "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:191(para)
+#: pwck.8.xml:182(term) grpck.8.xml:144(term)
+#, fuzzy
+#| msgid "<option>-r</option>, <option>--remove</option>"
+msgid "<option>-r</option>, <option>--read-only</option>"
+msgstr "<option>-r</option>, <option>--remove</option>"
+
+#: pwck.8.xml:184(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:201(para)
+#: pwck.8.xml:203(term) grpck.8.xml:167(term)
+#, fuzzy
+#| msgid "<option>-s</option>, <option>--shadow</option>"
+msgid "<option>-s</option>, <option>--sort</option>"
+msgstr "<option>-s</option>, <option>--shadow</option>"
+
+#: pwck.8.xml:205(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
@@ -4346,12 +4491,12 @@
 "Trie les entrées de <filename>/etc/passwd</filename> et <filename>/etc/"
 "shadow</filename> par UID."
 
-#: pwck.8.xml:205(para)
+#: pwck.8.xml:209(para)
 msgid "This option has no effect when <option>USE_TCB</option> is enabled."
 msgstr ""
 "Cette option n'a aucun effet quand <option>USE_TCB</option> est activée."
 
-#: pwck.8.xml:212(para)
+#: pwck.8.xml:216(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename><phrase condition=\"tcb"
@@ -4365,7 +4510,7 @@
 "L'utilisateur peut spécifier d'autres fichiers avec les paramètres "
 "<replaceable>passwd</replaceable> et <replaceable>shadow</replaceable>."
 
-#: pwck.8.xml:221(para)
+#: pwck.8.xml:225(para)
 msgid ""
 "Note that when <option>USE_TCB</option> is enabled, you cannot specify an "
 "alternative <replaceable>shadow</replaceable> file. In future releases, this "
@@ -4376,27 +4521,27 @@
 "Dans les prochaines versions, ce paramètre pourra être remplacé par un "
 "répertoire TCB alternatif."
 
-#: pwck.8.xml:290(para)
+#: pwck.8.xml:294(para)
 msgid "one or more bad password entries"
 msgstr "une entrée de mot de passe ou plus est incorrecte"
 
-#: pwck.8.xml:296(para)
+#: pwck.8.xml:300(para)
 msgid "can't open password files"
 msgstr "impossible d'ouvrir les fichiers de mots de passe"
 
-#: pwck.8.xml:302(para)
+#: pwck.8.xml:306(para)
 msgid "can't lock password files"
 msgstr "impossible de verrouiller les fichiers de mots de passe"
 
-#: pwck.8.xml:308(para)
+#: pwck.8.xml:312(para)
 msgid "can't update password files"
 msgstr "impossible de mettre à jour les fichiers des mots de passe"
 
-#: pwck.8.xml:314(para)
+#: pwck.8.xml:318(para)
 msgid "can't sort password files"
 msgstr "impossible de trier les fichiers de mots de passe"
 
-#: pwck.8.xml:272(para)
+#: pwck.8.xml:276(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4404,7 +4549,7 @@
 "La commande <command>pwck</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: pwck.8.xml:323(para)
+#: pwck.8.xml:327(para)
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>grpck</"
@@ -4424,17 +4569,17 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
+#: porttime.5.xml:38(refentrytitle) porttime.5.xml:45(refname)
 msgid "porttime"
 msgstr "porttime"
 
-#: porttime.5.xml:40(refpurpose)
+#: porttime.5.xml:46(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:45(para)
+#: porttime.5.xml:51(para)
 msgid ""
 "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, "
 "user names, and permitted login times."
@@ -4442,7 +4587,7 @@
 "<emphasis remap=\"I\">porttime</emphasis> contient une liste de tty, noms "
 "d'utilisateurs, et horaires d'accès autorisés."
 
-#: porttime.5.xml:50(para)
+#: porttime.5.xml:56(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 "
@@ -4458,7 +4603,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:59(para)
+#: porttime.5.xml:65(para)
 msgid ""
 "Each access time entry consists of zero or more days of the week, "
 "abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</"
@@ -4479,11 +4624,11 @@
 "semaine. Par défaut, si aucun jour n'est spécifié, <emphasis>Al</emphasis> "
 "est utilisé."
 
-#: porttime.5.xml:73(title)
+#: porttime.5.xml:79(title)
 msgid "EXAMPLES"
 msgstr "EXEMPLES"
 
-#: porttime.5.xml:74(para)
+#: porttime.5.xml:80(para)
 msgid ""
 "The following entry allows access to user <emphasis remap=\"B\">jfh</"
 "emphasis> on every port during weekdays from 9am to 5pm."
@@ -4492,11 +4637,11 @@
 "\">jfh</emphasis> sur n'importe quel port pendant la semaine de 9 heures à "
 "17 heures."
 
-#: porttime.5.xml:80(para)
+#: porttime.5.xml:86(para)
 msgid "*:jfh:Wk0900-1700"
 msgstr "*:jfh:Wk0900-1700"
 
-#: porttime.5.xml:82(para)
+#: porttime.5.xml:88(para)
 msgid ""
 "The following entries allow access only to the users <emphasis>root</"
 "emphasis> and <emphasis>oper</emphasis> on <filename>/dev/console</filename> "
@@ -4511,7 +4656,7 @@
 "utilisateurs ne satisferont que la deuxième entrée, qui n'autorise aucun "
 "accès."
 
-#: porttime.5.xml:91(programlisting)
+#: porttime.5.xml:97(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -4524,7 +4669,7 @@
 "      console:*:\n"
 "    "
 
-#: porttime.5.xml:96(para)
+#: porttime.5.xml:102(para)
 msgid ""
 "The following entry allows access for the user <emphasis>games</emphasis> on "
 "any port during non-working hours."
@@ -4532,19 +4677,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:101(para)
+#: porttime.5.xml:107(para)
 msgid "*:games:Wk1700-0900,SaSu0000-2400"
 msgstr "*:games:Wk1700-0900,SaSu0000-2400"
 
-#: porttime.5.xml:108(filename) logoutd.8.xml:67(filename)
+#: porttime.5.xml:114(filename) logoutd.8.xml:73(filename)
 msgid "/etc/porttime"
 msgstr "/etc/porttime"
 
-#: porttime.5.xml:110(para) logoutd.8.xml:69(para)
+#: porttime.5.xml:116(para) logoutd.8.xml:75(para)
 msgid "File containing port access."
 msgstr "Fichier contenant le port d'accès."
 
-#: porttime.5.xml:118(para) login.access.5.xml:109(para)
+#: porttime.5.xml:124(para) login.access.5.xml:115(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -4552,11 +4697,11 @@
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: passwd.5.xml:40(refpurpose)
+#: passwd.5.xml:46(refpurpose)
 msgid "the password file"
 msgstr "fichier des mots de passe"
 
-#: passwd.5.xml:45(para)
+#: passwd.5.xml:51(para)
 msgid ""
 "<filename>/etc/passwd</filename> contains one line for each user account, "
 "with seven fields delimited by colons (<quote>:</quote>). These fields are:"
@@ -4565,31 +4710,31 @@
 "comptes utilisateurs. Ces informations consistent en sept champs séparés par "
 "des deux-points (« : ») :"
 
-#: passwd.5.xml:56(para)
+#: passwd.5.xml:62(para)
 msgid "optional encrypted password"
 msgstr "un mot de passe chiffré optionnel"
 
-#: passwd.5.xml:59(para)
+#: passwd.5.xml:65(para)
 msgid "numerical user ID"
 msgstr "l'identifiant numérique de l'utilisateur"
 
-#: passwd.5.xml:62(para)
+#: passwd.5.xml:68(para)
 msgid "numerical group ID"
 msgstr "l'identifiant numérique du groupe de l'utilisateur"
 
-#: passwd.5.xml:65(para)
+#: passwd.5.xml:71(para)
 msgid "user name or comment field"
 msgstr "le nom complet de l'utilisateur ou un champ de commentaires"
 
-#: passwd.5.xml:68(para)
+#: passwd.5.xml:74(para)
 msgid "user home directory"
 msgstr "le répertoire personnel de l'utilisateur"
 
-#: passwd.5.xml:71(para)
+#: passwd.5.xml:77(para)
 msgid "optional user command interpreter"
 msgstr "l'interpréteur de commandes de l'utilisateur (optionnel)"
 
-#: passwd.5.xml:75(para)
+#: passwd.5.xml:81(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 "
@@ -4620,7 +4765,7 @@
 "indiqué dans <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>."
 
-#: passwd.5.xml:94(para)
+#: passwd.5.xml:100(para)
 msgid ""
 "The comment field is used by various system utilities, such as "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
@@ -4630,7 +4775,7 @@
 "que <citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>."
 
-#: passwd.5.xml:100(para)
+#: passwd.5.xml:106(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 "
@@ -4641,7 +4786,7 @@
 "information pour définir la valeur de la variable d'environnement <envar>"
 "$HOME</envar>."
 
-#: passwd.5.xml:106(para)
+#: passwd.5.xml:112(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 "
@@ -4656,19 +4801,19 @@
 "<filename>/bin/sh</filename> est utilisé par défaut."
 
 # TBC: file ?
-#: passwd.5.xml:127(para)
+#: passwd.5.xml:133(para)
 msgid "optional encrypted password file"
 msgstr "un mot de passe chiffré optionnel"
 
-#: passwd.5.xml:131(filename)
+#: passwd.5.xml:137(filename)
 msgid "/etc/passwd-"
 msgstr "/etc/passwd-"
 
-#: passwd.5.xml:133(para)
+#: passwd.5.xml:139(para)
 msgid "Backup file for /etc/passwd."
 msgstr "Fichier de sauvegarde de /etc/passwd."
 
-#: passwd.5.xml:145(para)
+#: passwd.5.xml:151(para)
 msgid ""
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getent</"
@@ -4704,11 +4849,11 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: passwd.1.xml:50(refpurpose)
+#: passwd.1.xml:53(refpurpose)
 msgid "change user password"
 msgstr "Modifier le mot de passe d'un utilisateur"
 
-#: passwd.1.xml:67(para)
+#: passwd.1.xml:70(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 "
@@ -4721,11 +4866,11 @@
 "n'importe quel compte. <command>passwd</command> modifie également les dates "
 "de fin de validité du compte ou du mot de passe associé."
 
-#: passwd.1.xml:76(title)
+#: passwd.1.xml:79(title)
 msgid "Password Changes"
 msgstr "Modifications du mot de passe"
 
-#: passwd.1.xml:77(para)
+#: passwd.1.xml:80(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 "
@@ -4738,7 +4883,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:85(para)
+#: passwd.1.xml:88(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, "
@@ -4749,7 +4894,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:92(para)
+#: passwd.1.xml:95(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 "
@@ -4759,7 +4904,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:98(para)
+#: passwd.1.xml:101(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 "
@@ -4769,19 +4914,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:106(para)
+#: passwd.1.xml:109(para)
 msgid "lower case alphabetics"
 msgstr "caractères alphabétiques minuscules"
 
-#: passwd.1.xml:109(para)
+#: passwd.1.xml:112(para)
 msgid "digits 0 thru 9"
 msgstr "chiffres de 0 à 9"
 
-#: passwd.1.xml:112(para)
+#: passwd.1.xml:115(para)
 msgid "punctuation marks"
 msgstr "marques de ponctuation"
 
-#: passwd.1.xml:116(para)
+#: passwd.1.xml:119(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 "
@@ -4791,11 +4936,11 @@
 "d'effacement. <command>passwd</command> rejettera tout mot de passe dont la "
 "complexité ne sera pas suffisante."
 
-#: passwd.1.xml:125(title)
+#: passwd.1.xml:128(title)
 msgid "Hints for user passwords"
 msgstr "Astuces pour les mots de passe"
 
-#: passwd.1.xml:126(para)
+#: passwd.1.xml:129(para)
 msgid ""
 "The security of a password depends upon the strength of the encryption "
 "algorithm and the size of the key space. The legacy <emphasis>UNIX</"
@@ -4811,7 +4956,7 @@
 "recommandées (voir <option>ENCRYPT_METHOD</option>). La taille de l'espace "
 "de clés dépend de l'aléa du mot de passe utilisé."
 
-#: passwd.1.xml:135(para)
+#: passwd.1.xml:138(para)
 msgid ""
 "Compromises in password security normally result from careless password "
 "selection or handling. For this reason, you should not select a password "
@@ -4827,7 +4972,7 @@
 "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:144(para)
+#: passwd.1.xml:147(para)
 msgid ""
 "You can find advices on how to choose a strong password on http://en."
 "wikipedia.org/wiki/Password_strength"
@@ -4835,17 +4980,17 @@
 "Vous pouvez trouver des conseils sur la façon choisir un mot de passe "
 "robuste sur http://en.wikipedia.org/wiki/Password_strength (en anglais)."
 
-#: passwd.1.xml:153(para)
+#: passwd.1.xml:156(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:158(term) faillog.8.xml:71(term)
+#: passwd.1.xml:161(term) faillog.8.xml:77(term)
 msgid "<option>-a</option>, <option>--all</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
 # NOTE: pas clair
-#: passwd.1.xml:162(para)
+#: passwd.1.xml:165(para)
 msgid ""
 "This option can be used only with <option>-S</option> and causes show status "
 "for all users."
@@ -4853,11 +4998,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:169(term)
+#: passwd.1.xml:172(term)
 msgid "<option>-d</option>, <option>--delete</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: passwd.1.xml:173(para)
+#: passwd.1.xml:176(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."
@@ -4866,11 +5011,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:181(term)
+#: passwd.1.xml:184(term)
 msgid "<option>-e</option>, <option>--expire</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
-#: passwd.1.xml:185(para)
+#: passwd.1.xml:188(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."
@@ -4879,7 +5024,7 @@
 "d'obliger un utilisateur à changer son mot de passe lors de sa prochaine "
 "connexion."
 
-#: passwd.1.xml:198(term)
+#: passwd.1.xml:201(term)
 msgid ""
 "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -4888,7 +5033,7 @@
 "<replaceable>DURÉE_INACTIVITÉ</replaceable>"
 
 # NOTE: Only this user account
-#: passwd.1.xml:202(para)
+#: passwd.1.xml:205(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 "
@@ -4900,12 +5045,12 @@
 "expiration de son mot de passe, l'utilisateur ne pourra plus se connecter "
 "avec ce compte."
 
-#: passwd.1.xml:211(term)
+#: passwd.1.xml:214(term)
 msgid "<option>-k</option>, <option>--keep-tokens</option>"
 msgstr "<option>-k</option>, <option>--keep-tokens</option>"
 
 # NOTE: pas clair
-#: passwd.1.xml:215(para)
+#: passwd.1.xml:218(para)
 msgid ""
 "Indicate password change should be performed only for expired authentication "
 "tokens (passwords). The user wishes to keep their non-expired tokens as "
@@ -4916,11 +5061,11 @@
 "le cas où l'utilisateur voudrait conserver ses jetons d'authentification "
 "encore valables."
 
-#: passwd.1.xml:223(term)
+#: passwd.1.xml:226(term)
 msgid "<option>-l</option>, <option>--lock</option>"
 msgstr "<option>-l</option>, <option>--lock</option>"
 
-#: passwd.1.xml:227(para)
+#: passwd.1.xml:230(para)
 msgid ""
 "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 "
@@ -4930,7 +5075,7 @@
 "de passe en le modifiant par une valeur qui ne correspond pas à un mot de "
 "passe chiffré possible (cela ajoute un « ! » au début du mot de passe)."
 
-#: passwd.1.xml:233(para)
+#: passwd.1.xml:236(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 "
@@ -4943,13 +5088,13 @@
 "devraient utiliser <command>usermod --expiredate 1</command> (cela défini la "
 "date d'expiration du compte au 2 janvier 1970)."
 
-#: passwd.1.xml:240(para)
+#: passwd.1.xml:243(para)
 msgid "Users with a locked password are not allowed to change their password."
 msgstr ""
 "Les utilisateurs avec un mot de passe verrouillé ne sont pas autorisés à le "
 "changer."
 
-#: passwd.1.xml:247(term)
+#: passwd.1.xml:250(term)
 msgid ""
 "<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -4957,7 +5102,7 @@
 "<option>-n</option>, <option>--mindays</option> <replaceable>JOURS_MIN</"
 "replaceable>"
 
-#: passwd.1.xml:251(para) chage.1.xml:146(para)
+#: passwd.1.xml:254(para) chage.1.xml:149(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -4967,7 +5112,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:269(term)
+#: passwd.1.xml:272(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -4975,16 +5120,16 @@
 "<option>-r</option>, <option>--repository</option> <replaceable>REPOSITORY</"
 "replaceable>"
 
-#: passwd.1.xml:273(para)
+#: passwd.1.xml:276(para)
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr ""
 "Modifier le mot de passe dans la base <replaceable>REPOSITORY</replaceable>"
 
-#: passwd.1.xml:279(term)
+#: passwd.1.xml:295(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
-#: passwd.1.xml:283(para)
+#: passwd.1.xml:299(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 "
@@ -5003,11 +5148,11 @@
 "durée d'inactivité autorisée pour le mot de passe. Les durées sont exprimées "
 "en jours."
 
-#: passwd.1.xml:297(term)
+#: passwd.1.xml:313(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
-#: passwd.1.xml:301(para)
+#: passwd.1.xml:317(para)
 msgid ""
 "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 "
@@ -5017,7 +5162,7 @@
 "mot de passe en remettant le mot de passe à sa valeur précédente (la valeur "
 "présente avant l'utilisation de l'option <option>-l</option>)."
 
-#: passwd.1.xml:310(term)
+#: passwd.1.xml:326(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -5025,7 +5170,7 @@
 "<option>-w</option>, <option>--warndays</option> "
 "<replaceable>DURÉE_AVERTISSEMENT</replaceable>"
 
-#: passwd.1.xml:314(para)
+#: passwd.1.xml:330(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 "
@@ -5038,7 +5183,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:323(term)
+#: passwd.1.xml:339(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -5046,7 +5191,7 @@
 "<option>-x</option>, <option>--maxdays</option> <replaceable>JOURS_MAX</"
 "replaceable>"
 
-#: passwd.1.xml:327(para)
+#: passwd.1.xml:343(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -5055,7 +5200,7 @@
 "valable. Après <replaceable>JOURS_MAX</replaceable>, le mot de passe devra "
 "être modifié."
 
-#: passwd.1.xml:339(para)
+#: passwd.1.xml:355(para)
 msgid ""
 "Password complexity checking may vary from site to site. The user is urged "
 "to select a password as complex as he or she feels comfortable with."
@@ -5065,7 +5210,7 @@
 "passe aussi complexe que possible dans la limite de ce qu'il est capable de "
 "mémoriser. "
 
-#: passwd.1.xml:344(para)
+#: passwd.1.xml:360(para)
 msgid ""
 "Users may not be able to change their password on a system if NIS is enabled "
 "and they are not logged into the NIS server."
@@ -5073,7 +5218,7 @@
 "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:349(para)
+#: passwd.1.xml:365(para)
 msgid ""
 "<command>passwd</command> uses PAM to authenticate users and to change their "
 "passwords."
@@ -5160,8 +5305,13 @@
 
 #: 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)
+#, fuzzy
+#| msgid ""
+#| "This variable is superceded by the <option>ENCRYPT_METHOD</option> "
+#| "variable or by any command line option used to configure the encryption "
+#| "algorithm."
 msgid ""
-"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"This variable is superseded by the <option>ENCRYPT_METHOD</option> variable "
 "or by any command line option used to configure the encryption algorithm."
 msgstr ""
 "Cette variable est écrasée par la variable <option>ENCRYPT_METHOD</option> "
@@ -5268,7 +5418,9 @@
 
 #: 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."
+#, fuzzy
+#| msgid "The values must be inside the 1000-999999999 range."
+msgid "The values must be inside the 1000-999,999,999 range."
 msgstr "Les valeurs doivent être comprises dans l'intervalle 1000-999999999."
 
 #: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para)
@@ -5291,37 +5443,37 @@
 "Si <option>SHA_CRYPT_MIN_ROUNDS</option> > <option>SHA_CRYPT_MAX_ROUNDS</"
 "option>, la valeur la plus élevée sera utilisée."
 
-#: passwd.1.xml:395(filename)
+#: passwd.1.xml:411(filename)
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/pam.d/passwd"
 
-#: passwd.1.xml:397(para)
+#: passwd.1.xml:413(para)
 msgid "PAM configuration for <command>passwd</command>."
 msgstr "Configuration de PAM pour <command>passwd</command>."
 
-#: passwd.1.xml:417(para) chage.1.xml:257(para)
+#: passwd.1.xml:433(para) chage.1.xml:273(para)
 msgid "permission denied"
 msgstr "permission refusée"
 
-#: passwd.1.xml:423(para)
+#: passwd.1.xml:439(para)
 msgid "invalid combination of options"
 msgstr "combinaison d'options non valable"
 
-#: passwd.1.xml:429(para)
+#: passwd.1.xml:445(para)
 msgid "unexpected failure, nothing done"
 msgstr "échec inattendu, rien n'a été fait"
 
-#: passwd.1.xml:435(para)
+#: passwd.1.xml:451(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr "échec inattendu, le fichier <filename>passwd</filename> est manquant"
 
-#: passwd.1.xml:441(para)
+#: passwd.1.xml:457(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:405(para)
+#: passwd.1.xml:421(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5329,34 +5481,46 @@
 "La commande <command>passwd</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: passwd.1.xml:456(para)
+#: passwd.1.xml:472(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></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>usermod</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
-"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
-"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>chpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <phrase condition=\"no_pam"
+"\"><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, </phrase><citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"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>, <phrase condition="
-"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
-"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname)
-#: nologin.8.xml:45(command)
+#: nologin.8.xml:38(refentrytitle) nologin.8.xml:45(refname)
+#: nologin.8.xml:51(command)
 msgid "nologin"
 msgstr "nologin"
 
-#: nologin.8.xml:40(refpurpose)
+#: nologin.8.xml:46(refpurpose)
 msgid "politely refuse a login"
 msgstr "refuser poliment une connexion"
 
-#: nologin.8.xml:51(para)
+#: nologin.8.xml:57(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 "
@@ -5367,7 +5531,7 @@
 "placée dans le champ indiquant l'interpréteur de commandes pour les comptes "
 "qui ont été désactivés."
 
-#: nologin.8.xml:56(para)
+#: nologin.8.xml:62(para)
 msgid ""
 "To disable all logins, investigate <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
@@ -5376,7 +5540,7 @@
 "<citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>."
 
-#: nologin.8.xml:65(para)
+#: nologin.8.xml:71(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
@@ -5386,35 +5550,43 @@
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: nologin.8.xml:76(title)
+#: nologin.8.xml:82(title)
 msgid "HISTORY"
 msgstr "HISTORIQUE"
 
-#: nologin.8.xml:77(para)
+#: nologin.8.xml:83(para)
 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:50(refentrytitle) newusers.8.xml:55(refname)
-#: newusers.8.xml:61(command) login.defs.5.xml:365(term)
+#: newusers.8.xml:51(refentrytitle) newusers.8.xml:58(refname)
+#: newusers.8.xml:64(command) login.defs.5.xml:368(term)
 msgid "newusers"
 msgstr "newusers"
 
-#: newusers.8.xml:56(refpurpose)
+#: newusers.8.xml:59(refpurpose)
 msgid "update and create new users in batch"
 msgstr "Mettre à jour, ou créer de nouveaux utilisateurs par lots"
 
-#: newusers.8.xml:64(replaceable)
-msgid "new_users"
-msgstr "nouveaux_utilisateurs"
+#: newusers.8.xml:69(replaceable)
+msgid "file"
+msgstr ""
 
-#: newusers.8.xml:71(para)
+#: newusers.8.xml:76(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 "
+#| "exceptions explained below:"
 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 exceptions "
-"explained below:"
+"The <command>newusers</command> command reads a <replaceable>file</"
+"replaceable> (or the standard input by default) and uses this information to "
+"update a set 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 exceptions explained below:"
 msgstr ""
 "La commande <command>newusers</command> lit un fichier contenant des paires "
 "de nom d'utilisateur et de mot de passe et utilise ces informations pour "
@@ -5424,19 +5596,19 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>) avec les exceptions "
 "suivantes :"
 
-#: newusers.8.xml:79(para)
+#: newusers.8.xml:84(para)
 msgid "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
 msgstr "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
 
-#: newusers.8.xml:84(emphasis)
+#: newusers.8.xml:89(emphasis)
 msgid "pw_name"
 msgstr "pw_name"
 
-#: newusers.8.xml:87(para)
+#: newusers.8.xml:92(para)
 msgid "This is the name of the user."
 msgstr "C'est le nom de l'utilisateur."
 
-#: newusers.8.xml:90(para)
+#: newusers.8.xml:95(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, "
@@ -5447,11 +5619,11 @@
 "command>). Dans le cas d'un utilisateur existant, les informations de "
 "l'utilisateur seront modifiées, sinon un nouvel utilisateur sera créé."
 
-#: newusers.8.xml:101(emphasis)
+#: newusers.8.xml:106(emphasis)
 msgid "pw_passwd"
 msgstr "pw_passwd"
 
-#: newusers.8.xml:104(para)
+#: newusers.8.xml:109(para)
 msgid ""
 "This field will be encrypted and used as the new value of the encrypted "
 "password."
@@ -5459,15 +5631,15 @@
 "Ce champ sera chiffré et utilisé comme nouvelle valeur du mot de passe "
 "chiffré."
 
-#: newusers.8.xml:112(emphasis)
+#: newusers.8.xml:117(emphasis)
 msgid "pw_uid"
 msgstr "pw_uid"
 
-#: newusers.8.xml:115(para)
+#: newusers.8.xml:120(para)
 msgid "This field is used to define the UID of the user."
 msgstr "Ce champ est utilisé pour définir l'UID de l'utilisateur."
 
-#: newusers.8.xml:118(para)
+#: newusers.8.xml:123(para)
 msgid ""
 "If the field is empty, an new (unused) UID will be defined automatically by "
 "<command>newusers</command>."
@@ -5475,11 +5647,11 @@
 "Si ce champ est vide, un nouvel UID (non utilisé) sera défini "
 "automatiquement par <command>newusers</command>."
 
-#: newusers.8.xml:122(para)
+#: newusers.8.xml:127(para)
 msgid "If this field contains a number, this number will be used as the UID."
 msgstr "Si ce champ contient un nombre, ce nombre sera utilisé comme UID."
 
-#: newusers.8.xml:126(para)
+#: newusers.8.xml:131(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 "
@@ -5489,7 +5661,7 @@
 "utilisateur créé précédemment par <command>newusers</command>), l'UID de "
 "l'utilisateur indiqué sera utilisé."
 
-#: newusers.8.xml:132(para)
+#: newusers.8.xml:137(para)
 msgid ""
 "If the UID of an existing user is changed, the files ownership of the user's "
 "file should be fixed manually."
@@ -5497,17 +5669,17 @@
 "Si l'UID d'un utilisateur existant est modifié, vous devrez configurer vous-"
 "même le propriétaire des fichiers de l'utilisateur."
 
-#: newusers.8.xml:140(emphasis)
+#: newusers.8.xml:145(emphasis)
 msgid "pw_gid"
 msgstr "pw_gid"
 
-#: newusers.8.xml:143(para)
+#: newusers.8.xml:148(para)
 msgid "This field is used to define the primary group ID for the user."
 msgstr ""
 "Ce champ est utilisé pour définir l'identifiant du groupe primaire de "
 "l'utilisateur."
 
-#: newusers.8.xml:146(para)
+#: newusers.8.xml:151(para)
 msgid ""
 "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 "
@@ -5517,7 +5689,7 @@
 "précédemment par <command>newusers</command>), le GID de ce groupe sera "
 "utilisé comme identifiant de groupe primaire pour l'utilisateur."
 
-#: newusers.8.xml:152(para)
+#: newusers.8.xml:157(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 "
@@ -5527,7 +5699,7 @@
 "groupe primaire de cet utilisateur. Si aucun groupe n'existe avec ce GID, un "
 "nouveau groupe sera créé avec ce GID et le nom de l'utilisateur."
 
-#: newusers.8.xml:158(para)
+#: newusers.8.xml:163(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> "
@@ -5539,13 +5711,20 @@
 "command> pour être utilisé comme identifiant de groupe primaire pour "
 "l'utilisateur et comme GID pour le nouveau groupe."
 
-#: newusers.8.xml:164(para)
+#: newusers.8.xml:169(para)
+#, fuzzy
+#| 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."
 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 "
+"created before 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."
+"and GID for the new group."
 msgstr ""
 "Si le champ contient le nom d'un groupe qui n'existe pas (et qui n'a pas été "
 "créé précédemment par <command>newusers</command>), un nouveau groupe sera "
@@ -5553,24 +5732,24 @@
 "<command>newusers</command> pour être utilisé comme identifiant de groupe "
 "primaire pour l'utilisateur et comme identifiant pour le nouveau groupe."
 
-#: newusers.8.xml:176(emphasis)
+#: newusers.8.xml:181(emphasis)
 msgid "pw_gecos"
 msgstr "pw_gecos"
 
-#: newusers.8.xml:179(para)
+#: newusers.8.xml:184(para)
 msgid "This field is copied in the GECOS field of the user."
 msgstr "Ce champ est copié dans le champ GECOS de l'utilisateur."
 
-#: newusers.8.xml:186(emphasis)
+#: newusers.8.xml:191(emphasis)
 msgid "pw_dir"
 msgstr "pw_dir"
 
-#: newusers.8.xml:189(para)
+#: newusers.8.xml:194(para)
 msgid "This field is used to define the home directory of the user."
 msgstr ""
 "Ce champ est utilisé pour définir le répertoire personnel de l'utilisateur."
 
-#: newusers.8.xml:192(para)
+#: newusers.8.xml:197(para)
 msgid ""
 "If this field does not specify an existing directory, the specified "
 "directory is created, with ownership set to the user being created or "
@@ -5580,7 +5759,7 @@
 "créé, avec comme propriétaire l'utilisateur en cours de création ou mis à "
 "jour et son groupe primaire."
 
-#: newusers.8.xml:197(para)
+#: newusers.8.xml:202(para)
 msgid ""
 "If the home directory of an existing user is changed, <command>newusers</"
 "command> does not move or copy the content of the old directory to the new "
@@ -5591,11 +5770,11 @@
 "répertoire personnel à la nouvelle place. Vous devrez effectuer cela vous-"
 "même."
 
-#: newusers.8.xml:207(emphasis)
+#: newusers.8.xml:212(emphasis)
 msgid "pw_shell"
 msgstr "pw_shell"
 
-#: newusers.8.xml:210(para)
+#: newusers.8.xml:215(para)
 msgid ""
 "This field defines the shell of the user. No checks are performed on this "
 "field."
@@ -5603,7 +5782,7 @@
 "Ce champ définit l'interpréteur de commande de l'utilisateur. Aucune "
 "vérification n'est effectué sur ce champ."
 
-#: newusers.8.xml:218(para)
+#: newusers.8.xml:223(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 "
@@ -5616,7 +5795,7 @@
 "l'écriture finale des bases de données), aucune modification ne sera "
 "propagée dans les bases de données."
 
-#: newusers.8.xml:224(para)
+#: newusers.8.xml:229(para)
 msgid ""
 "During this first pass, users are created with a locked password (and "
 "passwords are not changed for the users which are not created). A second "
@@ -5629,7 +5808,7 @@
 "en utilisant PAM. Les échecs de mise à jour des mots de passe sont signalés, "
 "mais n'empêchent pas les mises à jour des autres mots de passe."
 
-#: newusers.8.xml:232(para)
+#: newusers.8.xml:237(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are updated at a single time."
@@ -5637,20 +5816,20 @@
 "Cette commande a été conçue pour les gros systèmes pour lesquels un grand "
 "nombre de comptes sont mis à jour en même temps."
 
-#: newusers.8.xml:240(para)
+#: newusers.8.xml:245(para)
 msgid "The options which apply to the <command>newusers</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>newusers</command> sont :"
 
-#: newusers.8.xml:245(term) chgpasswd.8.xml:95(term)
+#: newusers.8.xml:250(term) chgpasswd.8.xml:98(term)
 msgid "<option>-c</option>, <option>--crypt-method</option>"
 msgstr "<option>-c</option>, <option>--crypt-method</option>"
 
-#: newusers.8.xml:247(para) chpasswd.8.xml:120(para) chgpasswd.8.xml:97(para)
+#: newusers.8.xml:252(para) chpasswd.8.xml:123(para) chgpasswd.8.xml:100(para)
 msgid "Use the specified method to encrypt the passwords."
 msgstr "Utiliser la méthode précisée pour chiffrer les mots de passe."
 
-#: newusers.8.xml:248(para) chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
+#: newusers.8.xml:253(para) chpasswd.8.xml:127(para) chgpasswd.8.xml:104(para)
 msgid ""
 "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc "
 "support these methods."
@@ -5658,7 +5837,7 @@
 "Les méthodes disponibles sont DES, MD5, NONE et SHA256 ou SHA512 si votre "
 "libc prend en charge ces méthodes."
 
-#: newusers.8.xml:270(para)
+#: newusers.8.xml:275(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are chosen in the "
@@ -5674,15 +5853,15 @@
 "option>-<option>UID_MAX</option> (et leur <option>GID</option> correspondant "
 "pour la création de groupes)."
 
-#: newusers.8.xml:284(term) chgpasswd.8.xml:129(term)
+#: newusers.8.xml:302(term) chgpasswd.8.xml:145(term)
 msgid "<option>-s</option>, <option>--sha-rounds</option>"
 msgstr "<option>-s</option>, <option>--sha-rounds</option>"
 
-#: newusers.8.xml:286(para) chpasswd.8.xml:172(para) chgpasswd.8.xml:131(para)
+#: newusers.8.xml:304(para) chpasswd.8.xml:188(para) chgpasswd.8.xml:147(para)
 msgid "Use the specified number of rounds to encrypt the passwords."
 msgstr "Utiliser le nombre de rounds précisé pour chiffrer les mots de passe."
 
-#: newusers.8.xml:289(para) chpasswd.8.xml:175(para) chgpasswd.8.xml:134(para)
+#: newusers.8.xml:307(para) chpasswd.8.xml:191(para) chgpasswd.8.xml:150(para)
 msgid ""
 "The value 0 means that the system will choose the default number of rounds "
 "for the crypt method (5000)."
@@ -5690,20 +5869,20 @@
 "La valeur 0 signifie que le système choisira la valeur par défaut du nombre "
 "de rounds pour la méthode de chiffrement (5000)."
 
-#: newusers.8.xml:293(para) chpasswd.8.xml:179(para) chgpasswd.8.xml:138(para)
+#: newusers.8.xml:311(para) chpasswd.8.xml:195(para) chgpasswd.8.xml:154(para)
 msgid ""
 "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr ""
 "Une valeur minimale de 1000 et une valeur maximale de 999 999 999 seront "
 "imposées."
 
-#: newusers.8.xml:297(para) chpasswd.8.xml:183(para) chgpasswd.8.xml:142(para)
+#: newusers.8.xml:315(para) chpasswd.8.xml:199(para) chgpasswd.8.xml:158(para)
 msgid "You can only use this option with the SHA256 or SHA512 crypt method."
 msgstr ""
 "Vous ne pouvez utiliser cette méthode qu'avec les méthodes de chiffrement "
 "SHA256 ou SHA512."
 
-#: newusers.8.xml:301(para) chgpasswd.8.xml:146(para)
+#: newusers.8.xml:319(para) chgpasswd.8.xml:162(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>."
@@ -5712,14 +5891,14 @@
 "SHA_CRYPT_MIN_ROUNDS et SHA_CRYPT_MAX_ROUNDS dans <filename>/etc/login.defs</"
 "filename>."
 
-#: newusers.8.xml:313(para)
+#: newusers.8.xml:331(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:317(para) chgpasswd.8.xml:162(para)
+#: newusers.8.xml:335(para) chgpasswd.8.xml:178(para)
 msgid ""
 "You should make sure the passwords and the encryption method respect the "
 "system's password policy."
@@ -5727,15 +5906,15 @@
 "Vous devez vous assurez que les mots de passe et la méthode de chiffrement "
 "respectent la politique de mot de passe du système."
 
-#: newusers.8.xml:390(filename)
+#: newusers.8.xml:408(filename)
 msgid "/etc/pam.d/newusers"
 msgstr "/etc/pam.d/newusers"
 
-#: newusers.8.xml:392(para)
+#: newusers.8.xml:410(para)
 msgid "PAM configuration for <command>newusers</command>."
 msgstr "Configuration de PAM pour <command>newusers</command>."
 
-#: newusers.8.xml:400(para)
+#: newusers.8.xml:418(para)
 msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5749,22 +5928,21 @@
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname)
-#: newgrp.1.xml:49(command)
+#: newgrp.1.xml:39(refentrytitle) newgrp.1.xml:46(refname)
+#: newgrp.1.xml:52(command)
 msgid "newgrp"
 msgstr "newgrp"
 
-#: newgrp.1.xml:44(refpurpose)
+#: newgrp.1.xml:47(refpurpose)
 msgid "log in to a new group"
 msgstr "se connecter avec un nouveau groupe"
 
-#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
-#: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
-#: groupadd.8.xml:57(replaceable) gpasswd.1.xml:66(replaceable)
+#: newgrp.1.xml:53(replaceable) grpck.8.xml:55(replaceable)
+#: groupadd.8.xml:59(replaceable) gpasswd.1.xml:69(replaceable)
 msgid "group"
 msgstr "groupe"
 
-#: newgrp.1.xml:56(para)
+#: newgrp.1.xml:59(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, "
@@ -5779,7 +5957,7 @@
 "actuel, y compris le répertoire de travail actuel est conservé."
 
 # NOTE:
-#: newgrp.1.xml:64(para)
+#: newgrp.1.xml:67(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 "
@@ -5805,7 +5983,7 @@
 "si le mot de passe du groupe est vide et que l'utilisateur ne fait pas "
 "partie de ses membres."
 
-#: newgrp.1.xml:78(para)
+#: newgrp.1.xml:81(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 "
@@ -5817,7 +5995,7 @@
 "ce fichier, sinon, l'entrée du fichier <filename>/etc/group</filename> est "
 "utilisée."
 
-#: newgrp.1.xml:130(para)
+#: newgrp.1.xml:133(para)
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -5843,16 +6021,18 @@
 "\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry></phrase>."
 
-#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname)
-#: logoutd.8.xml:45(command)
+#: logoutd.8.xml:38(refentrytitle) logoutd.8.xml:45(refname)
+#: logoutd.8.xml:51(command)
 msgid "logoutd"
 msgstr "logoutd"
 
-#: logoutd.8.xml:40(refpurpose)
-msgid "Enforce login time restrictions"
+#: logoutd.8.xml:46(refpurpose)
+#, fuzzy
+#| msgid "Enforce login time restrictions"
+msgid "enforce login time restrictions"
 msgstr "Imposer les restrictions de connexion dans le temps"
 
-#: logoutd.8.xml:51(para)
+#: logoutd.8.xml:57(para)
 msgid ""
 "<command>logoutd</command> enforces the login time and port restrictions "
 "specified in <filename>/etc/porttime</filename>. <command>logoutd</command> "
@@ -5871,23 +6051,23 @@
 "session en violation avec les restrictions de <filename>/etc/porttime</"
 "filename> est terminée."
 
-#: logoutd.8.xml:73(filename) login.1.xml:319(filename)
+#: logoutd.8.xml:79(filename) login.1.xml:322(filename)
 msgid "/var/run/utmp"
 msgstr "/var/run/utmp"
 
-#: logoutd.8.xml:75(para) login.1.xml:321(para)
+#: logoutd.8.xml:81(para) login.1.xml:324(para)
 msgid "List of current login sessions."
 msgstr "Liste des sessions de connexion en cours."
 
-#: login.defs.5.xml:100(refentrytitle) login.defs.5.xml:105(refname)
+#: login.defs.5.xml:101(refentrytitle) login.defs.5.xml:108(refname)
 msgid "login.defs"
 msgstr "login.defs"
 
-#: login.defs.5.xml:106(refpurpose)
+#: login.defs.5.xml:109(refpurpose)
 msgid "shadow password suite configuration"
 msgstr "configuration de la suite des mots de passe cachés « shadow password »"
 
-#: login.defs.5.xml:111(para)
+#: login.defs.5.xml:114(para)
 msgid ""
 "The <filename>/etc/login.defs</filename> file defines the site-specific "
 "configuration for the shadow password suite. This file is required. Absence "
@@ -5899,7 +6079,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:118(para)
+#: login.defs.5.xml:121(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 "
@@ -5913,7 +6093,7 @@
 "commentaires commencent par un caractère « # », qui doit être le premier "
 "caractère non blanc de la ligne."
 
-#: login.defs.5.xml:126(para)
+#: login.defs.5.xml:129(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 "
@@ -5936,7 +6116,7 @@
 "de <replaceable>0x</replaceable>). La valeur maximale des paramètres "
 "numériques normaux ou longs dépend de la machine."
 
-#: login.defs.5.xml:141(para)
+#: login.defs.5.xml:144(para)
 msgid "The following configuration items are provided:"
 msgstr "Les paramètres de configuration suivants sont fournis :"
 
@@ -6152,9 +6332,15 @@
 "Le nombre maximum de tentatives de connexion en cas de mauvais mot de passe."
 
 #: login.defs.5.xml:37(para) login.1.xml:37(para)
+#, fuzzy
+#| msgid ""
+#| "This will most likely be overridden 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."
 msgid ""
 "This will most likely be overridden by PAM, since the default pam_unix "
-"module has it's own built in of 3 retries. However, this is a safe fallback "
+"module has its 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 ""
@@ -6197,7 +6383,7 @@
 "quelqu'un d'autre que le superutilisateur. Le contenu de ces fichiers doit "
 "être un message indiquant pourquoi les connexions sont désactivées."
 
-#: login.defs.5.xml:184(para)
+#: login.defs.5.xml:187(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 "
@@ -6213,7 +6399,11 @@
 msgstr "<option>PORTTIME_CHECKS_ENAB</option> (booléen)"
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "Enable checking of time restrictions specified in /etc/porttime."
+#, fuzzy
+#| msgid "Enable checking of time restrictions specified in /etc/porttime."
+msgid ""
+"Enable checking of time restrictions specified in <filename>/etc/porttime</"
+"filename>."
 msgstr ""
 "Activer la vérification des restrictions de temps précisées dans /etc/"
 "porttime."
@@ -6286,11 +6476,11 @@
 msgid "Default <command>ulimit</command> value."
 msgstr "Valeur par défaut d'<command>ulimit</command>."
 
-#: login.defs.5.xml:215(title)
+#: login.defs.5.xml:218(title)
 msgid "CROSS REFERENCES"
 msgstr "RÉFÉRENCES CROISÉES"
 
-#: login.defs.5.xml:216(para)
+#: login.defs.5.xml:219(para)
 msgid ""
 "The following cross references show which programs in the shadow password "
 "suite use which parameters."
@@ -6298,22 +6488,22 @@
 "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:223(term) chage.1.xml:38(refentrytitle)
-#: chage.1.xml:43(refname) chage.1.xml:48(command)
+#: login.defs.5.xml:226(term) chage.1.xml:39(refentrytitle)
+#: chage.1.xml:46(refname) chage.1.xml:51(command)
 msgid "chage"
 msgstr "chage"
 
-#: login.defs.5.xml:225(para) login.defs.5.xml:413(phrase)
-#: login.defs.5.xml:480(phrase)
+#: login.defs.5.xml:228(para) login.defs.5.xml:416(phrase)
+#: login.defs.5.xml:483(phrase)
 msgid "USE_TCB"
 msgstr "USE_TCB"
 
-#: login.defs.5.xml:229(term) chfn.1.xml:41(refentrytitle)
-#: chfn.1.xml:46(refname) chfn.1.xml:52(command)
+#: login.defs.5.xml:232(term) chfn.1.xml:41(refentrytitle)
+#: chfn.1.xml:48(refname) chfn.1.xml:54(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:231(para)
+#: login.defs.5.xml:234(para)
 msgid ""
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
@@ -6321,12 +6511,12 @@
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
 
-#: login.defs.5.xml:239(term) chgpasswd.8.xml:42(refentrytitle)
-#: chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
+#: login.defs.5.xml:242(term) chgpasswd.8.xml:43(refentrytitle)
+#: chgpasswd.8.xml:50(refname) chgpasswd.8.xml:56(command)
 msgid "chgpasswd"
 msgstr "chgpasswd"
 
-#: login.defs.5.xml:241(para) login.defs.5.xml:272(para)
+#: login.defs.5.xml:244(para) login.defs.5.xml:275(para)
 msgid ""
 "ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB <phrase condition="
 "\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
@@ -6334,75 +6524,75 @@
 "ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB <phrase condition="
 "\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 
-#: login.defs.5.xml:249(term) chpasswd.8.xml:41(refentrytitle)
-#: chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
+#: login.defs.5.xml:252(term) chpasswd.8.xml:42(refentrytitle)
+#: chpasswd.8.xml:49(refname) chpasswd.8.xml:55(command)
 msgid "chpasswd"
 msgstr "chpasswd"
 
-#: login.defs.5.xml:252(phrase)
+#: login.defs.5.xml:255(phrase)
 msgid "ENCRYPT_METHOD MD5_CRYPT_ENAB"
 msgstr "ENCRYPT_METHOD MD5_CRYPT_ENAB"
 
-#: login.defs.5.xml:254(phrase)
+#: login.defs.5.xml:257(phrase)
 msgid "SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS"
 msgstr "SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS"
 
-#: login.defs.5.xml:260(term) chsh.1.xml:40(refentrytitle)
-#: chsh.1.xml:45(refname) chsh.1.xml:51(command)
+#: login.defs.5.xml:263(term) chsh.1.xml:41(refentrytitle)
+#: chsh.1.xml:48(refname) chsh.1.xml:54(command)
 msgid "chsh"
 msgstr "chsh"
 
-#: login.defs.5.xml:262(para)
+#: login.defs.5.xml:265(para)
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr "CHSH_AUTH LOGIN_STRING"
 
-#: login.defs.5.xml:270(term) gpasswd.1.xml:42(refentrytitle)
-#: gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
+#: login.defs.5.xml:273(term) gpasswd.1.xml:43(refentrytitle)
+#: gpasswd.1.xml:50(refname) gpasswd.1.xml:64(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
-#: login.defs.5.xml:280(term) groupadd.8.xml:41(refentrytitle)
-#: groupadd.8.xml:46(refname) groupadd.8.xml:52(command)
+#: login.defs.5.xml:283(term) groupadd.8.xml:41(refentrytitle)
+#: groupadd.8.xml:48(refname) groupadd.8.xml:54(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:282(para)
+#: login.defs.5.xml:285(para)
 msgid "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 msgstr "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 
-#: login.defs.5.xml:289(term) groupdel.8.xml:38(refentrytitle)
-#: groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
+#: login.defs.5.xml:292(term) groupdel.8.xml:39(refentrytitle)
+#: groupdel.8.xml:46(refname) groupdel.8.xml:52(command)
 msgid "groupdel"
 msgstr "groupdel"
 
-#: login.defs.5.xml:291(para) login.defs.5.xml:297(para)
-#: login.defs.5.xml:303(para) login.defs.5.xml:310(para)
-#: login.defs.5.xml:316(para) login.defs.5.xml:322(para)
+#: login.defs.5.xml:294(para) login.defs.5.xml:300(para)
+#: login.defs.5.xml:306(para) login.defs.5.xml:313(para)
+#: login.defs.5.xml:319(para) login.defs.5.xml:325(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr "MAX_MEMBERS_PER_GROUP"
 
-#: login.defs.5.xml:295(term) groupmems.8.xml:38(refentrytitle)
-#: groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
+#: login.defs.5.xml:298(term) groupmems.8.xml:39(refentrytitle)
+#: groupmems.8.xml:46(refname) groupmems.8.xml:52(command)
 msgid "groupmems"
 msgstr "groupmems"
 
-#: login.defs.5.xml:301(term) groupmod.8.xml:38(refentrytitle)
-#: groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
+#: login.defs.5.xml:304(term) groupmod.8.xml:39(refentrytitle)
+#: groupmod.8.xml:46(refname) groupmod.8.xml:52(command)
 msgid "groupmod"
 msgstr "groupmod"
 
-#: login.defs.5.xml:308(term) grpck.8.xml:38(refentrytitle)
-#: grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
+#: login.defs.5.xml:311(term) grpck.8.xml:39(refentrytitle)
+#: grpck.8.xml:46(refname) grpck.8.xml:52(command)
 msgid "grpck"
 msgstr "grpck"
 
-#: login.defs.5.xml:328(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)
+#: login.defs.5.xml:331(term) login.1.xml:71(refentrytitle)
+#: login.1.xml:78(refname) login.1.xml:84(command) login.1.xml:92(command)
+#: login.1.xml:99(command)
 msgid "login"
 msgstr "login"
 
-#: login.defs.5.xml:330(para)
+#: login.defs.5.xml:333(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</"
@@ -6428,15 +6618,15 @@
 "TTYGROUP TTYPERM TTYTYPE_FILE <phrase condition=\"no_pam\">ULIMIT UMASK</"
 "phrase> USERGROUPS_ENAB"
 
-#: login.defs.5.xml:357(term)
+#: login.defs.5.xml:360(term)
 msgid "newgrp / sg"
 msgstr "newgrp / sg"
 
-#: login.defs.5.xml:359(para)
+#: login.defs.5.xml:362(para)
 msgid "SYSLOG_SG_ENAB"
 msgstr "SYSLOG_SG_ENAB"
 
-#: login.defs.5.xml:367(para)
+#: login.defs.5.xml:370(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"
@@ -6448,7 +6638,7 @@
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase> SYS_GID_MAX "
 "SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX UID_MIN UMASK"
 
-#: login.defs.5.xml:383(para)
+#: login.defs.5.xml:386(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"
@@ -6458,7 +6648,7 @@
 "PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN <phrase condition=\"sha_crypt"
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 
-#: login.defs.5.xml:394(para)
+#: login.defs.5.xml:397(para)
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb"
 "\">TCB_AUTH_GROUP TCB_SYMLINKS USE_TCB</phrase>"
@@ -6466,7 +6656,7 @@
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb"
 "\">TCB_AUTH_GROUP TCB_SYMLINKS USE_TCB</phrase>"
 
-#: login.defs.5.xml:403(para)
+#: login.defs.5.xml:406(para)
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">USE_TCB</"
 "phrase>"
@@ -6474,7 +6664,7 @@
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">USE_TCB</"
 "phrase>"
 
-#: login.defs.5.xml:420(para)
+#: login.defs.5.xml:423(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH "
@@ -6490,15 +6680,15 @@
 "\"no_pam\">SU_WHEEL_ONLY</phrase> SYSLOG_SU_ENAB <phrase condition=\"no_pam"
 "\">USERGROUPS_ENAB</phrase>"
 
-#: login.defs.5.xml:435(term)
+#: login.defs.5.xml:438(term)
 msgid "sulogin"
 msgstr "sulogin"
 
-#: login.defs.5.xml:437(para)
+#: login.defs.5.xml:440(para)
 msgid "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 msgstr "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 
-#: login.defs.5.xml:446(para)
+#: login.defs.5.xml:449(para)
 msgid ""
 "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 "
@@ -6510,7 +6700,7 @@
 "UID_MAX UID_MIN UMASK <phrase condition=\"tcb\">TCB_AUTH_GROUP TCB_SYMLINK "
 "USE_TCB</phrase>"
 
-#: login.defs.5.xml:460(para)
+#: login.defs.5.xml:463(para)
 msgid ""
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB <phrase "
 "condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
@@ -6518,7 +6708,7 @@
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB <phrase "
 "condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
 
-#: login.defs.5.xml:470(para)
+#: login.defs.5.xml:473(para)
 msgid ""
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP <phrase condition=\"tcb"
 "\">TCB_SYMLINKS USE_TCB</phrase>"
@@ -6526,7 +6716,7 @@
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP <phrase condition=\"tcb"
 "\">TCB_SYMLINKS USE_TCB</phrase>"
 
-#: login.defs.5.xml:489(para)
+#: login.defs.5.xml:492(para)
 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 "
@@ -6547,7 +6737,7 @@
 "citerefentry>. Veuillez plutôt vous référer aux fichiers de configuration de "
 "PAM correspondant."
 
-#: login.defs.5.xml:505(para)
+#: login.defs.5.xml:508(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -6569,15 +6759,15 @@
 "citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
+#: login.access.5.xml:39(refentrytitle) login.access.5.xml:46(refname)
 msgid "login.access"
 msgstr "login.access"
 
-#: login.access.5.xml:41(refpurpose)
+#: login.access.5.xml:47(refpurpose)
 msgid "login access control table"
 msgstr "table de contrôle des connexions"
 
-#: login.access.5.xml:46(para)
+#: login.access.5.xml:52(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 "
@@ -6587,7 +6777,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:52(para)
+#: login.access.5.xml:58(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, "
@@ -6602,7 +6792,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:60(para)
+#: login.access.5.xml:66(para)
 msgid ""
 "Each line of the login access control table has three fields separated by a "
 "\":\" character:"
@@ -6610,7 +6800,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:65(para)
+#: login.access.5.xml:71(para)
 msgid ""
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
 "emphasis>:<emphasis remap=\"I\">origins</emphasis>"
@@ -6618,7 +6808,7 @@
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I"
 "\">utilisateurs</emphasis>:<emphasis remap=\"I\">origines</emphasis>"
 
-#: login.access.5.xml:69(para)
+#: login.access.5.xml:75(para)
 msgid ""
 "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or "
 "\"<emphasis>-</emphasis>\" (access denied) character. The second field "
@@ -6643,7 +6833,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:83(para)
+#: login.access.5.xml:89(para)
 msgid ""
 "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
 "compact rules."
@@ -6651,7 +6841,7 @@
 "L'opérateur <emphasis>EXCEPT</emphasis> permet d'écrire des règles très "
 "compactes."
 
-#: login.access.5.xml:88(para)
+#: login.access.5.xml:94(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 "
@@ -6663,37 +6853,37 @@
 "utilisés : le programme ne recherche pas parmi les groupes primaires des "
 "utilisateurs."
 
-#: login.1.xml:76(refpurpose)
+#: login.1.xml:79(refpurpose)
 msgid "begin session on the system"
 msgstr "Démarrer une session sur le système"
 
-#: 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)
+#: login.1.xml:85(arg) login.1.xml:93(arg) login.1.xml:100(arg)
+#: login.1.xml:217(option) groupmems.8.xml:57(arg)
 msgid "-p"
 msgstr "-p"
 
-#: login.1.xml:83(replaceable) login.1.xml:91(replaceable)
-#: login.1.xml:98(replaceable)
+#: login.1.xml:86(replaceable) login.1.xml:94(replaceable)
+#: login.1.xml:101(replaceable)
 msgid "host"
 msgstr "hôte"
 
-#: login.1.xml:83(arg) login.1.xml:91(arg) chfn.1.xml:56(arg)
+#: login.1.xml:86(arg) login.1.xml:94(arg)
 msgid "-h <placeholder-1/>"
 msgstr "-h <placeholder-1/>"
 
-#: login.1.xml:86(replaceable)
+#: login.1.xml:89(replaceable)
 msgid "ENV=VAR"
 msgstr "ENV=VAR"
 
-#: login.1.xml:92(arg) login.1.xml:192(option) expiry.1.xml:54(arg)
+#: login.1.xml:95(arg) login.1.xml:195(option)
 msgid "-f"
 msgstr "-f"
 
-#: login.1.xml:98(arg) chfn.1.xml:54(arg)
+#: login.1.xml:101(arg)
 msgid "-r <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
-#: login.1.xml:104(para)
+#: login.1.xml:107(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 "
@@ -6719,7 +6909,7 @@
 "interpréteur de commandes autre qu'un interpréteur de commandes initial "
 "(« login shell ») produira un message d'erreur."
 
-#: login.1.xml:118(para)
+#: login.1.xml:121(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 "
@@ -6731,7 +6921,7 @@
 "nombre d'échecs est permis avant que <command>login</command> ne quitte et "
 "que la liaison ne soit interrompue."
 
-#: login.1.xml:125(para)
+#: login.1.xml:128(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 "
@@ -6746,7 +6936,7 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> pour plus d'informations."
 
-#: login.1.xml:134(para)
+#: login.1.xml:137(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 "
@@ -6764,7 +6954,7 @@
 "emphasis> », « <emphasis>You have mail.</emphasis> », ou « <emphasis>No Mail."
 "</emphasis> » suivant l'état de votre boîte aux lettres."
 
-#: login.1.xml:145(para)
+#: login.1.xml:148(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>, "
@@ -6782,7 +6972,7 @@
 "d'umask et de nice pourront également être affectées en fonction des entrées "
 "du champ GECOS."
 
-#: login.1.xml:154(para)
+#: login.1.xml:157(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 "
@@ -6792,7 +6982,7 @@
 "emphasis> sera initialisée au type de terminal de votre tty, comme spécifié "
 "dans <filename>/etc/ttytype</filename>."
 
-#: login.1.xml:160(para)
+#: login.1.xml:163(para)
 msgid ""
 "An initialization script for your command interpreter may also be executed. "
 "Please see the appropriate manual section for more information on this "
@@ -6802,7 +6992,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:172(para) login.1.xml:248(para)
+#: login.1.xml:175(para) login.1.xml:251(para)
 msgid ""
 "The <command>login</command> program is NOT responsible for removing users "
 "from the utmp file. It is the responsibility of "
@@ -6825,33 +7015,37 @@
 "apparaître comme étant connecté même après s'être déconnecté de cette « sous-"
 "session »."
 
-#: login.1.xml:195(para)
+#: login.1.xml:198(para)
 msgid "Do not perform authentication, user is preauthenticated."
 msgstr "Ne pas réaliser d'authentification. L'utilisateur est pré-authentifié."
 
-#: login.1.xml:198(para)
+#: login.1.xml:201(para)
 msgid "Note: In that case, <replaceable>username</replaceable> is mandatory."
 msgstr ""
 "Remarque : Dans ce cas, <replaceable>username</replaceable> est nécessaire."
 
-#: login.1.xml:206(option)
+#: login.1.xml:209(option)
 msgid "-h"
 msgstr "-h"
 
-#: login.1.xml:209(para)
+#: login.1.xml:212(para)
 msgid "Name of the remote host for this login."
 msgstr "Nom de l'hôte distant pour cette connexion."
 
-#: login.1.xml:217(para)
+#: login.1.xml:220(para)
 msgid "Preserve environment."
 msgstr "Préserver l'environnement."
 
-#: login.1.xml:225(para)
+#: login.1.xml:225(option)
+msgid "-r"
+msgstr "-r"
+
+#: login.1.xml:228(para)
 msgid "Perform autologin protocol for rlogin."
 msgstr ""
 "Exécuter le protocole de connexion automatique (autologin) pour rlogin."
 
-#: login.1.xml:230(para)
+#: login.1.xml:233(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."
@@ -6859,7 +7053,7 @@
 "Les options <option>-r</option>, <option>-h</option> et <option>-f</option> "
 "ne peuvent être utilisées que par root."
 
-#: login.1.xml:239(para)
+#: login.1.xml:242(para)
 msgid ""
 "This version of <command>login</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -6868,13 +7062,13 @@
 "compilation. Seules certaines d'entre elles peuvent avoir été activées sur "
 "votre site."
 
-#: login.1.xml:244(para)
+#: login.1.xml:247(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:260(para)
+#: login.1.xml:263(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 "
@@ -6889,47 +7083,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:325(filename)
+#: login.1.xml:328(filename)
 msgid "/var/log/wtmp"
 msgstr "/var/log/wtmp"
 
-#: login.1.xml:327(para)
+#: login.1.xml:330(para)
 msgid "List of previous login sessions."
 msgstr "Liste des sessions de connexion précédentes."
 
-#: login.1.xml:343(filename)
+#: login.1.xml:346(filename)
 msgid "/etc/motd"
 msgstr "/etc/motd"
 
-#: login.1.xml:345(para)
+#: login.1.xml:348(para)
 msgid "System message of the day file."
 msgstr "Fichier contenant le message du système."
 
-#: login.1.xml:349(filename)
+#: login.1.xml:352(filename)
 msgid "/etc/nologin"
 msgstr "/etc/nologin"
 
-#: login.1.xml:351(para)
+#: login.1.xml:354(para)
 msgid "Prevent non-root users from logging in."
 msgstr "Empêcher les utilisateurs non-root de se connecter."
 
-#: login.1.xml:355(filename)
+#: login.1.xml:358(filename)
 msgid "/etc/ttytype"
 msgstr "/etc/ttytype"
 
-#: login.1.xml:357(para)
+#: login.1.xml:360(para)
 msgid "List of terminal types."
 msgstr "Liste des types de terminaux."
 
-#: login.1.xml:361(filename)
+#: login.1.xml:364(filename)
 msgid "$HOME/.hushlogin"
 msgstr "$HOME/.hushlogin"
 
-#: login.1.xml:363(para)
+#: login.1.xml:366(para)
 msgid "Suppress printing of system messages."
 msgstr "Supprimer l'affichage des messages du système."
 
-#: login.1.xml:377(para)
+#: login.1.xml:380(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -6959,15 +7153,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getty</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
+#: limits.5.xml:39(refentrytitle) limits.5.xml:46(refname)
 msgid "limits"
 msgstr "limits"
 
-#: limits.5.xml:41(refpurpose)
+#: limits.5.xml:47(refpurpose)
 msgid "resource limits definition"
 msgstr "définition des limites de ressources"
 
-#: limits.5.xml:47(para)
+#: limits.5.xml:53(para)
 msgid ""
 "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</"
 "filename> by default or LIMITS_FILE defined <filename>config.h</filename>) "
@@ -6979,7 +7173,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:55(para)
+#: limits.5.xml:61(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)."
@@ -6988,25 +7182,25 @@
 "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:61(para)
+#: limits.5.xml:67(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:64(emphasis)
+#: limits.5.xml:70(emphasis)
 msgid "user LIMITS_STRING"
 msgstr "utilisateur LISTE_DE_LIMITES"
 
-#: limits.5.xml:67(para)
+#: limits.5.xml:73(para)
 msgid "or in the form:"
 msgstr "ou sous la forme :"
 
-#: limits.5.xml:70(emphasis)
+#: limits.5.xml:76(emphasis)
 msgid "@group LIMITS_STRING"
 msgstr "@groupe LISTE_DE_LIMITES"
 
-#: limits.5.xml:73(para)
+#: limits.5.xml:79(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 "
@@ -7016,57 +7210,29 @@
 "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:79(para)
+#: limits.5.xml:85(para)
 msgid "The valid identifiers are:"
 msgstr "Les identifiants possibles sont :"
 
-#: limits.5.xml:82(para)
+#: limits.5.xml:88(para)
 msgid "A: max address space (KB)"
 msgstr "A : espace d'adressage maximal (en kilo octets)"
 
-#: limits.5.xml:83(para)
+#: limits.5.xml:89(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:84(para)
+#: limits.5.xml:90(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:85(para)
+#: limits.5.xml:91(para)
 msgid "F: maximum filesize (KB)"
 msgstr "F : taille maximale des fichiers (en kilo octets)"
 
-#: limits.5.xml:86(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:87(para)
-msgid "N: max number of open files"
-msgstr "N : nombre maximal de fichiers ouverts"
-
-#: limits.5.xml:88(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:89(para)
-msgid "S: max stack size (KB)"
-msgstr "S : taille maximale de la pile (en kilo octets)"
-
-#: limits.5.xml:90(para)
-msgid "T: max CPU time (MIN)"
-msgstr "T : temps processeur maximal consommé (en minutes)"
-
-#: limits.5.xml:91(para)
-msgid "U: max number of processes"
-msgstr "U : nombre maximal de processus"
-
 #: limits.5.xml:92(para)
 msgid ""
 "K: file creation mask, set by <citerefentry><refentrytitle>umask</"
@@ -7077,10 +7243,28 @@
 "citerefentry>."
 
 #: limits.5.xml:97(para)
+msgid "I: max nice value (0..39 which translates to 20..-19)"
+msgstr "I : valeur nice maximum (0..39 qui sera traduit en 20..-19)"
+
+#: limits.5.xml:99(para)
 msgid "L: max number of logins for this user"
 msgstr "L : nombre maximal de connexions simultanées pour cet utilisateur"
 
-#: limits.5.xml:98(para)
+#: limits.5.xml:100(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:101(para)
+msgid "N: max number of open files"
+msgstr "N : nombre maximal de fichiers ouverts"
+
+#: limits.5.xml:102(para)
+msgid "O: max real time priority"
+msgstr "O : priorité temps réel maximale"
+
+#: limits.5.xml:103(para)
 msgid ""
 "P: process priority, set by <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
@@ -7089,15 +7273,25 @@
 "<citerefentry><refentrytitle>setpriority</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
-#: limits.5.xml:103(para)
-msgid "I: max nice value (0..39 which translates to 20..-19)"
-msgstr "I : valeur nice maximum (0..39 qui sera traduit en 20..-19)"
+#: limits.5.xml:108(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:105(para)
-msgid "O: max real time priority"
-msgstr "O : priorité temps réel maximale"
+#: limits.5.xml:109(para)
+msgid "S: max stack size (KB)"
+msgstr "S : taille maximale de la pile (en kilo octets)"
 
-#: limits.5.xml:108(para)
+#: limits.5.xml:110(para)
+msgid "T: max CPU time (MIN)"
+msgstr "T : temps processeur maximal consommé (en minutes)"
+
+#: limits.5.xml:111(para)
+msgid "U: max number of processes"
+msgstr "U : nombre maximal de processus"
+
+#: limits.5.xml:114(para)
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
 "<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
@@ -7108,7 +7302,7 @@
 "les entrées suivantes sont équivalentes :"
 
 # NOTE: elle va pas cette chaîne
-#: limits.5.xml:114(programlisting)
+#: limits.5.xml:120(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -7121,7 +7315,7 @@
 "      utilisateur L2 D2048 N5\n"
 "    "
 
-#: limits.5.xml:119(para)
+#: limits.5.xml:125(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 "
@@ -7133,7 +7327,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:126(para)
+#: limits.5.xml:132(para)
 msgid ""
 "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
 "have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
@@ -7144,7 +7338,7 @@
 "« <emphasis>*</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:133(para)
+#: limits.5.xml:139(para)
 msgid ""
 "The limits specified in the form \"<replaceable>@group</replaceable>\" apply "
 "to the members of the specified <replaceable>group</replaceable>."
@@ -7152,27 +7346,37 @@
 "Les limites précisées sous la forme « <replaceable>@groupe</replaceable> » "
 "s'appliquent aux membres du <replaceable>groupe</replaceable> précisé."
 
-#: limits.5.xml:139(para)
+#: limits.5.xml:145(para)
+#, fuzzy
+#| msgid ""
+#| "If a line with limits for an user exist, only the first line for this "
+#| "user will be considered."
 msgid ""
-"If a line with limits for an user exist, only the first line for this user "
-"will be considered."
+"If more than one line with limits for an user exist, only the first line for "
+"this user will be considered."
 msgstr ""
 "Si une ligne avec des limites pour un utilisateur existe, seul la première "
 "ligne pour cet utilisateur sera prise en compte."
 
-#: limits.5.xml:144(para)
+#: limits.5.xml:150(para)
+#, fuzzy
+#| msgid ""
+#| "If no lines are specified for an user, the last <replaceable>@group</"
+#| "replaceable> line matching a group whose the user is a member of will be "
+#| "conisdered, or the last line with default limits if no groups contain the "
+#| "user)."
 msgid ""
 "If no lines are specified for an user, the last <replaceable>@group</"
 "replaceable> line matching a group whose the user is a member of will be "
-"conisdered, or the last line with default limits if no groups contain the "
-"user)."
+"considered, or the last line with default limits if no groups contain the "
+"user."
 msgstr ""
 "Si aucune ligne n'est précisée pour l'utilisateur, la dernière ligne "
 "<replaceable>@groupe</replaceable> correspondant à un groupe auquel "
 "l'utilisateur appartient sera prise en compte, ou la dernière ligne avec les "
 "limites par défaut si aucun groupe ne contient l'utilisateur."
 
-#: limits.5.xml:151(para)
+#: limits.5.xml:157(para)
 msgid ""
 "To completely disable limits for a user, a single dash \"<emphasis>-</"
 "emphasis>\" will do."
@@ -7180,7 +7384,7 @@
 "Un simple tiret « <emphasis>-</emphasis> » sera suffisant pour désactiver "
 "toute limite à un utilisateur, "
 
-#: limits.5.xml:156(para)
+#: limits.5.xml:162(para)
 msgid ""
 "To disable a limit for a user, a single dash \"<replaceable>-</replaceable>"
 "\" can be used instead of the numerical value for this limit."
@@ -7189,7 +7393,7 @@
 "« <replaceable>-</replaceable> » peut être utilisé au lieu d'une valeur "
 "numérique pour cette limite."
 
-#: limits.5.xml:162(para)
+#: limits.5.xml:168(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 "
@@ -7199,11 +7403,11 @@
 "n'y 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:173(filename)
+#: limits.5.xml:179(filename)
 msgid "/etc/limits"
 msgstr "/etc/limits"
 
-#: limits.5.xml:181(para)
+#: limits.5.xml:187(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>setpriority</"
@@ -7217,18 +7421,18 @@
 "<citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
-#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname)
-#: lastlog.8.xml:46(command)
+#: lastlog.8.xml:39(refentrytitle) lastlog.8.xml:46(refname)
+#: lastlog.8.xml:52(command)
 msgid "lastlog"
 msgstr "lastlog"
 
-#: lastlog.8.xml:41(refpurpose)
+#: lastlog.8.xml:47(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:55(para)
+#: lastlog.8.xml:61(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</"
@@ -7243,32 +7447,32 @@
 "option de spécifiée), les entrées de lastlog sont affichées triées par ordre "
 "d'apparition dans <filename>/etc/passwd</filename>."
 
-#: lastlog.8.xml:67(para)
+#: lastlog.8.xml:73(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:72(term)
+#: lastlog.8.xml:78(term)
 msgid ""
 "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-b</option>, <option>--before</option> <replaceable>JOURS</"
 "replaceable>"
 
-#: lastlog.8.xml:76(para)
+#: lastlog.8.xml:82(para)
 msgid ""
 "Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
 msgstr ""
 "N'afficher que les entrées du fichier lastlog plus anciennes que <emphasis "
 "remap=\"I\">JOURS</emphasis>."
 
-#: lastlog.8.xml:90(term) faillog.8.xml:157(term)
+#: lastlog.8.xml:109(term) faillog.8.xml:176(term)
 msgid ""
 "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-t</option>, <option>--time</option> <replaceable>JOURS</replaceable>"
 
-#: lastlog.8.xml:95(para)
+#: lastlog.8.xml:114(para)
 msgid ""
 "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
 "emphasis>."
@@ -7276,7 +7480,7 @@
 "Afficher les entrées du fichier lastlog plus récentes que <emphasis remap=\"I"
 "\">JOURS</emphasis>."
 
-#: lastlog.8.xml:102(term) faillog.8.xml:168(term)
+#: lastlog.8.xml:121(term) faillog.8.xml:187(term)
 msgid ""
 "<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>|"
 "<replaceable>RANGE</replaceable>"
@@ -7284,11 +7488,11 @@
 "<option>-u</option>, <option>--user</option> <replaceable>LOGIN</"
 "replaceable>|<replaceable>INTERVALLE</replaceable>"
 
-#: lastlog.8.xml:107(para)
+#: lastlog.8.xml:126(para)
 msgid "Print the lastlog record of the specified user(s)."
 msgstr "N'afficher que les entrées correspondant aux utilisateurs indiqués."
 
-#: lastlog.8.xml:110(para) faillog.8.xml:178(para)
+#: lastlog.8.xml:129(para) faillog.8.xml:197(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</"
@@ -7304,7 +7508,7 @@
 "(<replaceable>-UID_MAX</replaceable>) ou une valeur minimale "
 "(<replaceable>UID_MIN-</replaceable>)."
 
-#: lastlog.8.xml:122(para)
+#: lastlog.8.xml:141(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."
@@ -7314,7 +7518,7 @@
 "connecté**</emphasis> ») est affiché à la place des champs <emphasis>Port</"
 "emphasis> et date de <emphasis>Dernière</emphasis> connexion."
 
-#: lastlog.8.xml:127(para)
+#: lastlog.8.xml:146(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."
@@ -7323,12 +7527,12 @@
 "affichées. D'autres entrées peuvent exister pour les utilisateurs supprimés "
 "précédemment."
 
-#: lastlog.8.xml:135(title) groups.1.xml:65(title) chsh.1.xml:106(title)
-#: chage.1.xml:197(title)
+#: lastlog.8.xml:154(title) groups.1.xml:71(title) chsh.1.xml:122(title)
+#: chage.1.xml:213(title)
 msgid "NOTE"
 msgstr "NOTE"
 
-#: lastlog.8.xml:136(para)
+#: lastlog.8.xml:155(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, "
@@ -7346,16 +7550,16 @@
 "UID élevés). Vous pouvez afficher sa taille réelle avec « <command>ls -s</"
 "command> »."
 
-#: lastlog.8.xml:150(filename)
+#: lastlog.8.xml:169(filename)
 msgid "/var/log/lastlog"
 msgstr "/var/log/lastlog"
 
-#: lastlog.8.xml:152(para)
+#: lastlog.8.xml:171(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:160(para)
+#: lastlog.8.xml:179(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 "
@@ -7368,15 +7572,15 @@
 "et 800 dans 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:33(refentrytitle) gshadow.5.xml:38(refname)
+#: gshadow.5.xml:37(refentrytitle) gshadow.5.xml:44(refname)
 msgid "gshadow"
 msgstr "gshadow"
 
-#: gshadow.5.xml:39(refpurpose)
+#: gshadow.5.xml:45(refpurpose)
 msgid "shadowed group file"
 msgstr "informations cachées sur les groupes"
 
-#: gshadow.5.xml:44(para)
+#: gshadow.5.xml:50(para)
 msgid ""
 "<filename>/etc/gshadow</filename> contains the shadowed information for "
 "group accounts."
@@ -7384,21 +7588,21 @@
 "<filename>/etc/gshadow</filename> contient les informations cachées sur les "
 "groupes."
 
-#: gshadow.5.xml:54(para)
+#: gshadow.5.xml:60(para)
 msgid "Each line of this file contains the following colon-separated fields:"
 msgstr ""
 "Chaque ligne de ce fichier contient les champs suivants, séparés par des "
 "deux-points (« : ») :"
 
-#: gshadow.5.xml:60(emphasis)
+#: gshadow.5.xml:66(emphasis)
 msgid "group name"
 msgstr "nom du groupe"
 
-#: gshadow.5.xml:62(para)
+#: gshadow.5.xml:68(para)
 msgid "It must be a valid group name, which exist on the system."
 msgstr "Ce doit être un nom de groupe valable, qui existe sur le système."
 
-#: gshadow.5.xml:75(para)
+#: gshadow.5.xml:81(para)
 msgid ""
 "If the password field contains some string that is not a valid result of "
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
@@ -7412,7 +7616,7 @@
 "utiliser le mot de passe UNIX pour accéder au groupe (mais les membres du "
 "groupe n'ont pas besoin de mot de passe)."
 
-#: gshadow.5.xml:82(para)
+#: gshadow.5.xml:88(para)
 msgid ""
 "The password is used when an user who is not a member of the group wants to "
 "gain the permissions of this group (see <citerefentry><refentrytitle>newgrp</"
@@ -7423,7 +7627,7 @@
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>)."
 
-#: gshadow.5.xml:88(para)
+#: gshadow.5.xml:94(para)
 msgid ""
 "This field may be empty, in which case only the group members can gain the "
 "group permissions."
@@ -7431,7 +7635,7 @@
 "Ce champ peut être vide. Dans ce cas seul les membres du groupe peuvent "
 "obtenir les permissions du groupe."
 
-#: gshadow.5.xml:98(para)
+#: gshadow.5.xml:104(para)
 msgid ""
 "This password supersedes any password specified in <filename>/etc/group</"
 "filename>."
@@ -7439,45 +7643,45 @@
 "Ce mot de passe remplace tout mot de passe indiqué dans <filename>/etc/"
 "group</filename>."
 
-#: gshadow.5.xml:106(emphasis)
+#: gshadow.5.xml:112(emphasis)
 msgid "administrators"
 msgstr "administrateurs"
 
-#: gshadow.5.xml:108(para) gshadow.5.xml:124(para)
+#: gshadow.5.xml:114(para) gshadow.5.xml:130(para)
 msgid "It must be a comma-separated list of user names."
 msgstr "Ce champ doit être une liste d'utilisateurs, séparés par des virgules."
 
-#: gshadow.5.xml:111(para)
+#: gshadow.5.xml:117(para)
 msgid "Administrators can change the password or the members of the group."
 msgstr ""
 "Les administrateurs peuvent modifier le mot de passe ou les membres du "
 "groupe."
 
-#: gshadow.5.xml:115(para)
+#: gshadow.5.xml:121(para)
 msgid ""
 "Administrators also have the same permissions as the members (see below)."
 msgstr ""
 "Les administrateurs peuvent aussi avoir les mêmes permissions que les "
 "membres (voir ci-dessous)."
 
-#: gshadow.5.xml:122(emphasis)
+#: gshadow.5.xml:128(emphasis)
 msgid "members"
 msgstr "membres"
 
-#: gshadow.5.xml:127(para)
+#: gshadow.5.xml:133(para)
 msgid "Members can access the group without being prompted for a password."
 msgstr ""
 "Les membres peuvent accéder au groupe sans qu'un mot de passe ne leur soit "
 "demandé."
 
-#: gshadow.5.xml:131(para)
+#: gshadow.5.xml:137(para)
 msgid ""
 "You should use the same list of users as in <filename>/etc/group</filename>."
 msgstr ""
 "Vous devez utiliser la même liste d'utilisateurs que dans <filename>/etc/"
 "group</filename>."
 
-#: gshadow.5.xml:160(para)
+#: gshadow.5.xml:166(para)
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
@@ -7497,11 +7701,11 @@
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: grpck.8.xml:44(refpurpose)
+#: grpck.8.xml:47(refpurpose)
 msgid "verify integrity of group files"
 msgstr "Vérifier l'intégrité des fichiers d'administration des groupes"
 
-#: grpck.8.xml:70(para)
+#: grpck.8.xml:65(para)
 msgid ""
 "The <command>grpck</command> command verifies the integrity of the groups "
 "information. It checks that all entries in <filename>/etc/group</"
@@ -7511,18 +7715,18 @@
 "other uncorrectable errors."
 msgstr ""
 "La commande <command>grpck</command> vérifie l'intégrité des informations "
-"sur les groupes du système. Toutes les entrées de <filename>/etc/"
-"group</filename> <phrase condition=\"gshadow\"> et <filename>/etc/gshadow</"
+"sur les groupes du système. Toutes les entrées de <filename>/etc/group</"
+"filename> <phrase condition=\"gshadow\"> et <filename>/etc/gshadow</"
 "filename></phrase> sont vérifiées afin de s'assurer qu'elles ont le bon "
 "format et qu'elles contiennent des données valables dans chaque champ. Une "
 "confirmation de l'utilisateur sera demandée pour détruire les entrées mal "
 "formatées ou ayant d'autres erreurs non récupérables."
 
-#: grpck.8.xml:87(para)
+#: grpck.8.xml:82(para)
 msgid "a unique and valid group name"
 msgstr "unicité et validité des noms de groupe ;"
 
-#: grpck.8.xml:90(para)
+#: grpck.8.xml:85(para)
 msgid ""
 "a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/"
 "group</filename> only)</phrase>"
@@ -7530,7 +7734,7 @@
 "validité des identifiants de groupe <phrase condition=\"gshadow\"> "
 "(seulement <filename>/etc/group</filename>)</phrase> ;"
 
-#: grpck.8.xml:97(para)
+#: grpck.8.xml:92(para)
 msgid ""
 "a valid list of members <phrase condition=\"gshadow\"> and administrators</"
 "phrase>"
@@ -7538,7 +7742,7 @@
 "validité de la liste de membres <phrase condition=\"gshadow\"> et "
 "d'administrateurs</phrase> ;"
 
-#: grpck.8.xml:103(para)
+#: grpck.8.xml:98(para)
 msgid ""
 "a corresponding entry in the <filename>/etc/gshadow</filename> file "
 "(respectively <filename>/etc/group</filename> for the <filename>gshadow</"
@@ -7548,7 +7752,7 @@
 "(respectivement <filename>/etc/group</filename> pour les vérifications de "
 "<filename>gshadow</filename>)."
 
-#: grpck.8.xml:111(para)
+#: grpck.8.xml:106(para)
 msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
 "an entry has the wrong number of fields, the user will be prompted to delete "
@@ -7567,7 +7771,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:122(para)
+#: grpck.8.xml:117(para)
 msgid ""
 "The commands which operate on the <filename>/etc/group</filename><phrase "
 "condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
@@ -7582,12 +7786,12 @@
 "redondantes. <command>grpck</command> doit être utilisée dans ce cas pour "
 "supprimer ces entrées."
 
-#: grpck.8.xml:134(para)
+#: grpck.8.xml:133(para)
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>grpck</command> sont :"
 
-#: grpck.8.xml:141(para)
+#: grpck.8.xml:146(para)
 msgid ""
 "Execute the <command>grpck</command> command in read-only mode. This causes "
 "all questions regarding changes to be answered <emphasis>no</emphasis> "
@@ -7597,7 +7801,7 @@
 "signifie qu'à toutes les questions concernant des modifications il sera "
 "répondu <emphasis>no</emphasis> sans l'intervention de l'utilisateur."
 
-#: grpck.8.xml:151(para)
+#: grpck.8.xml:169(para)
 msgid ""
 "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
 "\">and <filename>/etc/gshadow</filename></phrase> by GID."
@@ -7605,7 +7809,7 @@
 "Trie les entrées de <filename>/etc/group</filename> <phrase condition="
 "\"gshadow\">et <filename>/etc/gshadow</filename></phrase> par GID."
 
-#: grpck.8.xml:160(para)
+#: grpck.8.xml:178(para)
 msgid ""
 "By default, <command>grpck</command> operates on <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</"
@@ -7622,23 +7826,23 @@
 "<phrase condition=\"gshadow\"> et <emphasis remap=\"I\">shadow</emphasis></"
 "phrase>."
 
-#: grpck.8.xml:228(para)
+#: grpck.8.xml:246(para)
 msgid "one or more bad group entries"
 msgstr "une entrée de groupe ou plus est incorrecte"
 
-#: grpck.8.xml:234(para)
+#: grpck.8.xml:252(para)
 msgid "can't open group files"
 msgstr "impossible d'ouvrir les fichiers group"
 
-#: grpck.8.xml:240(para)
+#: grpck.8.xml:258(para)
 msgid "can't lock group files"
 msgstr "impossible de verrouiller les fichiers group"
 
-#: grpck.8.xml:246(para)
+#: grpck.8.xml:264(para)
 msgid "can't update group files"
 msgstr "impossible de mettre à jour les fichiers group"
 
-#: grpck.8.xml:210(para)
+#: grpck.8.xml:228(para)
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -7646,7 +7850,7 @@
 "La commande <command>grpck</command> renvoie les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: grpck.8.xml:255(para)
+#: grpck.8.xml:273(para)
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>groupmod</"
@@ -7670,20 +7874,20 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
-#: groups.1.xml:45(command)
+#: groups.1.xml:38(refentrytitle) groups.1.xml:45(refname)
+#: groups.1.xml:51(command)
 msgid "groups"
 msgstr "groups"
 
-#: groups.1.xml:40(refpurpose)
+#: groups.1.xml:46(refpurpose)
 msgid "display current group names"
 msgstr "Afficher la liste des groupes auxquels appartient l'utilisateur"
 
-#: groups.1.xml:47(replaceable) chfn.1.xml:58(replaceable)
+#: groups.1.xml:53(replaceable)
 msgid "user"
 msgstr "utilisateur"
 
-#: groups.1.xml:54(para)
+#: groups.1.xml:60(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/"
@@ -7698,11 +7902,17 @@
 "<emphasis remap=\"I\">utilisateur</emphasis> permet d'afficher la liste des "
 "groupes pour cet utilisateur."
 
-#: groups.1.xml:66(para)
+#: groups.1.xml:72(para)
+#, fuzzy
+#| msgid ""
+#| "Systems which do not support concurrent group sets will have the "
+#| "information from <filename>/etc/group</filename> reported. The user must "
+#| "use <command>newgrp</command> or <command>sg</command> to change their "
+#| "current real and effective group ID."
 msgid ""
 "Systems which do not support concurrent group sets will have the information "
 "from <filename>/etc/group</filename> reported. The user must use "
-"<command>newgrp</command> or <command>sg</command> to change their current "
+"<command>newgrp</command> or <command>sg</command> to change his current "
 "real and effective group ID."
 msgstr ""
 "Sur les systèmes qui ne gèrent pas l'appartenance à plusieurs groupes, "
@@ -7710,7 +7920,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:88(para)
+#: groups.1.xml:94(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getgid</"
@@ -7726,15 +7936,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getuid</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
-#: groupmod.8.xml:44(refpurpose)
+#: groupmod.8.xml:47(refpurpose)
 msgid "modify a group definition on the system"
 msgstr "Modifier la définition d'un groupe du système"
 
-#: groupmod.8.xml:53(replaceable)
+#: groupmod.8.xml:56(replaceable) groupdel.8.xml:56(replaceable)
 msgid "GROUP"
 msgstr "GROUPE"
 
-#: groupmod.8.xml:59(para)
+#: groupmod.8.xml:62(para)
 msgid ""
 "The <command>groupmod</command> command modifies the definition of the "
 "specified <replaceable>GROUP</replaceable> by modifying the appropriate "
@@ -7744,18 +7954,18 @@
 "<replaceable>GROUPE</replaceable> spécifié en modifiant l'entrée "
 "correspondante de la base de données des groupes."
 
-#: groupmod.8.xml:68(para)
+#: groupmod.8.xml:71(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:74(term) groupadd.8.xml:93(term)
+#: groupmod.8.xml:77(term) groupadd.8.xml:95(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option> <replaceable>GID</replaceable>"
 
-#: groupmod.8.xml:78(para)
+#: groupmod.8.xml:81(para)
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
 "to <replaceable>GID</replaceable>."
@@ -7763,7 +7973,7 @@
 "L'identifiant numérique du groupe <replaceable>GROUPE</replaceable> sera "
 "modifié vers <emphasis remap=\"I\">GID</emphasis>."
 
-#: groupmod.8.xml:82(para)
+#: groupmod.8.xml:85(para)
 msgid ""
 "The value of <replaceable>GID</replaceable> must be a non-negative decimal "
 "integer. This value must be unique, unless the <option>-o</option> option is "
@@ -7774,8 +7984,14 @@
 "option> ne soit utilisée. Des valeurs entre 0 et 999 sont généralement "
 "réservées pour les groupes système."
 
-#: groupmod.8.xml:89(para)
+#: groupmod.8.xml:92(para)
 msgid ""
+"Users who use the group as primary group will be updated to keep the group "
+"as their primary group."
+msgstr ""
+
+#: groupmod.8.xml:96(para)
+msgid ""
 "Any files that have the old group ID and must continue to belong to "
 "<replaceable>GROUP</replaceable>, must have their group ID changed manually."
 msgstr ""
@@ -7783,7 +7999,7 @@
 "l'ancien identifiant de groupe qui doivent continuer à appartenir au "
 "<replaceable>GROUPE</replaceable>."
 
-#: groupmod.8.xml:104(term)
+#: groupmod.8.xml:111(term)
 msgid ""
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
@@ -7791,7 +8007,7 @@
 "<option>-n</option>, <option>--new-name</option> "
 "<replaceable>NOUVEAU_NOM_GROUPE</replaceable>"
 
-#: groupmod.8.xml:109(para)
+#: groupmod.8.xml:116(para)
 msgid ""
 "The name of the group will be changed from <replaceable>GROUP</replaceable> "
 "to <replaceable>NEW_GROUP</replaceable> name."
@@ -7799,7 +8015,7 @@
 "Le nom du groupe sera modifié de <emphasis remap=\"I\">GROUPE</emphasis> "
 "vers <emphasis remap=\"I\">NOUVEAU_NOM_GROUPE</emphasis>."
 
-#: groupmod.8.xml:120(para)
+#: groupmod.8.xml:127(para)
 msgid ""
 "When used with the <option>-g</option> option, allow to change the group "
 "<replaceable>GID</replaceable> to a non-unique value."
@@ -7808,11 +8024,11 @@
 "changer l'identifiant du groupe (<replaceable>GID</replaceable>) vers une "
 "valeur déjà utilisée."
 
-#: groupmod.8.xml:219(para)
+#: groupmod.8.xml:245(para)
 msgid "group name already in use"
 msgstr "nom de groupe déjà utilisé"
 
-#: groupmod.8.xml:183(para)
+#: groupmod.8.xml:209(para)
 msgid ""
 "The <command>groupmod</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -7820,7 +8036,7 @@
 "La commande <command>groupmod</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: groupmod.8.xml:234(para)
+#: groupmod.8.xml:260(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7852,35 +8068,35 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: groupmems.8.xml:44(refpurpose)
+#: groupmems.8.xml:47(refpurpose)
 msgid "administer members of a user's primary group"
 msgstr "Administrer les membres du groupe primaire d'un utilisateur"
 
-#: groupmems.8.xml:51(replaceable) groupmems.8.xml:52(replaceable)
+#: groupmems.8.xml:54(replaceable) groupmems.8.xml:55(replaceable)
 msgid "user_name"
 msgstr "nom_utilisateur"
 
-#: groupmems.8.xml:51(arg)
+#: groupmems.8.xml:54(arg)
 msgid "-a <placeholder-1/>"
 msgstr "-a <placeholder-1/>"
 
-#: groupmems.8.xml:52(arg)
+#: groupmems.8.xml:55(arg)
 msgid "-d <placeholder-1/>"
 msgstr "-d <placeholder-1/>"
 
-#: groupmems.8.xml:53(replaceable)
+#: groupmems.8.xml:56(replaceable)
 msgid "group_name"
 msgstr "nom_groupe"
 
-#: groupmems.8.xml:53(arg)
+#: groupmems.8.xml:56(arg)
 msgid "-g <placeholder-1/>"
 msgstr "-g <placeholder-1/>"
 
-#: groupmems.8.xml:54(arg)
+#: groupmems.8.xml:57(arg)
 msgid "-l"
 msgstr "-l"
 
-#: groupmems.8.xml:61(para)
+#: groupmems.8.xml:64(para)
 msgid ""
 "The <command>groupmems</command> command allows a user to administer his/her "
 "own group membership list without the requirement of superuser privileges. "
@@ -7894,7 +8110,7 @@
 "sorte qu'ils soient responsables de leur groupe primaire (par exemple guest/"
 "guest)."
 
-#: groupmems.8.xml:69(para)
+#: groupmems.8.xml:72(para)
 msgid ""
 "Only the superuser, as administrator, can use <command>groupmems</command> "
 "to alter the memberships of other groups."
@@ -7903,13 +8119,13 @@
 "<command>groupmems</command> pour modifier la liste des membres d'un autre "
 "groupe."
 
-#: groupmems.8.xml:76(para)
+#: groupmems.8.xml:79(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:82(term)
+#: groupmems.8.xml:85(term)
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user_name</"
 "replaceable>"
@@ -7917,12 +8133,12 @@
 "<option>-a</option>, <option>--add</option> <replaceable>nom_utilisateur</"
 "replaceable>"
 
-#: groupmems.8.xml:84(para)
+#: groupmems.8.xml:87(para)
 msgid "Add an user to the group membership list."
 msgstr "Ajouter un utilisateur à la liste des membres du groupe."
 
-#: groupmems.8.xml:85(para) groupmems.8.xml:101(para)
-#: groupmems.8.xml:132(para)
+#: groupmems.8.xml:88(para) groupmems.8.xml:104(para)
+#: groupmems.8.xml:135(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 "
@@ -7931,7 +8147,7 @@
 "Si le fichier <filename>/etc/gshadow</filename> existe, et que le groupe n'y "
 "a pas d'entrée, une nouvelle entrée sera créée."
 
-#: groupmems.8.xml:93(term)
+#: groupmems.8.xml:96(term)
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user_name</"
 "replaceable>"
@@ -7939,11 +8155,11 @@
 "<option>-d</option>, <option>--delete</option> <replaceable>nom_utilisateur</"
 "replaceable>"
 
-#: groupmems.8.xml:95(para)
+#: groupmems.8.xml:98(para)
 msgid "Delete a user from the group membership list."
 msgstr "Supprimer un utilisateur de la liste des membres du groupe."
 
-#: groupmems.8.xml:96(para)
+#: groupmems.8.xml:99(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."
@@ -7951,7 +8167,7 @@
 "Si le fichier <filename>/etc/gshadow</filename> existe, l'utilisateur sera "
 "retiré de la liste des membres et des administrateurs du groupe."
 
-#: groupmems.8.xml:109(term)
+#: groupmems.8.xml:112(term)
 msgid ""
 "<option>-g</option>, <option>--group</option><replaceable>group_name</"
 "replaceable>"
@@ -7959,32 +8175,32 @@
 "<option>-g</option>, <option>--group</option> <replaceable>nom_groupe</"
 "replaceable>"
 
-#: groupmems.8.xml:111(para)
+#: groupmems.8.xml:114(para)
 msgid "The superuser can specify which group membership list to modify."
 msgstr ""
 "Le superutilisateur peut préciser la liste des membres du groupe à modifier."
 
-#: groupmems.8.xml:123(term) chage.1.xml:132(term)
+#: groupmems.8.xml:126(term) chage.1.xml:135(term)
 msgid "<option>-l</option>, <option>--list</option>"
 msgstr "<option>-l</option>, <option>--list</option>"
 
-#: groupmems.8.xml:125(para)
+#: groupmems.8.xml:128(para)
 msgid "List the group membership list."
 msgstr "Afficher la liste des membres du groupe."
 
-#: groupmems.8.xml:129(term)
+#: groupmems.8.xml:132(term)
 msgid "<option>-p</option>, <option>--purge</option>"
 msgstr "<option>-p</option>, <option>--purge</option>"
 
-#: groupmems.8.xml:131(para)
+#: groupmems.8.xml:134(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:143(title)
+#: groupmems.8.xml:159(title)
 msgid "SETUP"
 msgstr "CONFIGURATION"
 
-#: groupmems.8.xml:144(para)
+#: groupmems.8.xml:160(para)
 msgid ""
 "The <command>groupmems</command> executable should be in mode <literal>2770</"
 "literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</"
@@ -7999,7 +8215,7 @@
 "permettre ou leur interdire d'utiliser <command>groupmems</command> pour "
 "gérer leur propre liste de membres du groupe."
 
-#: groupmems.8.xml:153(programlisting)
+#: groupmems.8.xml:169(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -8016,11 +8232,11 @@
 "\t$ groupmems -g groups -a gk4\n"
 "    "
 
-#: groupmems.8.xml:185(para)
+#: groupmems.8.xml:201(para)
 msgid "secure group account information"
 msgstr "informations cachées sur les groupes"
 
-#: groupmems.8.xml:193(para)
+#: groupmems.8.xml:209(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -8048,22 +8264,35 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: groupdel.8.xml:44(refpurpose)
+#: groupdel.8.xml:47(refpurpose)
 msgid "delete a group"
 msgstr "Supprimer un groupe"
 
-#: groupdel.8.xml:58(para)
+#: groupdel.8.xml:62(para)
+#, fuzzy
+#| 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."
 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."
+"deleting all entries that refer to <replaceable>GROUP</replaceable>. The "
+"named group must exist."
 msgstr ""
 "La commande <command>groupdel</command> modifie les fichiers "
 "d'administration des comptes du système, en supprimant les entrées qui se "
 "réfèrent à <emphasis remap=\"I\">groupe</emphasis>. Le groupe indiqué doit "
 "exister."
 
-#: groupdel.8.xml:66(para)
+#: groupdel.8.xml:70(para)
+#, fuzzy
+#| msgid ""
+#| "The options which apply to the <command>groupmod</command> command are:"
+msgid "The options which apply to the <command>groupdel</command> command are:"
+msgstr ""
+"Les options disponibles pour la commande <command>groupmod</command> sont :"
+
+#: groupdel.8.xml:99(para)
 msgid ""
 "You may not remove the primary group of any existing user. You must remove "
 "the user before you remove the group."
@@ -8071,7 +8300,7 @@
 "Vous ne pouvez pas supprimer le groupe primaire d'un utilisateur existant. "
 "Vous devez supprimer l'utilisateur auparavant."
 
-#: groupdel.8.xml:70(para)
+#: groupdel.8.xml:103(para)
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this group."
@@ -8079,11 +8308,11 @@
 "Vous devriez 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:132(para)
+#: groupdel.8.xml:165(para)
 msgid "can't remove user's primary group"
 msgstr "impossible de supprimer le groupe primaire d'un utilisateur existant"
 
-#: groupdel.8.xml:108(para)
+#: groupdel.8.xml:141(para)
 msgid ""
 "The <command>groupdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -8091,7 +8320,23 @@
 "La commande <command>groupdel</command> renvoie les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: groupdel.8.xml:147(para)
+#: groupdel.8.xml:180(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>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -8106,7 +8351,7 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -8123,11 +8368,11 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>"
 
-#: groupadd.8.xml:47(refpurpose)
+#: groupadd.8.xml:49(refpurpose)
 msgid "create a new group"
 msgstr "Créer un nouveau groupe"
 
-#: groupadd.8.xml:64(para)
+#: groupadd.8.xml:66(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 "
@@ -8138,12 +8383,12 @@
 "défaut du système. Le nouveau groupe sera inséré dans les fichiers du "
 "système selon les besoins."
 
-#: groupadd.8.xml:73(para)
+#: groupadd.8.xml:75(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:83(para)
+#: groupadd.8.xml:85(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 "
@@ -8155,7 +8400,7 @@
 "l'identifiant de groupe indiqué existe déjà, un autre identifiant de groupe "
 "(non utilisé) sera choisi (c.-à-d. que <option>-g</option> est désactivée)."
 
-#: groupadd.8.xml:97(para)
+#: groupadd.8.xml:99(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 "
@@ -8171,7 +8416,7 @@
 "réservées aux comptes système."
 
 # NOTE: missing <filename>
-#: groupadd.8.xml:117(para)
+#: groupadd.8.xml:119(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (GID_MIN, GID_MAX "
 "and others). Multiple <option>-K</option> options can be specified."
@@ -8180,7 +8425,7 @@
 "filename> (GID_MIN, GID_MAX et autres). L'option <option>-K</option> peut "
 "être indiquée plusieurs fois."
 
-#: groupadd.8.xml:122(para)
+#: groupadd.8.xml:124(para)
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option>-K </"
@@ -8190,7 +8435,7 @@
 "replaceable>=<replaceable>10</replaceable> <option>-K</option> "
 "<replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: groupadd.8.xml:126(para)
+#: groupadd.8.xml:128(para)
 msgid ""
 "Note: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
@@ -8200,17 +8445,17 @@
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
 "replaceable>=<replaceable>499</replaceable> ne fonctionne pas pour l'instant."
 
-#: groupadd.8.xml:138(para)
+#: groupadd.8.xml:140(para)
 msgid "This option permits to add a group with a non-unique GID."
 msgstr ""
 "Cette option permet d'ajouter un groupe avec un identifiant (« GID ») déjà "
 "utilisé."
 
-#: groupadd.8.xml:170(para)
+#: groupadd.8.xml:172(para)
 msgid "Create a system group."
 msgstr "Créer un groupe système."
 
-#: groupadd.8.xml:173(para)
+#: groupadd.8.xml:175(para)
 msgid ""
 "The numeric identifiers of new system groups are chosen in the "
 "<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
@@ -8222,7 +8467,7 @@
 "défini dans <filename>login.defs</filename>, au lieu de <option>GID_MIN</"
 "option>-<option>GID_MAX</option>"
 
-#: groupadd.8.xml:224(para)
+#: groupadd.8.xml:239(para)
 msgid ""
 "Groupnames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
@@ -8234,11 +8479,11 @@
 "signe dollar. Soit, sous la forme d'une expression rationnelle : [a-z_][a-"
 "z0-9_-]*[$]?"
 
-#: groupadd.8.xml:230(para)
+#: groupadd.8.xml:245(para)
 msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr "Les noms de groupe sont limités à &GROUP_NAME_MAX_LENGTH; caractères."
 
-#: groupadd.8.xml:233(para)
+#: groupadd.8.xml:248(para)
 msgid ""
 "You may not add a NIS or LDAP group. This must be performed on the "
 "corresponding server."
@@ -8246,7 +8491,7 @@
 "Vous ne pouvez pas ajouter d'utilisateur à un groupe NIS ou LDAP. Cela doit "
 "être effectué sur le serveur correspondant."
 
-#: groupadd.8.xml:237(para)
+#: groupadd.8.xml:252(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."
@@ -8254,15 +8499,15 @@
 "Si le nom du groupe existe dans une base de données externe, telle que NIS "
 "ou LDAP, <command>groupadd</command> refusera de créer le groupe."
 
-#: groupadd.8.xml:270(para)
+#: groupadd.8.xml:285(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:276(para)
+#: groupadd.8.xml:291(para)
 msgid "group name not unique"
 msgstr "nom de groupe déjà utilisé"
 
-#: groupadd.8.xml:246(para)
+#: groupadd.8.xml:261(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -8270,7 +8515,7 @@
 "La commande <command>groupadd</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: groupadd.8.xml:291(para)
+#: groupadd.8.xml:306(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -8304,19 +8549,19 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:49(phrase)
+#: gpasswd.1.xml:52(phrase)
 msgid "administer <placeholder-1/>"
 msgstr "Administrer <placeholder-1/>"
 
-#: gpasswd.1.xml:52(phrase)
+#: gpasswd.1.xml:55(phrase)
 msgid "administer <placeholder-1/> and <placeholder-2/>"
 msgstr "Administrer <placeholder-1/> et <placeholder-2/>"
 
-#: gpasswd.1.xml:63(replaceable)
+#: gpasswd.1.xml:66(replaceable) expiry.1.xml:57(replaceable)
 msgid "option"
 msgstr "option"
 
-#: gpasswd.1.xml:73(para)
+#: gpasswd.1.xml:76(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -8328,7 +8573,7 @@
 "etc/gshadow</filename></phrase>. Chaque groupe peut avoir <phrase condition="
 "\"gshadow\">des administrateurs,</phrase> des membres et un mot de passe."
 
-#: gpasswd.1.xml:81(para)
+#: gpasswd.1.xml:84(para)
 msgid ""
 "System administrators can use the <option>-A</option> option to define group "
 "administrator(s) and the <option>-M</option> option to define members. They "
@@ -8339,7 +8584,7 @@
 "option> pour définir les membres. Ils ont tous les droits des "
 "administrateurs et membres du groupe."
 
-#: gpasswd.1.xml:86(para)
+#: gpasswd.1.xml:89(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -8351,7 +8596,7 @@
 "administrateur système</phrase> avec un nom de groupe demande seulement le "
 "nouveau mot de passe du <replaceable>groupe</replaceable>."
 
-#: gpasswd.1.xml:93(para)
+#: gpasswd.1.xml:96(para)
 msgid ""
 "If a password is set the members can still use "
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -8362,11 +8607,11 @@
 "citerefentry> sans mot de passe. Les non membres doivent fournir le mot de "
 "passe."
 
-#: gpasswd.1.xml:101(title)
+#: gpasswd.1.xml:104(title)
 msgid "Notes about group passwords"
 msgstr "Notes sur les mots de passe de groupe"
 
-#: gpasswd.1.xml:102(para)
+#: gpasswd.1.xml:105(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 "
@@ -8377,7 +8622,7 @@
 "Cependant, les groupes sont utiles pour permettre la coopération entre "
 "différents utilisateurs."
 
-#: gpasswd.1.xml:113(para)
+#: gpasswd.1.xml:116(para)
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
 "options cannot be combined."
@@ -8385,23 +8630,23 @@
 "À part les options <option>-A</option> et <option>-M</option>, les options "
 "ne peuvent pas être combinées."
 
-#: gpasswd.1.xml:117(para)
+#: gpasswd.1.xml:120(para)
 msgid "The options cannot be combined."
 msgstr "Les options ne peuvent pas être combinées."
 
-#: gpasswd.1.xml:120(para)
+#: gpasswd.1.xml:123(para)
 msgid "The options which apply to the <command>gpasswd</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>gpasswd</command> sont :"
 
-#: gpasswd.1.xml:125(term)
+#: gpasswd.1.xml:128(term)
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
 msgstr ""
 "<option>-a</option>, <option>--add</option> <replaceable>utilisateur</"
 "replaceable>"
 
-#: gpasswd.1.xml:129(para)
+#: gpasswd.1.xml:132(para)
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
@@ -8409,14 +8654,14 @@
 "Ajouter l'<replaceable>utilisateur</replaceable> à ce <replaceable>groupe</"
 "replaceable>."
 
-#: gpasswd.1.xml:138(term)
+#: gpasswd.1.xml:141(term)
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
 msgstr ""
 "<option>-d</option>, <option>--delete</option> <replaceable>utilisateur</"
 "replaceable>"
 
-#: gpasswd.1.xml:142(para)
+#: gpasswd.1.xml:145(para)
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
 "<replaceable>group</replaceable>."
@@ -8424,11 +8669,23 @@
 "Enlever l'<replaceable>utilisateur</replaceable> de ce <replaceable>groupe</"
 "replaceable>."
 
-#: gpasswd.1.xml:159(term)
+#: gpasswd.1.xml:162(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-Q</option>, <option>--root</option><replaceable>CHROOT_DIR</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option> <replaceable>RÉP_PERSO</"
+"replaceable>"
+
+#: gpasswd.1.xml:177(term)
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr "<option>-r</option>, <option>--remove-password</option>"
 
-#: gpasswd.1.xml:163(para)
+#: gpasswd.1.xml:181(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 "
@@ -8438,11 +8695,11 @@
 "membres du groupe seront autorisés à utiliser <command>newgrp</command> pour "
 "rejoindre ce <replaceable>groupe</replaceable>."
 
-#: gpasswd.1.xml:174(term)
+#: gpasswd.1.xml:192(term)
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-R</option>, <option>--restrict</option>"
 
-#: gpasswd.1.xml:178(para)
+#: gpasswd.1.xml:196(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 "
@@ -8452,7 +8709,7 @@
 "du groupe seront autorisés à utiliser <command>newgrp</command> pour "
 "rejoindre ce <replaceable>groupe</replaceable>."
 
-#: gpasswd.1.xml:189(term)
+#: gpasswd.1.xml:207(term)
 msgid ""
 "<option>-A</option>, <option>--administrators</option><replaceable>user</"
 "replaceable>,..."
@@ -8460,11 +8717,11 @@
 "<option>-A</option>, <option>--administrators</option> "
 "<replaceable>utilisateur</replaceable>,..."
 
-#: gpasswd.1.xml:193(para)
+#: gpasswd.1.xml:211(para)
 msgid "Set the list of administrative users."
 msgstr "Configurer la liste des administrateurs."
 
-#: gpasswd.1.xml:201(term)
+#: gpasswd.1.xml:219(term)
 msgid ""
 "<option>-M</option>, <option>--members</option><replaceable>user</"
 "replaceable>,..."
@@ -8472,11 +8729,11 @@
 "<option>-M</option>, <option>--members</option> <replaceable>utilisateur</"
 "replaceable>,..."
 
-#: gpasswd.1.xml:205(para)
+#: gpasswd.1.xml:223(para)
 msgid "Set the list of group members."
 msgstr "Configurer la liste des membres du groupe."
 
-#: gpasswd.1.xml:215(para)
+#: gpasswd.1.xml:233(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -8490,7 +8747,7 @@
 "filename></phrase>. Par conséquent vous ne pouvez modifier aucun groupe NIS "
 "ou LDAP. Cela doit être effectué sur le serveur correspondant."
 
-#: gpasswd.1.xml:260(para)
+#: gpasswd.1.xml:278(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>groupadd</"
@@ -8516,18 +8773,18 @@
 "\"gshadow\">, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry></phrase>."
 
-#: 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:86(refentrytitle)
+#: faillog.8.xml:38(refentrytitle) faillog.8.xml:45(refname)
+#: faillog.8.xml:51(command) faillog.5.xml:38(refentrytitle)
+#: faillog.5.xml:45(refname) faillog.5.xml:92(refentrytitle)
 msgid "faillog"
 msgstr "faillog"
 
-#: faillog.8.xml:40(refpurpose)
+#: faillog.8.xml:46(refpurpose)
 msgid "display faillog records or set login failure limits"
 msgstr ""
 "Examiner le fichier faillog, et configurer les limites d'échecs de connexion"
 
-#: faillog.8.xml:54(para)
+#: faillog.8.xml:60(para)
 msgid ""
 "<command>faillog</command> displays the contents of the failure log database "
 "(<filename>/var/log/faillog</filename>). It can also set the failure "
@@ -8541,12 +8798,12 @@
 "command> sans argument n'affiche que la liste des échecs des utilisateurs "
 "qui ont déjà eu un échec de connexion."
 
-#: faillog.8.xml:65(para)
+#: faillog.8.xml:71(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:73(para)
+#: faillog.8.xml:79(para)
 msgid ""
 "Display (or act on) faillog records for all users having an entry in the "
 "<filename>faillog</filename> database."
@@ -8555,14 +8812,14 @@
 "les utilisateurs ayant une entrée dans la base de données <filename>faillog</"
 "filename>."
 
-#: faillog.8.xml:77(para)
+#: faillog.8.xml:83(para)
 msgid ""
 "The range of users can be restricted with the <option>-u</option> option."
 msgstr ""
 "La liste des utilisateurs peut être limitée avec l'option <option>-u</"
 "option>."
 
-#: faillog.8.xml:81(para)
+#: faillog.8.xml:87(para)
 msgid ""
 "In display mode, this is still restricted to existing users but forces the "
 "display of the faillog entries even if they are empty."
@@ -8571,7 +8828,7 @@
 "l'affichage des entrées d'erreur de connexion est imposé même si elles sont "
 "vides."
 
-#: faillog.8.xml:86(para)
+#: faillog.8.xml:92(para)
 msgid ""
 "With the <option>-l</option>, <option>-m</option>, <option>-r</option>, "
 "<option>-t</option> options, the users' records are changed, even if the "
@@ -8585,7 +8842,7 @@
 "supprimés ou pour mettre en place une politique préventive pour un ensemble "
 "d'utilisateurs."
 
-#: faillog.8.xml:103(term)
+#: faillog.8.xml:109(term)
 msgid ""
 "<option>-l</option>, <option>--lock-secs</option><replaceable>SEC</"
 "replaceable>"
@@ -8594,14 +8851,14 @@
 "replaceable>"
 
 # NOTE: s/to/during/
-#: faillog.8.xml:108(para)
+#: faillog.8.xml:114(para)
 msgid ""
 "Lock account for <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:112(para) faillog.8.xml:138(para) faillog.8.xml:150(para)
+#: faillog.8.xml:118(para) faillog.8.xml:144(para) faillog.8.xml:156(para)
 msgid ""
 "Write access to <filename>/var/log/faillog</filename> is required for this "
 "option."
@@ -8609,14 +8866,14 @@
 "L'accès en écriture sur <filename>/var/log/faillog</filename> est nécessaire "
 "pour cette option."
 
-#: faillog.8.xml:119(term)
+#: faillog.8.xml:125(term)
 msgid ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--maximum</option> <replaceable>MAX</"
 "replaceable>"
 
-#: faillog.8.xml:124(para)
+#: faillog.8.xml:130(para)
 msgid ""
 "Set the maximum number of login failures after the account is disabled to "
 "<replaceable>MAX</replaceable>."
@@ -8624,7 +8881,7 @@
 "Configurer le nombre maximum d'échecs de connexion après lequel le compte "
 "sera désactivé à <replaceable>MAX</replaceable>."
 
-#: faillog.8.xml:128(para)
+#: faillog.8.xml:134(para)
 msgid ""
 "Selecting a <replaceable>MAX</replaceable> value of 0 has the effect of not "
 "placing a limit on the number of failed logins."
@@ -8632,7 +8889,7 @@
 "Sélectionner une valeur <replaceable>MAX</replaceable> de 0 a pour effet de "
 "ne placer aucune limite sur le nombre d'échecs de connexion."
 
-#: faillog.8.xml:133(para)
+#: faillog.8.xml:139(para)
 msgid ""
 "The maximum failure count should always be 0 for <emphasis>root</emphasis> "
 "to prevent a denial of services attack against the system."
@@ -8640,22 +8897,22 @@
 "Le compteur d'erreurs maximum doit toujours être 0 pour <emphasis>root</"
 "emphasis> afin d'éviter les attaques de type déni de service sur le système."
 
-#: faillog.8.xml:145(term)
+#: faillog.8.xml:151(term)
 msgid "<option>-r</option>, <option>--reset</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: faillog.8.xml:147(para)
+#: faillog.8.xml:153(para)
 msgid "Reset the counters of login failures."
 msgstr "Remettre à zéro le compteur d'échecs de connexion."
 
-#: faillog.8.xml:161(para)
+#: faillog.8.xml:180(para)
 msgid ""
 "Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr ""
 "Afficher les entrées de faillog plus récentes que <replaceable>JOURS</"
 "replaceable>."
 
-#: faillog.8.xml:173(para)
+#: faillog.8.xml:192(para)
 msgid ""
 "Display faillog record or maintains failure counters and limits (if used "
 "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
@@ -8665,7 +8922,7 @@
 "(suivant que l'option <option>-l</option>, <option>-m</option> ou <option>-"
 "r</option> est utilisée) seulement pour les utilisateurs indiqués."
 
-#: faillog.8.xml:191(para)
+#: faillog.8.xml:210(para)
 msgid ""
 "When none of the <option>-l</option>, <option>-m</option>, or <option>-r</"
 "option> options are used, <command>faillog</command> displays the faillog "
@@ -8675,7 +8932,7 @@
 "<option>-r</option> n'est utilisée, <command>faillog</command> affiche "
 "l'enregistrement des échecs de connexion des utilisateurs précisés."
 
-#: faillog.8.xml:200(para)
+#: faillog.8.xml:219(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 "
@@ -8690,15 +8947,15 @@
 "demander l'affichage de tous les utilisateurs avec l'option <option>-a</"
 "option>."
 
-#: faillog.8.xml:213(filename) faillog.5.xml:74(filename)
+#: faillog.8.xml:232(filename) faillog.5.xml:80(filename)
 msgid "/var/log/faillog"
 msgstr "/var/log/faillog"
 
-#: faillog.8.xml:215(para) faillog.5.xml:76(para)
+#: faillog.8.xml:234(para) faillog.5.xml:82(para)
 msgid "Failure logging file."
 msgstr "Journal des échecs de connexion."
 
-#: faillog.8.xml:223(para)
+#: faillog.8.xml:242(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
@@ -8708,11 +8965,11 @@
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: faillog.5.xml:40(refpurpose)
+#: faillog.5.xml:46(refpurpose)
 msgid "login failure logging file"
 msgstr "journal des échecs de connexion"
 
-#: faillog.5.xml:45(para)
+#: faillog.5.xml:51(para)
 msgid ""
 "<filename>/var/log/faillog</filename> maintains a count of login failures "
 "and the limits for each account."
@@ -8720,12 +8977,20 @@
 "<filename>/var/log/faillog</filename> maintient un compte des échecs de "
 "connexion et les limites pour chaque compte."
 
-#: faillog.5.xml:49(para)
+#: faillog.5.xml:55(para)
+#, fuzzy
+#| msgid ""
+#| "The file contains fixed length records, indexed by numerical UID. Each "
+#| "record contains the count of login failures since the last successful "
+#| "login; the maximum number of failures before the account is disabled; the "
+#| "line on whiche the last login failure occurred; the date of the last "
+#| "login failure; and the duration (in seconds) during which the account "
+#| "will be locked after a failure."
 msgid ""
 "The file contains fixed length records, indexed by numerical UID. Each "
 "record contains the count of login failures since the last successful login; "
 "the maximum number of failures before the account is disabled; the line on "
-"whiche the last login failure occurred; the date of the last login failure; "
+"which the last login failure occurred; the date of the last login failure; "
 "and the duration (in seconds) during which the account will be locked after "
 "a failure."
 msgstr ""
@@ -8737,11 +9002,11 @@
 "de connexion et la durée (en seconde) pendant laquelle le compte sera "
 "verrouillé après un échec."
 
-#: faillog.5.xml:59(para)
+#: faillog.5.xml:65(para)
 msgid "The structure of the file is:"
 msgstr "La structure du fichier est la suivante :"
 
-#: faillog.5.xml:60(programlisting)
+#: faillog.5.xml:66(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -8761,16 +9026,16 @@
 "\ttime_t  fail_time;     /* date du dernier échec */\n"
 "\tlong    fail_locktime;};"
 
-#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
-#: expiry.1.xml:52(command)
+#: expiry.1.xml:42(refentrytitle) expiry.1.xml:49(refname)
+#: expiry.1.xml:55(command)
 msgid "expiry"
 msgstr "expiry"
 
-#: expiry.1.xml:47(refpurpose)
+#: expiry.1.xml:50(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:60(para)
+#: expiry.1.xml:64(para)
 msgid ""
 "The <command>expiry</command> command checks (<option>-c</option>) the "
 "current password expiration and forces (<option>-f</option>) changes when "
@@ -8781,7 +9046,36 @@
 "<option>-f</option>) des modifications si nécessaire. Il peut être appelé "
 "par un utilisateur normal."
 
-#: expiry.1.xml:87(para) chage.1.xml:278(para)
+#: expiry.1.xml:73(para)
+#, fuzzy
+#| msgid "The options which apply to the <command>pwck</command> command are:"
+msgid "The options which apply to the <command>expiry</command> command are:"
+msgstr ""
+"Les options disponibles pour la commande <command>pwck</command> sont :"
+
+#: expiry.1.xml:78(term)
+#, fuzzy
+#| msgid "<option>-L</option>, <option>--lock</option>"
+msgid "<option>-c</option>, <option>--check</option>"
+msgstr "<option>-L</option>, <option>--lock</option>"
+
+#: expiry.1.xml:80(para)
+#, fuzzy
+#| msgid "check and enforce password expiration policy"
+msgid "Check the password expiration of the current user."
+msgstr "Vérifier et sécuriser la durée de validité des mots de passe"
+
+#: expiry.1.xml:86(para)
+#, fuzzy
+#| msgid ""
+#| "The maximum password age is the number of days after which the user will "
+#| "have to change her password."
+msgid "Force a password change if the current user has an expired password."
+msgstr ""
+"L'âge maximum du mot de passe est la durée (en jour) après laquelle "
+"l'utilisateur devra changer son mot de passe."
+
+#: expiry.1.xml:121(para) chage.1.xml:294(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -8791,11 +9085,11 @@
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: chsh.1.xml:46(refpurpose)
+#: chsh.1.xml:49(refpurpose)
 msgid "change login shell"
 msgstr "Changer l'interpréteur de commandes initial"
 
-#: chsh.1.xml:63(para)
+#: chsh.1.xml:66(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 "
@@ -8808,11 +9102,11 @@
 "l'interpréteur associé à son propre compte. Le superutilisateur peut changer "
 "l'interpréteur de commandes initial de n'importe quel compte."
 
-#: chsh.1.xml:74(para)
+#: chsh.1.xml:77(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:96(para)
+#: chsh.1.xml:112(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 "
@@ -8828,7 +9122,7 @@
 "actuel. L'interpréteur actuel est indiqué entre crochets (<emphasis>[ ]</"
 "emphasis>)."
 
-#: chsh.1.xml:107(para)
+#: chsh.1.xml:123(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 "
@@ -8848,15 +9142,15 @@
 "un interpréteur restreint empêchera alors l'utilisateur de revenir ensuite à "
 "l'interpréteur précédent."
 
-#: chsh.1.xml:142(filename)
+#: chsh.1.xml:158(filename)
 msgid "/etc/shells"
 msgstr "/etc/shells"
 
-#: chsh.1.xml:144(para)
+#: chsh.1.xml:160(para)
 msgid "List of valid login shells."
 msgstr "Liste des interpréteurs de commandes initiaux valables."
 
-#: chsh.1.xml:158(para)
+#: chsh.1.xml:174(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -8870,11 +9164,11 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chpasswd.8.xml:47(refpurpose)
+#: chpasswd.8.xml:50(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "Mettre à jour des mots de passe par lot"
 
-#: chpasswd.8.xml:61(para)
+#: chpasswd.8.xml:64(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 "
@@ -8885,7 +9179,7 @@
 "informations pour mettre à jour un groupe d'utilisateurs existants. Chaque "
 "ligne est au format suivant :"
 
-#: chpasswd.8.xml:66(para)
+#: chpasswd.8.xml:69(para)
 msgid ""
 "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -8893,7 +9187,7 @@
 "<emphasis remap=\"I\">nom_utilisateur</emphasis>:<emphasis remap=\"I"
 "\">mot_de_passe</emphasis>"
 
-#: chpasswd.8.xml:70(para)
+#: chpasswd.8.xml:73(para)
 msgid ""
 "By default the passwords must be supplied in clear-text, and are encrypted "
 "by <command>chpasswd</command>. Also the password age will be updated, if "
@@ -8903,7 +9197,7 @@
 "chiffrés par <command>chpasswd</command>. L'âge du mot de passe sera "
 "également mis à jour, s'il est présent."
 
-#: chpasswd.8.xml:75(para)
+#: chpasswd.8.xml:78(para)
 msgid ""
 "The default encryption algorithm can be defined for the system with the "
 "<option>ENCRYPT_METHOD</option> or <option>MD5_CRYPT_ENAB</option> variables "
@@ -8916,7 +9210,7 @@
 "peuvent être surchargées par les options <option>-e</option>, <option>-m</"
 "option> ou <option>-c</option>"
 
-#: chpasswd.8.xml:83(para)
+#: chpasswd.8.xml:86(para)
 msgid ""
 "By default, passwords are encrypted by PAM, but (even if not recommended) "
 "you can select a different encryption method with the <option>-e</option>, "
@@ -8927,7 +9221,7 @@
 "avec les options <option>-e</option>, <option>-m</option> ou <option>-c</"
 "option>."
 
-#: chpasswd.8.xml:89(para)
+#: chpasswd.8.xml:92(para)
 msgid ""
 "<phrase condition=\"pam\">Except when PAM is used to encrypt the passwords,</"
 "phrase><command>chpasswd</command> first updates all the passwords in "
@@ -8939,7 +9233,7 @@
 "de passe en mémoire et propage ensuite tous les modifications sur le disque "
 "si aucune erreur n'a lieu pour aucun utilisateur."
 
-#: chpasswd.8.xml:95(para)
+#: chpasswd.8.xml:98(para)
 msgid ""
 "When PAM is used to encrypt the passwords (and update the passwords in the "
 "system database) then if a password cannot be updated <command>chpasswd</"
@@ -8952,7 +9246,7 @@
 "jour des mots de passe pour les utilisateurs suivants, et renverra un code "
 "d'erreur en sortie."
 
-#: chpasswd.8.xml:101(para) chgpasswd.8.xml:81(para)
+#: chpasswd.8.xml:104(para) chgpasswd.8.xml:84(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
@@ -8960,12 +9254,12 @@
 "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:109(para)
+#: chpasswd.8.xml:112(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:115(term)
+#: chpasswd.8.xml:118(term)
 msgid ""
 "<option>-c</option>, <option>--crypt-method</option><replaceable>METHOD</"
 "replaceable>"
@@ -8973,15 +9267,15 @@
 "<option>-c</option>, <option>--crypt-method</option><replaceable>MÉTHODE</"
 "replaceable>"
 
-#: chpasswd.8.xml:121(para) chgpasswd.8.xml:98(para)
+#: chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
 msgid "The available methods are DES, MD5, and NONE."
 msgstr "Les méthodes disponibles sont DES, MD5 et NONE."
 
-#: chpasswd.8.xml:128(para)
+#: chpasswd.8.xml:131(para)
 msgid "By default, PAM is used to encrypt the passwords."
 msgstr "Par défaut, PAM est utilisé pour chiffrer les mots de passe."
 
-#: chpasswd.8.xml:131(para)
+#: chpasswd.8.xml:134(para)
 msgid ""
 "By default (if none of the <option>-c</option>, <option>-m</option>, or "
 "<option>-e</option> options are specified), the encryption method is defined "
@@ -8993,19 +9287,19 @@
 "définie par les variables <option>ENCRYPT_METHOD</option> ou "
 "<option>MD5_CRYPT_ENAB</option> de <filename>/etc/login.defs</filename>."
 
-#: chpasswd.8.xml:142(term) chgpasswd.8.xml:108(term)
+#: chpasswd.8.xml:145(term) chgpasswd.8.xml:111(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: chpasswd.8.xml:144(para) chgpasswd.8.xml:110(para)
+#: chpasswd.8.xml:147(para) chgpasswd.8.xml:113(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Indiquer que les mots de passe fournis sont chiffrés."
 
-#: chpasswd.8.xml:158(term) chgpasswd.8.xml:120(term)
+#: chpasswd.8.xml:161(term) chgpasswd.8.xml:123(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
-#: chpasswd.8.xml:160(para) chgpasswd.8.xml:122(para)
+#: chpasswd.8.xml:163(para) chgpasswd.8.xml:125(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -9013,7 +9307,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:167(term)
+#: chpasswd.8.xml:183(term)
 msgid ""
 "<option>-s</option>, <option>--sha-rounds</option><replaceable>ROUNDS</"
 "replaceable>"
@@ -9021,7 +9315,7 @@
 "<option>-s</option>, <option>--sha-rounds</option> <replaceable>ROUNDS</"
 "replaceable>"
 
-#: chpasswd.8.xml:187(para)
+#: chpasswd.8.xml:203(para)
 msgid ""
 "By default, the number of rounds is defined by the "
 "<option>SHA_CRYPT_MIN_ROUNDS</option> and <option>SHA_CRYPT_MAX_ROUNDS</"
@@ -9031,7 +9325,7 @@
 "<option>SHA_CRYPT_MIN_ROUNDS</option> et <option>SHA_CRYPT_MAX_ROUNDS</"
 "option> dans <filename>/etc/login.defs</filename>."
 
-#: chpasswd.8.xml:200(para) chgpasswd.8.xml:158(para)
+#: chpasswd.8.xml:216(para) chgpasswd.8.xml:174(para)
 msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
@@ -9039,15 +9333,15 @@
 "Pensez à configurer les permissions ou umask afin d'empêcher la lecture des "
 "fichiers non chiffrés par les d'autres utilisateurs."
 
-#: chpasswd.8.xml:244(filename)
+#: chpasswd.8.xml:260(filename)
 msgid "/etc/pam.d/chpasswd"
 msgstr "/etc/pam.d/chpasswd"
 
-#: chpasswd.8.xml:246(para)
+#: chpasswd.8.xml:262(para)
 msgid "PAM configuration for <command>chpasswd</command>."
 msgstr "Configuration de PAM pour <command>chpasswd</command>."
 
-#: chpasswd.8.xml:254(para)
+#: chpasswd.8.xml:270(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
@@ -9063,11 +9357,11 @@
 "manvolnum></citerefentry>, </phrase><citerefentry><refentrytitle>useradd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: chgpasswd.8.xml:48(refpurpose)
+#: chgpasswd.8.xml:51(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "Mettre à jour par lot des mots de passe des groupes"
 
-#: chgpasswd.8.xml:62(para)
+#: chgpasswd.8.xml:65(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 "
@@ -9078,7 +9372,7 @@
 "informations pour mettre à jour un ensemble de groupes existants. Chaque "
 "ligne est au format suivant :"
 
-#: chgpasswd.8.xml:67(para)
+#: chgpasswd.8.xml:70(para)
 msgid ""
 "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -9086,7 +9380,7 @@
 "<emphasis remap=\"I\">nom_utilisateur</emphasis>:<emphasis remap=\"I"
 "\">mot_de_passe</emphasis>"
 
-#: chgpasswd.8.xml:71(para)
+#: chgpasswd.8.xml:74(para)
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
 "<command>chgpasswd</command>."
@@ -9094,25 +9388,31 @@
 "Par défaut, le mot de passe doit être fourni en clair, et est chiffré par "
 "<command>chgpasswd</command>."
 
-#: chgpasswd.8.xml:75(para)
+#: chgpasswd.8.xml:78(para)
+#, fuzzy
+#| 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 overwiten with the <option>-e</option>, <option>-m</option>, or "
+#| "<option>-c</option> options."
 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 "
-"overwiten with the <option>-e</option>, <option>-m</option>, or <option>-c</"
-"option> options."
+"<option>ENCRYPT_METHOD</option> variable of <filename>/etc/login.defs</"
+"filename>, and can be overwiten with the <option>-e</option>, <option>-m</"
+"option>, or <option>-c</option> options."
 msgstr ""
 "L'algorithme de chiffrement peut être défini pour le système avec la "
 "variable ENCRYPT_METHOD de <filename>/etc/login.defs</filename> et peut être "
 "surchargé avec les options <option>-e</option>, <option>-m</option> ou "
 "<option>-c</option>."
 
-#: chgpasswd.8.xml:89(para)
+#: chgpasswd.8.xml:92(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:209(para)
+#: chgpasswd.8.xml:225(para)
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
@@ -9126,47 +9426,28 @@
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>."
 
-#: chfn.1.xml:47(refpurpose)
+#: chfn.1.xml:49(refpurpose)
 msgid "change real user name and information"
 msgstr "Modifier le nom complet et les informations associées à un utilisateur"
 
-#: chfn.1.xml:53(replaceable)
-msgid "full_name"
-msgstr "nom_complet"
-
-#: 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:55(replaceable)
-msgid "work_ph"
-msgstr "tel_bureau"
-
-#: chfn.1.xml:55(arg)
-msgid "-w <placeholder-1/>"
-msgstr "-w <placeholder-1/>"
-
-#: chfn.1.xml:56(replaceable)
-msgid "home_ph"
-msgstr "tel_perso"
-
-#: chfn.1.xml:57(replaceable)
-msgid "other"
-msgstr "autre"
-
-#: chfn.1.xml:57(arg)
-msgid "-o <placeholder-1/>"
-msgstr "-o <placeholder-1/>"
-
-#: chfn.1.xml:64(para)
+#: chfn.1.xml:66(para)
+#, fuzzy
+#| msgid ""
+#| "The <command>chfn</command> command changes user fullname, office number, "
+#| "office extension, and home phone number information for a user's account. "
+#| "This information is typically printed by "
+#| "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry> and similar programs. A normal user may only "
+#| "change the fields for her own account, subject to the restrictions in "
+#| "<filename>/etc/login.defs</filename>. (The default configuration is to "
+#| "prevent users from changing their fullname.) The superuser may change any "
+#| "field for any account. Additionally, only the superuser may use the "
+#| "<option>-o</option> option to change the undefined portions of the GECOS "
+#| "field."
 msgid ""
-"The <command>chfn</command> command changes user fullname, office number, "
-"office extension, and home phone number information for a user's account. "
-"This information is typically printed by "
+"The <command>chfn</command> command changes user fullname, office room "
+"number, office phone number, and home phone number information for a user's "
+"account. This information is typically printed by "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and similar programs. A normal user may only change the fields "
 "for her own account, subject to the restrictions in <filename>/etc/login."
@@ -9187,7 +9468,7 @@
 "compte. De plus, seul le superutilisateur peut utiliser l'option <option>-o</"
 "option> pour modifier les parties non précisées du champ GECOS."
 
-#: chfn.1.xml:78(para)
+#: chfn.1.xml:80(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. "
@@ -9202,8 +9483,104 @@
 "<emphasis remap=\"I\">autre</emphasis> est utilisé pour garder des "
 "informations de compte utilisées par d'autres applications."
 
-#: chfn.1.xml:87(para)
+#: chfn.1.xml:93(para)
+#, fuzzy
+#| msgid "The options which apply to the <command>chsh</command> command are:"
+msgid "The options which apply to the <command>chfn</command> command are:"
+msgstr "Les options applicables à la commande <command>chsh</command> sont :"
+
+#: chfn.1.xml:98(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
+#| "replaceable>"
 msgid ""
+"<option>-f</option>, <option>--full-name</option><replaceable>FULL_NAME</"
+"replaceable>"
+msgstr ""
+"<option>-f</option>, <option>--inactive</option> "
+"<replaceable>DURÉE_INACTIVITÉ</replaceable>"
+
+#: chfn.1.xml:102(para)
+#, fuzzy
+#| msgid "Changing the default values"
+msgid "Change the user's full name."
+msgstr "Modifier les valeurs par défaut"
+
+#: chfn.1.xml:106(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-h</option>, <option>--home-phone</option><replaceable>HOME_PHONE</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option> <replaceable>RÉP_PERSO</"
+"replaceable>"
+
+#: chfn.1.xml:110(para)
+msgid "Change the user's home phone number."
+msgstr ""
+
+#: chfn.1.xml:114(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-o</option>, <option>--other</option><replaceable>OTHER</replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option> <replaceable>RÉP_PERSO</"
+"replaceable>"
+
+#: chfn.1.xml:118(para)
+msgid ""
+"Change the user's other GECOS information. This field is used to store "
+"accounting information used by other applications, and can be changed only "
+"by a superuser."
+msgstr ""
+
+#: chfn.1.xml:126(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-r</option>, <option>--room</option><replaceable>ROOM_NUMBER</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option> <replaceable>RÉP_PERSO</"
+"replaceable>"
+
+#: chfn.1.xml:130(para)
+msgid "Change the user's room number."
+msgstr ""
+
+#: chfn.1.xml:147(term)
+#, fuzzy
+#| msgid "<option>-h</option>, <option>--help</option>"
+msgid "<option>-u</option>, <option>--help</option>"
+msgstr "<option>-h</option>, <option>--help</option>"
+
+#: chfn.1.xml:155(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-w</option>, <option>--work-phone</option><replaceable>WORK_PHONE</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option> <replaceable>RÉP_PERSO</"
+"replaceable>"
+
+#: chfn.1.xml:159(para)
+msgid "Change the user's office phone number."
+msgstr ""
+
+#: chfn.1.xml:163(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 "
 "the fields. Enter the new value to change the field, or leave the line blank "
@@ -9219,7 +9596,7 @@
 "En l'absence d'option, <command>chfn</command> opère sur l'utilisateur "
 "actuel."
 
-#: chfn.1.xml:132(para)
+#: chfn.1.xml:208(para)
 msgid ""
 "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -9233,11 +9610,11 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chage.1.xml:44(refpurpose)
+#: chage.1.xml:47(refpurpose)
 msgid "change user password expiry information"
 msgstr "Modifier les informations de validité d'un mot de passe"
 
-#: chage.1.xml:60(para)
+#: chage.1.xml:63(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 "
@@ -9248,12 +9625,12 @@
 "informations sont utilisées par le système pour déterminer si un utilisateur "
 "doit changer son mot de passe."
 
-#: chage.1.xml:70(para)
+#: chage.1.xml:73(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:75(term)
+#: chage.1.xml:78(term)
 msgid ""
 "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
 "replaceable>"
@@ -9261,7 +9638,7 @@
 "<option>-d</option>, <option>--lastday</option> <replaceable>DERNIER_JOUR</"
 "replaceable>"
 
-#: chage.1.xml:79(para)
+#: chage.1.xml:82(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 "
@@ -9272,7 +9649,7 @@
 "le format AAAA-MM-JJ (ou le format utilisé plus communément dans votre "
 "région)."
 
-#: chage.1.xml:87(term)
+#: chage.1.xml:90(term)
 msgid ""
 "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -9281,7 +9658,7 @@
 "<replaceable>DATE_FIN_VALIDITÉ</replaceable>"
 
 # NOTE: s/date//
-#: chage.1.xml:91(para)
+#: chage.1.xml:94(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 "
@@ -9296,7 +9673,7 @@
 "bloqué doit contacter l'administrateur système pour pouvoir utiliser à "
 "nouveau le système."
 
-#: chage.1.xml:99(para)
+#: chage.1.xml:102(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>EXPIRE_DATE</replaceable> will remove an account expiration "
@@ -9306,7 +9683,7 @@
 "<replaceable>DATE_FIN_VALIDITÉ</replaceable> aura pour effet de supprimer la "
 "date de fin de validité."
 
-#: chage.1.xml:113(term)
+#: chage.1.xml:116(term)
 msgid ""
 "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -9314,7 +9691,7 @@
 "<option>-I</option>, <option>--inactive</option> "
 "<replaceable>DURÉE_INACTIVITÉ</replaceable>"
 
-#: chage.1.xml:117(para)
+#: chage.1.xml:120(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 "
@@ -9327,7 +9704,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:124(para)
+#: chage.1.xml:127(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>INACTIVE</replaceable> will remove an account's inactivity."
@@ -9336,11 +9713,11 @@
 "<replaceable>DURÉE_INACTIVITÉ</replaceable> supprime la durée d'inactivité "
 "pour un compte."
 
-#: chage.1.xml:136(para)
+#: chage.1.xml:139(para)
 msgid "Show account aging information."
 msgstr "Afficher les informations sur l'âge des comptes."
 
-#: chage.1.xml:142(term)
+#: chage.1.xml:145(term)
 msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -9348,7 +9725,7 @@
 "<option>-m</option>, <option>--mindays</option> <replaceable>JOURS_MIN</"
 "replaceable>"
 
-#: chage.1.xml:154(term)
+#: chage.1.xml:157(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -9356,7 +9733,7 @@
 "<option>-M</option>, <option>--maxdays</option> <replaceable>JOURS_MAX</"
 "replaceable>"
 
-#: chage.1.xml:158(para)
+#: chage.1.xml:161(para)
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
@@ -9373,7 +9750,7 @@
 "l'option <option>-W</option> qui prévient l'utilisateur à l'avance par un "
 "message d'alerte."
 
-#: chage.1.xml:167(para)
+#: chage.1.xml:170(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as "
 "<replaceable>MAX_DAYS</replaceable> will remove checking a password's "
@@ -9382,7 +9759,7 @@
 "Une valeur de <emphasis remap=\"I\">-1</emphasis> pour "
 "<replaceable>JOURS_MAX</replaceable> supprime la vérification de validité."
 
-#: chage.1.xml:175(term)
+#: chage.1.xml:191(term)
 msgid ""
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -9390,7 +9767,7 @@
 "<option>-W</option>, <option>--warndays</option> "
 "<replaceable>DURÉE_AVERTISSEMENT</replaceable>"
 
-#: chage.1.xml:179(para)
+#: chage.1.xml:195(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 "
@@ -9403,7 +9780,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:188(para)
+#: chage.1.xml:204(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 "
@@ -9417,7 +9794,7 @@
 "ou laissez la ligne vide pour conserver la valeur actuelle. La valeur "
 "actuelle est affichée entre crochets."
 
-#: chage.1.xml:198(para)
+#: chage.1.xml:214(para)
 msgid ""
 "The <command>chage</command> program requires a shadow password file to be "
 "available."
@@ -9425,7 +9802,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:202(para)
+#: chage.1.xml:218(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 "
@@ -9436,15 +9813,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:267(replaceable)
+#: chage.1.xml:283(replaceable)
 msgid "15"
 msgstr "15"
 
-#: chage.1.xml:269(para)
+#: chage.1.xml:285(para)
 msgid "can't find the shadow password file"
 msgstr "impossible de trouver le fichier des mots de passe cachés"
 
-#: chage.1.xml:245(para)
+#: chage.1.xml:261(para)
 msgid ""
 "The <command>chage</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -9457,7 +9834,57 @@
 msgid "translator-credits"
 msgstr "Nicolas FRANÇOIS <nicolas.francois at centraliens.net>, 2005-2010."
 
+#~ msgid "-q"
+#~ msgstr "-q"
+
+#~ msgid "-s"
+#~ msgstr "-s"
+
 #~ msgid ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+#~ "\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+#~ "phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+#~ "\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+#~ "phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid "new_users"
+#~ msgstr "nouveaux_utilisateurs"
+
+#~ msgid "full_name"
+#~ msgstr "nom_complet"
+
+#~ msgid "-f <placeholder-1/>"
+#~ msgstr "-f <placeholder-1/>"
+
+#~ msgid "room_no"
+#~ msgstr "no_bureau"
+
+#~ msgid "work_ph"
+#~ msgstr "tel_bureau"
+
+#~ msgid "-w <placeholder-1/>"
+#~ msgstr "-w <placeholder-1/>"
+
+#~ msgid "home_ph"
+#~ msgstr "tel_perso"
+
+#~ msgid "other"
+#~ msgstr "autre"
+
+#~ msgid "-o <placeholder-1/>"
+#~ msgstr "-o <placeholder-1/>"
+
+#~ msgid ""
 #~ "Note: <option>-K </option><replaceable>UID_MIN</"
 #~ "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
 #~ "replaceable>=<replaceable>499</replaceable> doesn't work yet."

Modified: upstream/trunk/man/po/it.po
===================================================================
--- upstream/trunk/man/po/it.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/man/po/it.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.3\n"
-"POT-Creation-Date: 2010-08-29 17:54+0200\n"
+"POT-Creation-Date: 2011-11-13 18:43+0100\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"
@@ -17,43 +17,68 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: vipw.8.xml:39(refentrytitle) vipw.8.xml:44(refname) vipw.8.xml:53(command)
-#: login.defs.5.xml:477(term)
+#: vipw.8.xml:40(refentrytitle) vipw.8.xml:47(refname) vipw.8.xml:56(command)
+#: login.defs.5.xml:480(term)
 msgid "vipw"
 msgstr "vipw"
 
-#: vipw.8.xml:40(manvolnum) usermod.8.xml:42(manvolnum)
-#: userdel.8.xml:44(manvolnum) userdel.8.xml:203(replaceable)
-#: useradd.8.xml:53(manvolnum) pwconv.8.xml:44(manvolnum)
-#: pwck.8.xml:44(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:130(replaceable)
-#: groupadd.8.xml:42(manvolnum) faillog.8.xml:35(manvolnum)
-#: faillog.5.xml:86(manvolnum) chpasswd.8.xml:42(manvolnum)
-#: chgpasswd.8.xml:43(manvolnum)
+#: vipw.8.xml:41(manvolnum) usermod.8.xml:43(manvolnum)
+#: userdel.8.xml:45(manvolnum) userdel.8.xml:219(replaceable)
+#: useradd.8.xml:54(manvolnum) pwconv.8.xml:45(manvolnum)
+#: pwck.8.xml:45(manvolnum) nologin.8.xml:39(manvolnum)
+#: newusers.8.xml:52(manvolnum) logoutd.8.xml:39(manvolnum)
+#: lastlog.8.xml:40(manvolnum) grpck.8.xml:40(manvolnum)
+#: groupmod.8.xml:40(manvolnum) groupmems.8.xml:40(manvolnum)
+#: groupdel.8.xml:40(manvolnum) groupdel.8.xml:163(replaceable)
+#: groupadd.8.xml:42(manvolnum) faillog.8.xml:39(manvolnum)
+#: faillog.5.xml:92(manvolnum) chpasswd.8.xml:43(manvolnum)
+#: chgpasswd.8.xml:44(manvolnum)
 msgid "8"
 msgstr "8"
 
-#: vipw.8.xml:41(refmiscinfo) usermod.8.xml:43(refmiscinfo)
-#: userdel.8.xml:45(refmiscinfo) useradd.8.xml:54(refmiscinfo)
-#: pwconv.8.xml:45(refmiscinfo) pwck.8.xml:45(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:43(refmiscinfo) faillog.8.xml:36(refmiscinfo)
-#: chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
+#: vipw.8.xml:42(refmiscinfo) usermod.8.xml:44(refmiscinfo)
+#: userdel.8.xml:46(refmiscinfo) useradd.8.xml:55(refmiscinfo)
+#: pwconv.8.xml:46(refmiscinfo) pwck.8.xml:46(refmiscinfo)
+#: nologin.8.xml:40(refmiscinfo) newusers.8.xml:53(refmiscinfo)
+#: logoutd.8.xml:40(refmiscinfo) lastlog.8.xml:41(refmiscinfo)
+#: grpck.8.xml:41(refmiscinfo) groupmod.8.xml:41(refmiscinfo)
+#: groupmems.8.xml:41(refmiscinfo) groupdel.8.xml:41(refmiscinfo)
+#: groupadd.8.xml:43(refmiscinfo) faillog.8.xml:40(refmiscinfo)
+#: chpasswd.8.xml:44(refmiscinfo) chgpasswd.8.xml:45(refmiscinfo)
 msgid "System Management Commands"
 msgstr ""
 
-#: vipw.8.xml:45(refname) vipw.8.xml:59(command)
+#: vipw.8.xml:43(refmiscinfo) usermod.8.xml:45(refmiscinfo)
+#: userdel.8.xml:47(refmiscinfo) useradd.8.xml:56(refmiscinfo)
+#: suauth.5.xml:41(refmiscinfo) su.1.xml:58(refmiscinfo)
+#: sg.1.xml:42(refmiscinfo) shadow.5.xml:41(refmiscinfo)
+#: shadow.3.xml:41(refmiscinfo) pwconv.8.xml:47(refmiscinfo)
+#: pwck.8.xml:47(refmiscinfo) porttime.5.xml:41(refmiscinfo)
+#: passwd.5.xml:41(refmiscinfo) passwd.1.xml:48(refmiscinfo)
+#: nologin.8.xml:41(refmiscinfo) newusers.8.xml:54(refmiscinfo)
+#: newgrp.1.xml:42(refmiscinfo) logoutd.8.xml:41(refmiscinfo)
+#: login.defs.5.xml:104(refmiscinfo) login.access.5.xml:42(refmiscinfo)
+#: login.1.xml:74(refmiscinfo) limits.5.xml:42(refmiscinfo)
+#: lastlog.8.xml:42(refmiscinfo) gshadow.5.xml:40(refmiscinfo)
+#: grpck.8.xml:42(refmiscinfo) groups.1.xml:41(refmiscinfo)
+#: groupmod.8.xml:42(refmiscinfo) groupmems.8.xml:42(refmiscinfo)
+#: groupdel.8.xml:42(refmiscinfo) groupadd.8.xml:44(refmiscinfo)
+#: gpasswd.1.xml:46(refmiscinfo) faillog.8.xml:41(refmiscinfo)
+#: faillog.5.xml:41(refmiscinfo) expiry.1.xml:45(refmiscinfo)
+#: chsh.1.xml:44(refmiscinfo) chpasswd.8.xml:45(refmiscinfo)
+#: chgpasswd.8.xml:46(refmiscinfo) chfn.1.xml:44(refmiscinfo)
+#: chage.1.xml:42(refmiscinfo)
+#, fuzzy
+#| msgid "shadow"
+msgid "shadow-utils"
+msgstr "shadow"
+
+#: vipw.8.xml:48(refname) vipw.8.xml:62(command)
 msgid "vigr"
 msgstr "vigr"
 
 # type: Plain text
-#: vipw.8.xml:46(refpurpose)
+#: vipw.8.xml:49(refpurpose)
 #, fuzzy
 msgid "edit the password, group, shadow-password or shadow-group file"
 msgstr ""
@@ -64,38 +89,42 @@
 "vipw, vigr - modificano i file delle password, dei gruppi, delle shadow "
 "password o dei gruppi shadow"
 
-#: vipw.8.xml:55(replaceable) vipw.8.xml:61(replaceable)
-#: usermod.8.xml:54(replaceable) userdel.8.xml:54(arg)
-#: useradd.8.xml:64(replaceable) useradd.8.xml:76(replaceable)
-#: su.1.xml:66(replaceable) passwd.1.xml:57(replaceable)
-#: newusers.8.xml:63(replaceable) lastlog.8.xml:48(replaceable)
-#: groupmod.8.xml:51(replaceable) groupadd.8.xml:54(replaceable)
-#: faillog.8.xml:47(replaceable) chsh.1.xml:53(replaceable)
-#: chpasswd.8.xml:54(replaceable) chgpasswd.8.xml:55(replaceable)
-#: chage.1.xml:50(replaceable)
+#: vipw.8.xml:58(replaceable) vipw.8.xml:64(replaceable)
+#: usermod.8.xml:57(replaceable) userdel.8.xml:57(arg)
+#: useradd.8.xml:67(replaceable) useradd.8.xml:79(replaceable)
+#: su.1.xml:69(replaceable) pwconv.8.xml:62(replaceable)
+#: pwconv.8.xml:68(replaceable) pwconv.8.xml:74(replaceable)
+#: pwconv.8.xml:80(replaceable) pwck.8.xml:58(arg)
+#: passwd.1.xml:60(replaceable) newusers.8.xml:66(replaceable)
+#: lastlog.8.xml:54(replaceable) grpck.8.xml:53(arg)
+#: groupmod.8.xml:54(replaceable) groupdel.8.xml:54(replaceable)
+#: groupadd.8.xml:56(replaceable) faillog.8.xml:53(replaceable)
+#: chsh.1.xml:56(replaceable) chpasswd.8.xml:57(replaceable)
+#: chgpasswd.8.xml:58(replaceable) chfn.1.xml:56(replaceable)
+#: chage.1.xml:53(replaceable)
 msgid "options"
 msgstr "opzioni"
 
 # type: SH
-#: vipw.8.xml:67(title) usermod.8.xml:61(title) userdel.8.xml:62(title)
-#: useradd.8.xml:82(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:71(title) pwck.8.xml:86(title)
-#: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
-#: nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title)
-#: logoutd.8.xml:50(title) login.defs.5.xml:110(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:63(title) gpasswd.1.xml:72(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:59(title)
+#: vipw.8.xml:70(title) usermod.8.xml:64(title) userdel.8.xml:65(title)
+#: useradd.8.xml:85(title) suauth.5.xml:56(title) su.1.xml:80(title)
+#: sg.1.xml:62(title) shadow.5.xml:50(title) shadow.3.xml:99(title)
+#: shadow.3.xml:155(title) pwconv.8.xml:86(title) pwck.8.xml:73(title)
+#: porttime.5.xml:50(title) passwd.5.xml:50(title) passwd.1.xml:69(title)
+#: nologin.8.xml:56(title) newusers.8.xml:75(title) newgrp.1.xml:58(title)
+#: logoutd.8.xml:56(title) login.defs.5.xml:113(title)
+#: login.access.5.xml:51(title) login.1.xml:106(title) limits.5.xml:52(title)
+#: lastlog.8.xml:60(title) gshadow.5.xml:49(title) grpck.8.xml:64(title)
+#: groups.1.xml:59(title) groupmod.8.xml:61(title) groupmems.8.xml:63(title)
+#: groupdel.8.xml:61(title) groupadd.8.xml:65(title) gpasswd.1.xml:75(title)
+#: faillog.8.xml:59(title) faillog.5.xml:50(title) expiry.1.xml:63(title)
+#: chsh.1.xml:65(title) chpasswd.8.xml:63(title) chgpasswd.8.xml:64(title)
+#: chfn.1.xml:65(title) chage.1.xml:62(title)
 msgid "DESCRIPTION"
 msgstr "DESCRIZIONE"
 
 # type: Plain text
-#: vipw.8.xml:68(para)
+#: vipw.8.xml:71(para)
 #, fuzzy
 msgid ""
 "The <command>vipw</command> and <command>vigr</command> commands edits the "
@@ -122,18 +151,19 @@
 "citerefentry>."
 
 # type: SH
-#: vipw.8.xml:85(title) usermod.8.xml:69(title) userdel.8.xml:71(title)
-#: useradd.8.xml:100(title) su.1.xml:123(title) pwck.8.xml:170(title)
-#: passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title)
-#: lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title)
-#: groupmems.8.xml:75(title) groupadd.8.xml:72(title) gpasswd.1.xml:112(title)
-#: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:108(title)
-#: chgpasswd.8.xml:88(title) chage.1.xml:69(title)
+#: vipw.8.xml:88(title) usermod.8.xml:72(title) userdel.8.xml:74(title)
+#: useradd.8.xml:103(title) su.1.xml:126(title) pwconv.8.xml:168(title)
+#: pwck.8.xml:157(title) passwd.1.xml:155(title) newusers.8.xml:244(title)
+#: login.1.xml:191(title) lastlog.8.xml:72(title) grpck.8.xml:128(title)
+#: groupmod.8.xml:70(title) groupmems.8.xml:78(title) groupdel.8.xml:69(title)
+#: groupadd.8.xml:74(title) gpasswd.1.xml:115(title) faillog.8.xml:70(title)
+#: expiry.1.xml:72(title) chsh.1.xml:76(title) chpasswd.8.xml:111(title)
+#: chgpasswd.8.xml:91(title) chfn.1.xml:92(title) chage.1.xml:72(title)
 msgid "OPTIONS"
 msgstr "OPZIONI"
 
 # type: Plain text
-#: vipw.8.xml:86(para)
+#: vipw.8.xml:89(para)
 #, fuzzy
 msgid ""
 "The options which apply to the <command>vipw</command> and <command>vigr</"
@@ -141,89 +171,128 @@
 msgstr "Il comando <command>chage</command> accetta le seguenti opzioni:"
 
 # type: TP
-#: vipw.8.xml:92(term)
+#: vipw.8.xml:95(term)
 msgid "<option>-g</option>, <option>--group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: vipw.8.xml:94(para)
+#: vipw.8.xml:97(para)
 msgid "Edit group database."
 msgstr ""
 
 # type: TP
-#: vipw.8.xml:98(term) userdel.8.xml:101(term) useradd.8.xml:250(term)
-#: passwd.1.xml:192(term) newusers.8.xml:257(term) lastlog.8.xml:82(term)
-#: groupmod.8.xml:98(term) groupmems.8.xml:117(term) groupadd.8.xml:107(term)
-#: gpasswd.1.xml:151(term) faillog.8.xml:97(term) chsh.1.xml:79(term)
-#: chpasswd.8.xml:150(term) chgpasswd.8.xml:114(term) chage.1.xml:107(term)
+#: vipw.8.xml:101(term) userdel.8.xml:104(term) useradd.8.xml:253(term)
+#: pwconv.8.xml:176(term) pwck.8.xml:167(term) passwd.1.xml:195(term)
+#: newusers.8.xml:262(term) lastlog.8.xml:88(term) grpck.8.xml:138(term)
+#: groupmod.8.xml:105(term) groupmems.8.xml:120(term) groupdel.8.xml:76(term)
+#: groupadd.8.xml:109(term) gpasswd.1.xml:154(term) faillog.8.xml:103(term)
+#: expiry.1.xml:93(term) chsh.1.xml:82(term) chpasswd.8.xml:153(term)
+#: chgpasswd.8.xml:117(term) chage.1.xml:110(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
 # type: Plain text
-#: vipw.8.xml:100(para) userdel.8.xml:103(para) useradd.8.xml:252(para)
-#: passwd.1.xml:194(para) newusers.8.xml:259(para) lastlog.8.xml:86(para)
-#: groupmod.8.xml:100(para) groupmems.8.xml:119(para) groupadd.8.xml:109(para)
-#: gpasswd.1.xml:153(para) faillog.8.xml:99(para) chsh.1.xml:81(para)
-#: chpasswd.8.xml:152(para) chgpasswd.8.xml:116(para) chage.1.xml:109(para)
+#: vipw.8.xml:103(para) userdel.8.xml:106(para) useradd.8.xml:255(para)
+#: pwconv.8.xml:178(para) pwck.8.xml:169(para) passwd.1.xml:197(para)
+#: newusers.8.xml:264(para) lastlog.8.xml:92(para) grpck.8.xml:140(para)
+#: groupmod.8.xml:107(para) groupmems.8.xml:122(para) groupdel.8.xml:78(para)
+#: groupadd.8.xml:111(para) gpasswd.1.xml:156(para) faillog.8.xml:105(para)
+#: expiry.1.xml:95(para) chsh.1.xml:84(para) chpasswd.8.xml:155(para)
+#: chgpasswd.8.xml:119(para) chfn.1.xml:151(para) chage.1.xml:112(para)
 msgid "Display help message and exit."
 msgstr "Mostra un messaggio di aiuto ed esce."
 
 # type: IP
-#: vipw.8.xml:104(term)
+#: vipw.8.xml:107(term)
 msgid "<option>-p</option>, <option>--passwd</option>"
 msgstr "<option>-p</option>, <option>--passwd</option>"
 
-#: vipw.8.xml:106(para)
+#: vipw.8.xml:109(para)
 msgid "Edit passwd database."
 msgstr ""
 
 # type: IP
-#: vipw.8.xml:110(term) passwd.1.xml:259(term)
+#: vipw.8.xml:113(term) pwck.8.xml:173(term) passwd.1.xml:262(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:112(para) passwd.1.xml:263(para)
+#: vipw.8.xml:115(para) passwd.1.xml:266(para)
 msgid "Quiet mode."
 msgstr ""
 
 # type: IP
-#: vipw.8.xml:116(term)
+#: vipw.8.xml:119(term) usermod.8.xml:298(term) userdel.8.xml:127(term)
+#: useradd.8.xml:438(term) pwconv.8.xml:182(term) pwck.8.xml:190(term)
+#: passwd.1.xml:282(term) newusers.8.xml:287(term) lastlog.8.xml:96(term)
+#: grpck.8.xml:154(term) groupmod.8.xml:156(term) groupmems.8.xml:143(term)
+#: groupdel.8.xml:82(term) groupadd.8.xml:184(term) faillog.8.xml:163(term)
+#: chsh.1.xml:88(term) chpasswd.8.xml:170(term) chgpasswd.8.xml:132(term)
+#: chfn.1.xml:134(term) chage.1.xml:178(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
+#| "replaceable>"
+msgid ""
+"<option>-R</option>, <option>--root</option><replaceable>CHROOT_DIR</"
+"replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--user</option> <replaceable>LOGIN</replaceable>"
+
+# type: Plain text
+#: vipw.8.xml:124(para) usermod.8.xml:303(para) userdel.8.xml:132(para)
+#: useradd.8.xml:443(para) pwconv.8.xml:187(para) pwck.8.xml:195(para)
+#: passwd.1.xml:287(para) newusers.8.xml:292(para) lastlog.8.xml:101(para)
+#: grpck.8.xml:159(para) groupmod.8.xml:161(para) groupmems.8.xml:148(para)
+#: groupdel.8.xml:87(para) groupadd.8.xml:189(para) gpasswd.1.xml:167(para)
+#: faillog.8.xml:168(para) chsh.1.xml:93(para) chpasswd.8.xml:175(para)
+#: chgpasswd.8.xml:137(para) chfn.1.xml:139(para) chage.1.xml:183(para)
+#, fuzzy
+msgid ""
+"Apply changes in the <replaceable>CHROOT_DIR</replaceable> directory and use "
+"the configuration files from the <replaceable>CHROOT_DIR</replaceable> "
+"directory."
+msgstr ""
+"Il nome del gruppo verrà modificato da <replaceable>gruppo</replaceable> a "
+"<replaceable>nome_gruppo</replaceable>."
+
+# type: IP
+#: vipw.8.xml:132(term)
 msgid "<option>-s</option>, <option>--shadow</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: vipw.8.xml:118(para)
+#: vipw.8.xml:134(para)
 msgid "Edit shadow or gshadow database."
 msgstr ""
 
 # type: IP
-#: vipw.8.xml:122(term)
+#: vipw.8.xml:138(term)
 #, fuzzy
 #| msgid "<option>-q</option>, <option>--quiet</option>"
 msgid "<option>-u</option>, <option>--user</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:124(para)
+#: vipw.8.xml:140(para)
 msgid "Indicates which user's tcb shadow file to edit."
 msgstr ""
 
-#: vipw.8.xml:131(title) usermod.8.xml:374(title) userdel.8.xml:127(title)
-#: useradd.8.xml:629(title) su.1.xml:310(title) sg.1.xml:76(title)
-#: pwconv.8.xml:164(title) pwck.8.xml:230(title) passwd.1.xml:356(title)
-#: newusers.8.xml:324(title) newgrp.1.xml:87(title) login.1.xml:272(title)
-#: grpck.8.xml:173(title) groupmod.8.xml:152(title) groupmems.8.xml:162(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:185(title) gpasswd.1.xml:226(title)
-#: chsh.1.xml:120(title) chpasswd.8.xml:207(title) chgpasswd.8.xml:169(title)
-#: chfn.1.xml:99(title) chage.1.xml:210(title)
+#: vipw.8.xml:147(title) usermod.8.xml:404(title) userdel.8.xml:143(title)
+#: useradd.8.xml:645(title) su.1.xml:320(title) sg.1.xml:79(title)
+#: pwconv.8.xml:209(title) pwck.8.xml:234(title) passwd.1.xml:372(title)
+#: newusers.8.xml:342(title) newgrp.1.xml:90(title) login.1.xml:275(title)
+#: grpck.8.xml:191(title) groupmod.8.xml:172(title) groupmems.8.xml:178(title)
+#: groupdel.8.xml:110(title) groupadd.8.xml:200(title)
+#: gpasswd.1.xml:244(title) chsh.1.xml:136(title) chpasswd.8.xml:223(title)
+#: chgpasswd.8.xml:185(title) chfn.1.xml:175(title) chage.1.xml:226(title)
 msgid "CONFIGURATION"
 msgstr ""
 
-#: vipw.8.xml:132(para) usermod.8.xml:375(para) userdel.8.xml:128(para)
-#: useradd.8.xml:630(para) su.1.xml:311(para) sg.1.xml:77(para)
-#: pwck.8.xml:231(para) passwd.1.xml:357(para) newusers.8.xml:325(para)
-#: newgrp.1.xml:88(para) login.1.xml:273(para) grpck.8.xml:174(para)
-#: groupmod.8.xml:153(para) groupmems.8.xml:163(para) groupdel.8.xml:78(para)
-#: groupadd.8.xml:186(para) gpasswd.1.xml:227(para) chsh.1.xml:121(para)
-#: chpasswd.8.xml:208(para) chgpasswd.8.xml:170(para) chfn.1.xml:100(para)
-#: chage.1.xml:211(para)
+#: vipw.8.xml:148(para) usermod.8.xml:405(para) userdel.8.xml:144(para)
+#: useradd.8.xml:646(para) su.1.xml:321(para) sg.1.xml:80(para)
+#: pwck.8.xml:235(para) passwd.1.xml:373(para) newusers.8.xml:343(para)
+#: newgrp.1.xml:91(para) login.1.xml:276(para) grpck.8.xml:192(para)
+#: groupmod.8.xml:173(para) groupmems.8.xml:179(para) groupdel.8.xml:111(para)
+#: groupadd.8.xml:201(para) gpasswd.1.xml:245(para) chsh.1.xml:137(para)
+#: chpasswd.8.xml:224(para) chgpasswd.8.xml:186(para) chfn.1.xml:176(para)
+#: chage.1.xml:227(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of this tool:"
@@ -254,150 +323,152 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> per dettagli sul modo "
 "in cui questa stringa viene interpretata."
 
-#: vipw.8.xml:143(title)
+#: vipw.8.xml:159(title)
 msgid "ENVIRONMENT"
 msgstr ""
 
-#: vipw.8.xml:146(option)
+#: vipw.8.xml:162(option)
 msgid "VISUAL"
 msgstr ""
 
-#: vipw.8.xml:148(para)
+#: vipw.8.xml:164(para)
 msgid "Editor to be used."
 msgstr ""
 
-#: vipw.8.xml:152(option)
+#: vipw.8.xml:168(option)
 msgid "EDITOR"
 msgstr ""
 
-#: vipw.8.xml:154(para)
+#: vipw.8.xml:170(para)
 msgid "Editor to be used if <option>VISUAL</option> is not set."
 msgstr ""
 
 # type: SH
-#: vipw.8.xml:161(title) usermod.8.xml:389(title) userdel.8.xml:144(title)
-#: useradd.8.xml:655(title) suauth.5.xml:168(title) su.1.xml:338(title)
-#: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
-#: pwconv.8.xml:187(title) pwck.8.xml:247(title) porttime.5.xml:105(title)
-#: passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(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:170(title) lastlog.8.xml:147(title)
-#: gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title)
-#: groupmod.8.xml:164(title) groupmems.8.xml:174(title)
-#: groupdel.8.xml:89(title) groupadd.8.xml:199(title) gpasswd.1.xml:241(title)
-#: faillog.8.xml:210(title) faillog.5.xml:71(title) expiry.1.xml:68(title)
-#: chsh.1.xml:133(title) chpasswd.8.xml:223(title) chgpasswd.8.xml:184(title)
-#: chfn.1.xml:113(title) chage.1.xml:222(title)
+#: vipw.8.xml:177(title) usermod.8.xml:419(title) userdel.8.xml:160(title)
+#: useradd.8.xml:671(title) suauth.5.xml:174(title) su.1.xml:348(title)
+#: sg.1.xml:91(title) shadow.5.xml:236(title) shadow.3.xml:207(title)
+#: pwconv.8.xml:232(title) pwck.8.xml:251(title) porttime.5.xml:111(title)
+#: passwd.5.xml:122(title) passwd.1.xml:390(title) newusers.8.xml:375(title)
+#: newgrp.1.xml:102(title) logoutd.8.xml:70(title)
+#: login.access.5.xml:102(title) login.1.xml:319(title)
+#: limits.5.xml:176(title) lastlog.8.xml:166(title) gshadow.5.xml:147(title)
+#: grpck.8.xml:203(title) groups.1.xml:81(title) groupmod.8.xml:184(title)
+#: groupmems.8.xml:190(title) groupdel.8.xml:122(title)
+#: groupadd.8.xml:214(title) gpasswd.1.xml:259(title) faillog.8.xml:229(title)
+#: faillog.5.xml:77(title) expiry.1.xml:102(title) chsh.1.xml:149(title)
+#: chpasswd.8.xml:239(title) chgpasswd.8.xml:200(title) chfn.1.xml:189(title)
+#: chage.1.xml:238(title)
 msgid "FILES"
 msgstr "FILE"
 
-#: vipw.8.xml:164(filename) usermod.8.xml:392(filename)
-#: userdel.8.xml:147(filename) useradd.8.xml:670(filename)
-#: sg.1.xml:103(filename) pwck.8.xml:250(filename)
-#: newusers.8.xml:372(filename) newgrp.1.xml:114(filename)
-#: gshadow.5.xml:144(filename) grpck.8.xml:188(filename)
-#: groups.1.xml:78(filename) groupmod.8.xml:167(filename)
-#: groupmems.8.xml:177(filename) groupdel.8.xml:92(filename)
-#: groupadd.8.xml:202(filename) gpasswd.1.xml:50(filename)
-#: gpasswd.1.xml:53(filename) gpasswd.1.xml:244(filename)
-#: chgpasswd.8.xml:187(filename)
+#: vipw.8.xml:180(filename) usermod.8.xml:422(filename)
+#: userdel.8.xml:163(filename) useradd.8.xml:686(filename)
+#: sg.1.xml:106(filename) pwck.8.xml:254(filename)
+#: newusers.8.xml:390(filename) newgrp.1.xml:117(filename)
+#: gshadow.5.xml:150(filename) grpck.8.xml:206(filename)
+#: groups.1.xml:84(filename) groupmod.8.xml:187(filename)
+#: groupmems.8.xml:193(filename) groupdel.8.xml:125(filename)
+#: groupadd.8.xml:217(filename) gpasswd.1.xml:53(filename)
+#: gpasswd.1.xml:56(filename) gpasswd.1.xml:262(filename)
+#: chgpasswd.8.xml:203(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
 # type: Plain text
-#: vipw.8.xml:166(para) usermod.8.xml:394(para) userdel.8.xml:149(para)
-#: useradd.8.xml:672(para) sg.1.xml:105(para) pwck.8.xml:252(para)
-#: newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para)
-#: grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
-#: groupmems.8.xml:179(para) groupdel.8.xml:94(para) groupadd.8.xml:204(para)
-#: gpasswd.1.xml:246(para) chgpasswd.8.xml:189(para)
+#: vipw.8.xml:182(para) usermod.8.xml:424(para) userdel.8.xml:165(para)
+#: useradd.8.xml:688(para) sg.1.xml:108(para) pwck.8.xml:256(para)
+#: newusers.8.xml:392(para) newgrp.1.xml:119(para) gshadow.5.xml:152(para)
+#: grpck.8.xml:208(para) groups.1.xml:86(para) groupmod.8.xml:189(para)
+#: groupmems.8.xml:195(para) groupdel.8.xml:127(para) groupadd.8.xml:219(para)
+#: gpasswd.1.xml:264(para) chgpasswd.8.xml:205(para)
 msgid "Group account information."
 msgstr "Informazioni sugli account di gruppo."
 
-#: vipw.8.xml:170(filename) usermod.8.xml:398(filename)
-#: useradd.8.xml:676(filename) sg.1.xml:109(filename)
-#: newusers.8.xml:378(filename) newgrp.1.xml:120(filename)
-#: gshadow.5.xml:150(filename) grpck.8.xml:194(filename)
-#: groupmod.8.xml:173(filename) groupmems.8.xml:183(filename)
-#: groupdel.8.xml:98(filename) groupadd.8.xml:208(filename)
-#: gpasswd.1.xml:54(filename) gpasswd.1.xml:250(filename)
-#: chgpasswd.8.xml:193(filename)
+#: vipw.8.xml:186(filename) usermod.8.xml:428(filename)
+#: useradd.8.xml:692(filename) sg.1.xml:112(filename)
+#: newusers.8.xml:396(filename) newgrp.1.xml:123(filename)
+#: gshadow.5.xml:156(filename) grpck.8.xml:212(filename)
+#: groupmod.8.xml:193(filename) groupmems.8.xml:199(filename)
+#: groupdel.8.xml:131(filename) groupadd.8.xml:223(filename)
+#: gpasswd.1.xml:57(filename) gpasswd.1.xml:268(filename)
+#: chgpasswd.8.xml:209(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
 # type: Plain text
-#: vipw.8.xml:172(para) usermod.8.xml:400(para) useradd.8.xml:678(para)
-#: sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para)
-#: gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para)
-#: groupdel.8.xml:100(para) groupadd.8.xml:210(para) gpasswd.1.xml:252(para)
-#: chgpasswd.8.xml:195(para)
+#: vipw.8.xml:188(para) usermod.8.xml:430(para) useradd.8.xml:694(para)
+#: sg.1.xml:114(para) newusers.8.xml:398(para) newgrp.1.xml:125(para)
+#: gshadow.5.xml:158(para) grpck.8.xml:214(para) groupmod.8.xml:195(para)
+#: groupdel.8.xml:133(para) groupadd.8.xml:225(para) gpasswd.1.xml:270(para)
+#: chgpasswd.8.xml:211(para)
 msgid "Secure group account information."
 msgstr "Informazioni sicure sugli account di gruppo."
 
-#: vipw.8.xml:176(filename) usermod.8.xml:404(filename)
-#: userdel.8.xml:159(filename) useradd.8.xml:658(filename)
-#: su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
-#: pwck.8.xml:256(filename) passwd.5.xml:119(filename)
-#: passwd.1.xml:377(filename) newusers.8.xml:360(filename)
-#: newgrp.1.xml:102(filename) login.1.xml:331(filename)
-#: grpck.8.xml:200(filename) expiry.1.xml:71(filename)
-#: chsh.1.xml:136(filename) chpasswd.8.xml:226(filename)
-#: chfn.1.xml:122(filename) chage.1.xml:226(filename)
+#: vipw.8.xml:192(filename) usermod.8.xml:434(filename)
+#: userdel.8.xml:175(filename) useradd.8.xml:674(filename)
+#: su.1.xml:351(filename) sg.1.xml:94(filename) shadow.5.xml:239(filename)
+#: pwck.8.xml:260(filename) passwd.5.xml:125(filename)
+#: passwd.1.xml:393(filename) newusers.8.xml:378(filename)
+#: newgrp.1.xml:105(filename) login.1.xml:334(filename)
+#: grpck.8.xml:218(filename) groupmod.8.xml:199(filename)
+#: expiry.1.xml:105(filename) chsh.1.xml:152(filename)
+#: chpasswd.8.xml:242(filename) chfn.1.xml:198(filename)
+#: chage.1.xml:242(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
 # type: Plain text
-#: vipw.8.xml:178(para) usermod.8.xml:406(para) userdel.8.xml:161(para)
-#: useradd.8.xml:660(para) su.1.xml:343(para) sg.1.xml:93(para)
-#: shadow.5.xml:235(para) pwck.8.xml:258(para) passwd.5.xml:121(para)
-#: passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
-#: login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para)
-#: chsh.1.xml:138(para) chpasswd.8.xml:228(para) chfn.1.xml:124(para)
-#: chage.1.xml:229(para)
+#: vipw.8.xml:194(para) usermod.8.xml:436(para) userdel.8.xml:177(para)
+#: useradd.8.xml:676(para) su.1.xml:353(para) sg.1.xml:96(para)
+#: shadow.5.xml:241(para) pwck.8.xml:262(para) passwd.5.xml:127(para)
+#: passwd.1.xml:395(para) newusers.8.xml:380(para) newgrp.1.xml:107(para)
+#: login.1.xml:336(para) grpck.8.xml:220(para) groupmod.8.xml:201(para)
+#: expiry.1.xml:107(para) chsh.1.xml:154(para) chpasswd.8.xml:244(para)
+#: chfn.1.xml:200(para) chage.1.xml:245(para)
 msgid "User account information."
 msgstr "informazioni sugli account utente."
 
-#: vipw.8.xml:182(filename) usermod.8.xml:410(filename)
-#: userdel.8.xml:165(filename) useradd.8.xml:664(filename)
-#: su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
-#: shadow.3.xml:204(filename) pwck.8.xml:262(filename)
-#: passwd.5.xml:125(filename) passwd.1.xml:383(filename)
-#: newusers.8.xml:366(filename) newgrp.1.xml:108(filename)
-#: login.1.xml:337(filename) expiry.1.xml:77(filename)
-#: chpasswd.8.xml:232(filename) chage.1.xml:234(filename)
+#: vipw.8.xml:198(filename) usermod.8.xml:440(filename)
+#: userdel.8.xml:181(filename) useradd.8.xml:680(filename)
+#: su.1.xml:357(filename) sg.1.xml:100(filename) shadow.5.xml:245(filename)
+#: shadow.3.xml:210(filename) pwck.8.xml:266(filename)
+#: passwd.5.xml:131(filename) passwd.1.xml:399(filename)
+#: newusers.8.xml:384(filename) newgrp.1.xml:111(filename)
+#: login.1.xml:340(filename) expiry.1.xml:111(filename)
+#: chpasswd.8.xml:248(filename) chage.1.xml:250(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
 # type: Plain text
-#: vipw.8.xml:184(para) usermod.8.xml:412(para) userdel.8.xml:167(para)
-#: useradd.8.xml:666(para) su.1.xml:349(para) sg.1.xml:99(para)
-#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:264(para)
-#: passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
-#: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:234(para)
-#: chage.1.xml:237(para)
+#: vipw.8.xml:200(para) usermod.8.xml:442(para) userdel.8.xml:183(para)
+#: useradd.8.xml:682(para) su.1.xml:359(para) sg.1.xml:102(para)
+#: shadow.5.xml:247(para) shadow.3.xml:212(para) pwck.8.xml:268(para)
+#: passwd.1.xml:401(para) newusers.8.xml:386(para) newgrp.1.xml:113(para)
+#: login.1.xml:342(para) expiry.1.xml:113(para) chpasswd.8.xml:250(para)
+#: chage.1.xml:253(para)
 msgid "Secure user account information."
 msgstr "Informazioni sicure sugli account di utenti."
 
 # type: SH
-#: vipw.8.xml:191(title) usermod.8.xml:419(title) userdel.8.xml:252(title)
-#: useradd.8.xml:772(title) suauth.5.xml:197(title) su.1.xml:409(title)
-#: sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title)
-#: pwconv.8.xml:199(title) pwck.8.xml:322(title) porttime.5.xml:117(title)
-#: passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title)
-#: newusers.8.xml:399(title) newgrp.1.xml:129(title)
-#: login.defs.5.xml:504(title) login.access.5.xml:108(title)
-#: login.1.xml:376(title) limits.5.xml:180(title) gshadow.5.xml:159(title)
-#: grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
-#: groupmems.8.xml:192(title) groupdel.8.xml:146(title)
-#: groupadd.8.xml:290(title) gpasswd.1.xml:259(title) faillog.8.xml:222(title)
-#: faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
-#: chpasswd.8.xml:253(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title)
-#: chage.1.xml:277(title)
+#: vipw.8.xml:207(title) usermod.8.xml:449(title) userdel.8.xml:268(title)
+#: useradd.8.xml:788(title) suauth.5.xml:203(title) su.1.xml:419(title)
+#: sg.1.xml:121(title) shadow.5.xml:264(title) shadow.3.xml:219(title)
+#: pwconv.8.xml:244(title) pwck.8.xml:326(title) porttime.5.xml:123(title)
+#: passwd.5.xml:150(title) passwd.1.xml:471(title) nologin.8.xml:70(title)
+#: newusers.8.xml:417(title) newgrp.1.xml:132(title)
+#: login.defs.5.xml:507(title) login.access.5.xml:114(title)
+#: login.1.xml:379(title) limits.5.xml:186(title) gshadow.5.xml:165(title)
+#: grpck.8.xml:272(title) groups.1.xml:93(title) groupmod.8.xml:259(title)
+#: groupmems.8.xml:208(title) groupdel.8.xml:179(title)
+#: groupadd.8.xml:305(title) gpasswd.1.xml:277(title) faillog.8.xml:241(title)
+#: faillog.5.xml:89(title) expiry.1.xml:120(title) chsh.1.xml:173(title)
+#: chpasswd.8.xml:269(title) chgpasswd.8.xml:224(title) chfn.1.xml:207(title)
+#: chage.1.xml:293(title)
 msgid "SEE ALSO"
 msgstr "VEDERE ANCHE"
 
 # type: Plain text
-#: vipw.8.xml:192(para)
+#: vipw.8.xml:208(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -435,25 +506,26 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: usermod.8.xml:41(refentrytitle) usermod.8.xml:46(refname)
-#: usermod.8.xml:52(command) login.defs.5.xml:468(term)
+#: usermod.8.xml:42(refentrytitle) usermod.8.xml:49(refname)
+#: usermod.8.xml:55(command) login.defs.5.xml:471(term)
 msgid "usermod"
 msgstr "usermod"
 
 # type: Plain text
-#: usermod.8.xml:47(refpurpose)
+#: usermod.8.xml:50(refpurpose)
 msgid "modify a user account"
 msgstr "modifica l'account di un utente"
 
 # type: TH
-#: usermod.8.xml:56(replaceable) userdel.8.xml:56(replaceable)
-#: useradd.8.xml:66(replaceable) passwd.1.xml:60(replaceable)
-#: chsh.1.xml:56(replaceable) chage.1.xml:53(replaceable)
+#: usermod.8.xml:59(replaceable) userdel.8.xml:59(replaceable)
+#: useradd.8.xml:69(replaceable) passwd.1.xml:63(replaceable)
+#: chsh.1.xml:59(replaceable) chfn.1.xml:59(replaceable)
+#: chage.1.xml:56(replaceable)
 msgid "LOGIN"
 msgstr "LOGIN"
 
 # type: Plain text
-#: usermod.8.xml:62(para)
+#: usermod.8.xml:65(para)
 msgid ""
 "The <command>usermod</command> command modifies the system account files to "
 "reflect the changes that are specified on the command line."
@@ -463,17 +535,17 @@
 "comando."
 
 # type: TP
-#: usermod.8.xml:70(para)
+#: usermod.8.xml:73(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:76(term)
+#: usermod.8.xml:79(term)
 msgid "<option>-a</option>, <option>--append</option>"
 msgstr "<option>-a</option>, <option>--append</option>"
 
 # type: IP
-#: usermod.8.xml:80(para)
+#: usermod.8.xml:83(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -482,14 +554,14 @@
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
 # type: TP
-#: usermod.8.xml:87(term) useradd.8.xml:128(term)
+#: usermod.8.xml:90(term) useradd.8.xml:131(term)
 msgid ""
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:92(para)
+#: usermod.8.xml:95(para)
 msgid ""
 "The new value of the user's password file comment field. It is normally "
 "modified using the <citerefentry><refentrytitle>chfn</"
@@ -500,20 +572,20 @@
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
 # type: TP
-#: usermod.8.xml:101(term) useradd.8.xml:141(term)
+#: usermod.8.xml:104(term) useradd.8.xml:144(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:106(para)
+#: usermod.8.xml:109(para)
 #, fuzzy
 msgid "The user's new login directory."
 msgstr "- una home directory valida"
 
 # type: Plain text
-#: usermod.8.xml:109(para)
+#: usermod.8.xml:112(para)
 #, fuzzy
 #| msgid ""
 #| "The user's new login directory. If the <option>-m</option> option is "
@@ -529,14 +601,14 @@
 "home directory, che viene creata se non esiste già."
 
 # type: TP
-#: usermod.8.xml:118(term) useradd.8.xml:168(term) useradd.8.xml:526(term)
+#: usermod.8.xml:121(term) useradd.8.xml:171(term) useradd.8.xml:542(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:123(para) useradd.8.xml:173(para)
+#: usermod.8.xml:126(para) useradd.8.xml:176(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>."
@@ -544,15 +616,38 @@
 "La data in cui l'account dell'utente verrà disabilitato. La data è "
 "specificata nel formato <emphasis remap=\"I\">MM/GG/AA</emphasis>."
 
+#: usermod.8.xml:130(para)
+msgid ""
+"An empty <replaceable>EXPIRE_DATE</replaceable> argument will disable the "
+"expiration of the account."
+msgstr ""
+
+# type: Plain text
+#: usermod.8.xml:134(para) usermod.8.xml:156(para)
+#, fuzzy
+#| 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>."
+msgid ""
+"This option requires a <filename>/etc/shadow</filename> file. A <filename>/"
+"etc/shadow</filename> entry will be created if there were none."
+msgstr ""
+"Questi quattro programmi agiscono tutti sui file normali e oscurati "
+"(shadow)  delle password e dei gruppi: <filename>/etc/passwd</filename>, "
+"<filename>/etc/group</filename>, <filename>/etc/shadow</filename> e "
+"<filename>/etc/gshadow</filename>."
+
 # type: TP
-#: usermod.8.xml:130(term) useradd.8.xml:186(term) useradd.8.xml:539(term)
+#: usermod.8.xml:142(term) useradd.8.xml:189(term) useradd.8.xml:555(term)
 msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:135(para)
+#: usermod.8.xml:147(para)
 #, fuzzy
 #| msgid ""
 #| "The number of days after a password has expired before the account will "
@@ -565,7 +660,7 @@
 "venga disabilitato."
 
 # type: Plain text
-#: usermod.8.xml:139(para)
+#: usermod.8.xml:151(para)
 #, fuzzy
 #| msgid ""
 #| "The number of days after a password expires until the account is "
@@ -582,13 +677,13 @@
 "caratteristica. Il valore predefinito è -1."
 
 # type: IP
-#: usermod.8.xml:147(term) useradd.8.xml:206(term) useradd.8.xml:555(term)
+#: usermod.8.xml:164(term) useradd.8.xml:209(term) useradd.8.xml:571(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:152(para)
+#: usermod.8.xml:169(para)
 #, fuzzy
 #| msgid ""
 #| "The group name or number of the user's initial login group. The group "
@@ -601,19 +696,19 @@
 "gruppo deve esistere. Un numero di gruppo deve riferirsi ad un gruppo già "
 "esistente."
 
-#: usermod.8.xml:156(para)
+#: usermod.8.xml:173(para)
 msgid ""
 "Any file from the user's home directory owned by the previous primary group "
 "of the user will be owned by this new group."
 msgstr ""
 
-#: usermod.8.xml:160(para)
+#: usermod.8.xml:177(para)
 msgid ""
 "The group ownership of files outside of the user's home directory must be "
 "fixed manually."
 msgstr ""
 
-#: usermod.8.xml:167(term) useradd.8.xml:234(term)
+#: usermod.8.xml:184(term) useradd.8.xml:237(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -621,7 +716,7 @@
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:172(para)
+#: usermod.8.xml:189(para)
 #, fuzzy
 #| msgid ""
 #| "A list of supplementary groups which the user is also a member of. Each "
@@ -642,7 +737,7 @@
 "l'utente appartenga solo al gruppo iniziale."
 
 # type: Plain text
-#: usermod.8.xml:179(para)
+#: usermod.8.xml:196(para)
 #, fuzzy
 msgid ""
 "If the user is currently a member of a group which is not listed, the user "
@@ -657,20 +752,20 @@
 "gruppo che non è elencato, l'utente verrà rimosso dal gruppo."
 
 # type: IP
-#: usermod.8.xml:188(term)
+#: usermod.8.xml:205(term)
 msgid ""
 "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:193(para)
+#: usermod.8.xml:210(para)
 #, fuzzy
 msgid ""
 "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."
+"particular, the user's home directory or mail spool should probably be "
+"renamed 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 "
@@ -678,18 +773,18 @@
 "di login."
 
 # type: IP
-#: usermod.8.xml:203(term)
+#: usermod.8.xml:220(term)
 msgid "<option>-L</option>, <option>--lock</option>"
 msgstr "<option>-L</option>, <option>--lock</option>"
 
-#: usermod.8.xml:207(para)
+#: usermod.8.xml:224(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:213(para)
+#: usermod.8.xml:230(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 "
@@ -697,18 +792,18 @@
 msgstr ""
 
 # type: IP
-#: usermod.8.xml:222(term)
+#: usermod.8.xml:239(term)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "<option>-m</option>, <option>--move-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: usermod.8.xml:226(para)
+#: usermod.8.xml:243(para)
 msgid "Move the content of the user's home directory to the new location."
 msgstr ""
 
 # type: IP
-#: usermod.8.xml:230(para)
+#: usermod.8.xml:247(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -716,7 +811,7 @@
 "<option>--home</option>) option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: usermod.8.xml:234(para)
+#: usermod.8.xml:251(para)
 msgid ""
 "<command>usermod</command> will try to adapt the ownership of the files and "
 "to copy the modes, ACL and extended attributes, but manual changes might be "
@@ -724,62 +819,62 @@
 msgstr ""
 
 # type: TP
-#: usermod.8.xml:242(term) useradd.8.xml:374(term) groupmod.8.xml:116(term)
-#: groupadd.8.xml:134(term)
+#: usermod.8.xml:259(term) useradd.8.xml:377(term) groupmod.8.xml:123(term)
+#: groupadd.8.xml:136(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
-#: usermod.8.xml:246(para)
+#: usermod.8.xml:263(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:253(term) useradd.8.xml:386(term) groupmod.8.xml:127(term)
-#: groupadd.8.xml:144(term)
+#: usermod.8.xml:270(term) useradd.8.xml:389(term) groupmod.8.xml:134(term)
+#: groupadd.8.xml:146(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:258(para) groupmod.8.xml:132(para)
+#: usermod.8.xml:275(para) groupmod.8.xml:139(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
 msgstr ""
 
-#: usermod.8.xml:263(para) useradd.8.xml:396(para) groupmod.8.xml:137(para)
-#: groupadd.8.xml:154(para)
+#: usermod.8.xml:280(para) useradd.8.xml:399(para) groupmod.8.xml:144(para)
+#: groupadd.8.xml:156(para)
 msgid ""
 "<emphasis role=\"bold\">Note:</emphasis> This option is not recommended "
 "because the password (or encrypted password) will be visible by users "
 "listing the processes."
 msgstr ""
 
-#: usermod.8.xml:268(para)
+#: usermod.8.xml:285(para)
 msgid ""
 "The password will be written in the local <filename>/etc/passwd</filename> "
 "or <filename>/etc/shadow</filename> file. This might differ from the "
 "password database configured in your PAM configuration."
 msgstr ""
 
-#: usermod.8.xml:274(para) useradd.8.xml:401(para) groupmod.8.xml:142(para)
-#: groupadd.8.xml:159(para)
+#: usermod.8.xml:291(para) useradd.8.xml:404(para) groupmod.8.xml:149(para)
+#: groupadd.8.xml:161(para)
 msgid ""
 "You should make sure the password respects the system's password policy."
 msgstr ""
 
 # type: TP
-#: usermod.8.xml:281(term) useradd.8.xml:435(term) useradd.8.xml:576(term)
-#: su.1.xml:157(term) chsh.1.xml:85(term)
+#: usermod.8.xml:311(term) useradd.8.xml:451(term) useradd.8.xml:592(term)
+#: su.1.xml:167(term) chsh.1.xml:101(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:286(para) chsh.1.xml:89(para)
+#: usermod.8.xml:316(para) chsh.1.xml:105(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."
@@ -788,17 +883,17 @@
 "si fa in modo che il sistema selezioni la shell di connessione predefinita."
 
 # type: TP
-#: usermod.8.xml:293(term) useradd.8.xml:450(term)
+#: usermod.8.xml:323(term) useradd.8.xml:466(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 
-#: usermod.8.xml:298(para)
+#: usermod.8.xml:328(para)
 msgid "The new numerical value of the user's ID."
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:301(para)
+#: usermod.8.xml:331(para)
 #, fuzzy
 #| msgid ""
 #| "The numerical value of the user's ID. This value must be unique, unless "
@@ -819,7 +914,7 @@
 "sistema."
 
 # type: Plain text
-#: usermod.8.xml:307(para)
+#: usermod.8.xml:337(para)
 #, fuzzy
 #| msgid ""
 #| "The numerical value of the user's ID. This value must be unique, unless "
@@ -842,25 +937,25 @@
 "dell'utente avranno l'ID utente del file cambiato automaticamente. I file "
 "fuori della home directory dell'utente devono essere modificati manualmente."
 
-#: usermod.8.xml:312(para)
+#: usermod.8.xml:342(para)
 msgid ""
 "The ownership of files outside of the user's home directory must be fixed "
 "manually."
 msgstr ""
 
 # type: IP
-#: usermod.8.xml:319(term)
+#: usermod.8.xml:349(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:323(para)
+#: usermod.8.xml:353(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:328(para)
+#: usermod.8.xml:358(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 "
@@ -869,7 +964,7 @@
 msgstr ""
 
 # type: IP
-#: usermod.8.xml:339(term) useradd.8.xml:482(term)
+#: usermod.8.xml:369(term) useradd.8.xml:498(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
@@ -881,7 +976,7 @@
 "<option>-u</option>, <option>--user</option> <replaceable>LOGIN</replaceable>"
 
 # type: Plain text
-#: usermod.8.xml:344(para)
+#: usermod.8.xml:374(para)
 #, fuzzy
 #| msgid ""
 #| "The name of the user's new login shell. Setting this field to blank "
@@ -894,16 +989,16 @@
 "si fa in modo che il sistema selezioni la shell di connessione predefinita."
 
 # type: SH
-#: usermod.8.xml:355(title) userdel.8.xml:225(title) useradd.8.xml:605(title)
-#: su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
-#: newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title)
-#: groupdel.8.xml:65(title) groupadd.8.xml:223(title) gpasswd.1.xml:214(title)
-#: faillog.8.xml:199(title) chpasswd.8.xml:199(title)
-#: chgpasswd.8.xml:157(title)
+#: usermod.8.xml:385(title) userdel.8.xml:241(title) useradd.8.xml:621(title)
+#: su.1.xml:312(title) shadow.3.xml:199(title) passwd.1.xml:354(title)
+#: newusers.8.xml:330(title) login.1.xml:241(title) lastlog.8.xml:178(title)
+#: groupdel.8.xml:98(title) groupadd.8.xml:238(title) gpasswd.1.xml:232(title)
+#: faillog.8.xml:218(title) chpasswd.8.xml:215(title)
+#: chgpasswd.8.xml:173(title)
 msgid "CAVEATS"
 msgstr "AVVISI/CAVEAT"
 
-#: usermod.8.xml:356(para)
+#: usermod.8.xml:386(para)
 msgid ""
 "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, the "
@@ -912,13 +1007,13 @@
 "is logged in according to utmp on other architectures."
 msgstr ""
 
-#: usermod.8.xml:364(para)
+#: usermod.8.xml:394(para)
 msgid ""
 "You must change the owner of any <command>crontab</command> files or "
 "<command>at</command> jobs manually."
 msgstr ""
 
-#: usermod.8.xml:368(para)
+#: usermod.8.xml:398(para)
 msgid "You must make any changes involving NIS on the NIS server."
 msgstr ""
 
@@ -1066,7 +1161,7 @@
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:420(para)
+#: usermod.8.xml:450(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1104,18 +1199,18 @@
 "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: userdel.8.xml:43(refentrytitle) userdel.8.xml:48(refname)
-#: userdel.8.xml:53(command) login.defs.5.xml:458(term)
+#: userdel.8.xml:44(refentrytitle) userdel.8.xml:51(refname)
+#: userdel.8.xml:56(command) login.defs.5.xml:461(term)
 msgid "userdel"
 msgstr "userdel"
 
 # type: Plain text
-#: userdel.8.xml:49(refpurpose)
+#: userdel.8.xml:52(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:63(para)
+#: userdel.8.xml:66(para)
 #, fuzzy
 msgid ""
 "The <command>userdel</command> command modifies the system account files, "
@@ -1127,16 +1222,16 @@
 "\">login_name</emphasis>. L'utente nominato deve esistere."
 
 # type: TP
-#: userdel.8.xml:72(para)
+#: userdel.8.xml:75(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:77(term) groupadd.8.xml:79(term)
+#: userdel.8.xml:80(term) groupadd.8.xml:81(term) expiry.1.xml:84(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option>"
 
-#: userdel.8.xml:81(para)
+#: userdel.8.xml:84(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 "
@@ -1148,19 +1243,19 @@
 "it is still the primary group of another user."
 msgstr ""
 
-#: userdel.8.xml:94(para)
+#: userdel.8.xml:97(para)
 msgid ""
 "<emphasis>Note:</emphasis> This option is dangerous and may leave your "
 "system in an inconsistent state."
 msgstr ""
 
 # type: IP
-#: userdel.8.xml:107(term)
+#: userdel.8.xml:110(term)
 msgid "<option>-r</option>, <option>--remove</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
 # type: Plain text
-#: userdel.8.xml:111(para)
+#: userdel.8.xml:114(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 "
@@ -1170,7 +1265,7 @@
 "directory stessa. I file collocati in altri file system dovranno essere "
 "ricercati e rimossi manualmente."
 
-#: userdel.8.xml:117(para)
+#: userdel.8.xml:120(para)
 msgid ""
 "The mail spool is defined by the <option>MAIL_DIR</option> variable in the "
 "<filename>login.defs</filename> file."
@@ -1250,123 +1345,123 @@
 "the user."
 msgstr ""
 
-#: userdel.8.xml:153(filename) useradd.8.xml:694(filename)
-#: su.1.xml:353(filename) pwconv.8.xml:190(filename)
-#: passwd.1.xml:389(filename) newusers.8.xml:384(filename)
-#: login.access.5.xml:99(filename) login.1.xml:367(filename)
-#: groupadd.8.xml:214(filename) chsh.1.xml:148(filename)
-#: chpasswd.8.xml:238(filename) chgpasswd.8.xml:199(filename)
-#: chfn.1.xml:116(filename)
+#: userdel.8.xml:169(filename) useradd.8.xml:710(filename)
+#: su.1.xml:363(filename) pwconv.8.xml:235(filename)
+#: passwd.1.xml:405(filename) newusers.8.xml:402(filename)
+#: login.access.5.xml:105(filename) login.1.xml:370(filename)
+#: groupadd.8.xml:229(filename) chsh.1.xml:164(filename)
+#: chpasswd.8.xml:254(filename) chgpasswd.8.xml:215(filename)
+#: chfn.1.xml:192(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:155(para) useradd.8.xml:696(para) su.1.xml:355(para)
-#: pwconv.8.xml:192(para) passwd.1.xml:391(para) newusers.8.xml:386(para)
-#: login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:216(para)
-#: chsh.1.xml:150(para) chpasswd.8.xml:240(para) chgpasswd.8.xml:201(para)
-#: chfn.1.xml:118(para)
+#: userdel.8.xml:171(para) useradd.8.xml:712(para) su.1.xml:365(para)
+#: pwconv.8.xml:237(para) passwd.1.xml:407(para) newusers.8.xml:404(para)
+#: login.access.5.xml:107(para) login.1.xml:372(para) groupadd.8.xml:231(para)
+#: chsh.1.xml:166(para) chpasswd.8.xml:256(para) chgpasswd.8.xml:217(para)
+#: chfn.1.xml:194(para)
 msgid "Shadow password suite configuration."
 msgstr ""
 
 # type: SH
-#: userdel.8.xml:174(title) useradd.8.xml:703(title) su.1.xml:362(title)
-#: pwck.8.xml:271(title) passwd.1.xml:404(title) grpck.8.xml:209(title)
-#: groupmod.8.xml:182(title) groupdel.8.xml:107(title)
-#: groupadd.8.xml:245(title) chage.1.xml:244(title)
+#: userdel.8.xml:190(title) useradd.8.xml:719(title) su.1.xml:372(title)
+#: pwck.8.xml:275(title) passwd.1.xml:420(title) grpck.8.xml:227(title)
+#: groupmod.8.xml:208(title) groupdel.8.xml:140(title)
+#: groupadd.8.xml:260(title) chage.1.xml:260(title)
 msgid "EXIT VALUES"
 msgstr "VALORI RESTITUITI"
 
 # type: IP
-#: userdel.8.xml:179(replaceable) useradd.8.xml:708(replaceable)
-#: su.1.xml:381(replaceable) pwck.8.xml:276(replaceable)
-#: passwd.1.xml:409(replaceable) grpck.8.xml:214(replaceable)
-#: groupmod.8.xml:187(replaceable) groupdel.8.xml:112(replaceable)
-#: groupadd.8.xml:250(replaceable) chage.1.xml:249(replaceable)
+#: userdel.8.xml:195(replaceable) useradd.8.xml:724(replaceable)
+#: su.1.xml:391(replaceable) pwck.8.xml:280(replaceable)
+#: passwd.1.xml:425(replaceable) grpck.8.xml:232(replaceable)
+#: groupmod.8.xml:213(replaceable) groupdel.8.xml:145(replaceable)
+#: groupadd.8.xml:265(replaceable) chage.1.xml:265(replaceable)
 msgid "0"
 msgstr "0"
 
 # type: Plain text
-#: userdel.8.xml:181(para) useradd.8.xml:710(para) pwck.8.xml:278(para)
-#: passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para)
-#: groupdel.8.xml:114(para) groupadd.8.xml:252(para) chage.1.xml:251(para)
+#: userdel.8.xml:197(para) useradd.8.xml:726(para) pwck.8.xml:282(para)
+#: passwd.1.xml:427(para) grpck.8.xml:234(para) groupmod.8.xml:215(para)
+#: groupdel.8.xml:147(para) groupadd.8.xml:267(para) chage.1.xml:267(para)
 msgid "success"
 msgstr "successo"
 
 # type: IP
-#: userdel.8.xml:185(replaceable) useradd.8.xml:714(replaceable)
-#: su.1.xml:55(manvolnum) su.1.xml:387(replaceable) sg.1.xml:39(manvolnum)
-#: pwck.8.xml:282(replaceable) passwd.1.xml:45(manvolnum)
-#: passwd.1.xml:415(replaceable) newgrp.1.xml:39(manvolnum)
-#: login.1.xml:71(manvolnum) grpck.8.xml:220(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:39(manvolnum)
-#: chage.1.xml:255(replaceable)
+#: userdel.8.xml:201(replaceable) useradd.8.xml:730(replaceable)
+#: su.1.xml:56(manvolnum) su.1.xml:397(replaceable) sg.1.xml:40(manvolnum)
+#: pwck.8.xml:286(replaceable) passwd.1.xml:46(manvolnum)
+#: passwd.1.xml:431(replaceable) newgrp.1.xml:40(manvolnum)
+#: login.1.xml:72(manvolnum) grpck.8.xml:238(replaceable)
+#: groups.1.xml:39(manvolnum) gpasswd.1.xml:44(manvolnum)
+#: expiry.1.xml:43(manvolnum) chsh.1.xml:42(manvolnum)
+#: chfn.1.xml:42(manvolnum) chage.1.xml:40(manvolnum)
+#: chage.1.xml:271(replaceable)
 msgid "1"
 msgstr "1"
 
 # type: Plain text
-#: userdel.8.xml:187(para) useradd.8.xml:716(para)
+#: userdel.8.xml:203(para) useradd.8.xml:732(para)
 #, fuzzy
 msgid "can't update password file"
 msgstr "impossibile aggiornare i file delle password"
 
 # type: IP
-#: userdel.8.xml:191(replaceable) useradd.8.xml:720(replaceable)
-#: pwck.8.xml:288(replaceable) passwd.1.xml:421(replaceable)
-#: grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable)
-#: groupdel.8.xml:118(replaceable) groupadd.8.xml:256(replaceable)
-#: chage.1.xml:261(replaceable)
+#: userdel.8.xml:207(replaceable) useradd.8.xml:736(replaceable)
+#: pwck.8.xml:292(replaceable) passwd.1.xml:437(replaceable)
+#: grpck.8.xml:244(replaceable) groupmod.8.xml:219(replaceable)
+#: groupdel.8.xml:151(replaceable) groupadd.8.xml:271(replaceable)
+#: chage.1.xml:277(replaceable)
 msgid "2"
 msgstr "2"
 
 # type: Plain text
-#: userdel.8.xml:193(para) useradd.8.xml:722(para) pwck.8.xml:284(para)
-#: grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
-#: groupadd.8.xml:258(para) chage.1.xml:263(para)
+#: userdel.8.xml:209(para) useradd.8.xml:738(para) pwck.8.xml:288(para)
+#: grpck.8.xml:240(para) groupmod.8.xml:221(para) groupdel.8.xml:153(para)
+#: groupadd.8.xml:273(para) chage.1.xml:279(para)
 msgid "invalid command syntax"
 msgstr "sintassi del comando errata"
 
-#: userdel.8.xml:197(replaceable) useradd.8.xml:738(replaceable)
-#: pwck.8.xml:312(replaceable) passwd.1.xml:445(replaceable)
-#: groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
+#: userdel.8.xml:213(replaceable) useradd.8.xml:754(replaceable)
+#: pwck.8.xml:316(replaceable) passwd.1.xml:461(replaceable)
+#: groupmod.8.xml:237(replaceable) groupdel.8.xml:157(replaceable)
 msgid "6"
 msgstr "6"
 
 # type: Plain text
-#: userdel.8.xml:199(para)
+#: userdel.8.xml:215(para)
 msgid "specified user doesn't exist"
 msgstr "il gruppo specificato non esiste"
 
-#: userdel.8.xml:205(para)
+#: userdel.8.xml:221(para)
 msgid "user currently logged in"
 msgstr ""
 
 # type: IP
-#: userdel.8.xml:209(replaceable) useradd.8.xml:750(replaceable)
-#: groupmod.8.xml:223(replaceable) groupdel.8.xml:136(replaceable)
-#: groupadd.8.xml:280(replaceable)
+#: userdel.8.xml:225(replaceable) useradd.8.xml:766(replaceable)
+#: groupmod.8.xml:249(replaceable) groupdel.8.xml:169(replaceable)
+#: groupadd.8.xml:295(replaceable)
 msgid "10"
 msgstr "10"
 
 # type: Plain text
-#: userdel.8.xml:211(para) useradd.8.xml:752(para) groupmod.8.xml:225(para)
-#: groupdel.8.xml:138(para) groupadd.8.xml:282(para)
+#: userdel.8.xml:227(para) useradd.8.xml:768(para) groupmod.8.xml:251(para)
+#: groupdel.8.xml:171(para) groupadd.8.xml:297(para)
 msgid "can't update group file"
 msgstr "non è possibile aggiornare il file group"
 
 # type: IP
-#: userdel.8.xml:215(replaceable) useradd.8.xml:756(replaceable)
+#: userdel.8.xml:231(replaceable) useradd.8.xml:772(replaceable)
 msgid "12"
 msgstr "12"
 
 # type: Plain text
-#: userdel.8.xml:217(para)
+#: userdel.8.xml:233(para)
 msgid "can't remove home directory"
 msgstr ""
 
 # type: TP
-#: userdel.8.xml:175(para)
+#: userdel.8.xml:191(para)
 #, fuzzy
 msgid ""
 "The <command>userdel</command> command exits with the following values: "
@@ -1377,7 +1472,7 @@
 "#-#-#-#-#  grpck.8.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
-#: userdel.8.xml:226(para)
+#: userdel.8.xml:242(para)
 msgid ""
 "<command>userdel</command> will not allow you to remove an account if there "
 "are running processes which belong to this account. In that case, you may "
@@ -1387,7 +1482,7 @@
 msgstr ""
 
 # type: Plain text
-#: userdel.8.xml:233(para)
+#: userdel.8.xml:249(para)
 #, fuzzy
 #| msgid ""
 #| "You must manually check all file systems to insure that no files remain "
@@ -1400,7 +1495,7 @@
 "rimanga alcun file avente come ID di gruppo il gruppo specificato."
 
 # type: Plain text
-#: userdel.8.xml:237(para)
+#: userdel.8.xml:253(para)
 msgid ""
 "You may not remove any NIS attributes on a NIS client. This must be "
 "performed on the NIS server."
@@ -1408,7 +1503,7 @@
 "Non è possibile rimuovere nessun attributo NIS su un client NIS.  Questo "
 "deve essere fatto sul server NIS."
 
-#: userdel.8.xml:240(para)
+#: userdel.8.xml:256(para)
 msgid ""
 "If <option>USERGROUPS_ENAB</option> is defined to <emphasis remap=\"I\">yes</"
 "emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -1420,7 +1515,7 @@
 msgstr ""
 
 # type: Plain text
-#: userdel.8.xml:253(para)
+#: userdel.8.xml:269(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1454,25 +1549,25 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: useradd.8.xml:52(refentrytitle) useradd.8.xml:57(refname)
-#: useradd.8.xml:62(command) useradd.8.xml:69(command)
-#: useradd.8.xml:73(command) login.defs.5.xml:444(term)
+#: useradd.8.xml:53(refentrytitle) useradd.8.xml:60(refname)
+#: useradd.8.xml:65(command) useradd.8.xml:72(command)
+#: useradd.8.xml:76(command) login.defs.5.xml:447(term)
 msgid "useradd"
 msgstr "useradd"
 
 # type: Plain text
-#: useradd.8.xml:58(refpurpose)
+#: useradd.8.xml:61(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:70(arg) useradd.8.xml:74(arg)
+#: useradd.8.xml:73(arg) useradd.8.xml:77(arg)
 msgid "-D"
 msgstr "-D"
 
 # type: Plain text
-#: useradd.8.xml:83(para)
+#: useradd.8.xml:86(para)
 #, fuzzy
 msgid ""
 "When invoked without the <option>-D</option> option, the <command>useradd</"
@@ -1490,7 +1585,7 @@
 "iniziali, a seconda delle opzioni sulla linea di comando.  Le opzioni che si "
 "applicano al comando <command>useradd</command> sono"
 
-#: useradd.8.xml:92(para)
+#: useradd.8.xml:95(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 "
@@ -1498,18 +1593,18 @@
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:101(para)
+#: useradd.8.xml:104(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:105(term) useradd.8.xml:507(term)
+#: useradd.8.xml:108(term) useradd.8.xml:523(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
 msgstr ""
 
-#: useradd.8.xml:110(para)
+#: useradd.8.xml:113(para)
 msgid ""
 "The default base directory for the system if <option>-d</"
 "option><replaceable>HOME_DIR</replaceable> is not specified. "
@@ -1518,21 +1613,21 @@
 "<replaceable>BASE_DIR</replaceable> must exist."
 msgstr ""
 
-#: useradd.8.xml:118(para)
+#: useradd.8.xml:121(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:133(para)
+#: useradd.8.xml:136(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:146(para)
+#: useradd.8.xml:149(para)
 #, fuzzy
 msgid ""
 "The new user will be created using <replaceable>HOME_DIR</replaceable> as "
@@ -1548,19 +1643,19 @@
 "login."
 
 # type: IP
-#: useradd.8.xml:158(term)
+#: useradd.8.xml:161(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:162(para)
+#: useradd.8.xml:165(para)
 #, fuzzy
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr "Cambiare i valori predefiniti"
 
-#: useradd.8.xml:177(para)
+#: useradd.8.xml:180(para)
 msgid ""
 "If not specified, <command>useradd</command> will use the default expiry "
 "date specified by the <option>EXPIRE</option> variable in <filename>/etc/"
@@ -1568,7 +1663,7 @@
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:191(para)
+#: useradd.8.xml:194(para)
 #, fuzzy
 #| msgid ""
 #| "The number of days after a password expires until the account is "
@@ -1586,7 +1681,7 @@
 "caratteristica. Il valore predefinito è -1."
 
 # type: Plain text
-#: useradd.8.xml:197(para)
+#: useradd.8.xml:200(para)
 #, fuzzy
 #| msgid ""
 #| "The name of the user's login shell. The default is to leave this field "
@@ -1601,7 +1696,7 @@
 "connessione predefinita."
 
 # type: Plain text
-#: useradd.8.xml:211(para)
+#: useradd.8.xml:214(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."
@@ -1610,7 +1705,7 @@
 "gruppo deve esistere. Un numero di gruppo deve riferirsi ad un gruppo già "
 "esistente."
 
-#: useradd.8.xml:216(para)
+#: useradd.8.xml:219(para)
 msgid ""
 "If not specified, the behavior of <command>useradd</command> will depend on "
 "the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
@@ -1625,7 +1720,7 @@
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:239(para)
+#: useradd.8.xml:242(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. "
@@ -1640,7 +1735,7 @@
 "l'utente appartenga solo al gruppo iniziale."
 
 # type: IP
-#: useradd.8.xml:256(term)
+#: useradd.8.xml:259(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
@@ -1651,7 +1746,7 @@
 msgstr ""
 "<option>-u</option>, <option>--user</option> <replaceable>LOGIN</replaceable>"
 
-#: useradd.8.xml:261(para)
+#: useradd.8.xml:264(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 "
@@ -1659,7 +1754,7 @@
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:266(para)
+#: useradd.8.xml:269(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -1667,24 +1762,24 @@
 "home</option>) option is specified."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:270(para)
+#: useradd.8.xml:273(para)
 msgid ""
 "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:276(para)
+#: useradd.8.xml:279(para)
 msgid "If possible, the ACLs and extended attributes are copied."
 msgstr ""
 
-#: useradd.8.xml:282(term) groupadd.8.xml:113(term)
+#: useradd.8.xml:285(term) groupadd.8.xml:115(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
 msgstr ""
 
-#: useradd.8.xml:287(para)
+#: useradd.8.xml:290(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (<option>UID_MIN</"
 "option>, <option>UID_MAX</option>, <option>UMASK</option>, "
@@ -1699,47 +1794,47 @@
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:311(term)
+#: useradd.8.xml:314(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:313(para)
+#: useradd.8.xml:316(para)
 msgid "Do not add the user to the lastlog and faillog databases."
 msgstr ""
 
-#: useradd.8.xml:316(para)
+#: useradd.8.xml:319(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:324(term)
+#: useradd.8.xml:327(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:328(para)
+#: useradd.8.xml:331(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:334(para)
+#: useradd.8.xml:337(para)
 msgid ""
 "By default, if this option is not specified and <option>CREATE_HOME</option> "
 "is not enabled, no home directories are created."
 msgstr ""
 
-#: useradd.8.xml:343(option)
+#: useradd.8.xml:346(option)
 #, fuzzy
 #| msgid "-"
 msgid "-M"
 msgstr "-"
 
-#: useradd.8.xml:346(para)
+#: useradd.8.xml:349(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 "
@@ -1747,20 +1842,20 @@
 msgstr ""
 
 # type: TP
-#: useradd.8.xml:355(term)
+#: useradd.8.xml:358(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:359(para)
+#: useradd.8.xml:362(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 "
 "<option>GROUP</option> variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:365(para) useradd.8.xml:473(para)
+#: useradd.8.xml:368(para) useradd.8.xml:489(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 "
@@ -1768,12 +1863,12 @@
 "filename>."
 msgstr ""
 
-#: useradd.8.xml:378(para)
+#: useradd.8.xml:381(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:379(para)
+#: useradd.8.xml:382(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -1781,7 +1876,7 @@
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
 # type: Plain text
-#: useradd.8.xml:391(para) groupadd.8.xml:149(para)
+#: useradd.8.xml:394(para) groupadd.8.xml:151(para)
 #, fuzzy
 #| msgid ""
 #| "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
@@ -1796,17 +1891,17 @@
 "in cui questa stringa viene interpretata."
 
 # type: IP
-#: useradd.8.xml:408(term) newusers.8.xml:263(term) groupadd.8.xml:166(term)
+#: useradd.8.xml:411(term) newusers.8.xml:268(term) groupadd.8.xml:168(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:412(para) newusers.8.xml:267(para)
+#: useradd.8.xml:415(para) newusers.8.xml:272(para)
 msgid "Create a system account."
 msgstr ""
 
-#: useradd.8.xml:415(para)
+#: useradd.8.xml:418(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are chosen in the "
@@ -1816,7 +1911,7 @@
 "the creation of groups)."
 msgstr ""
 
-#: useradd.8.xml:424(para)
+#: useradd.8.xml:427(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."
@@ -1826,7 +1921,7 @@
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:440(para)
+#: useradd.8.xml:456(para)
 #, fuzzy
 #| msgid ""
 #| "The name of the user's login shell. The default is to leave this field "
@@ -1842,7 +1937,7 @@
 "connessione predefinita."
 
 # type: Plain text
-#: useradd.8.xml:455(para)
+#: useradd.8.xml:471(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 "
@@ -1858,20 +1953,20 @@
 "sistema."
 
 # type: TP
-#: useradd.8.xml:465(term)
+#: useradd.8.xml:481(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:469(para)
+#: useradd.8.xml:485(para)
 msgid ""
 "Create a group with the same name as the user, and add the user to this "
 "group."
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:487(para)
+#: useradd.8.xml:503(para)
 #, fuzzy
 #| msgid ""
 #| "The name of the user's new login shell. Setting this field to blank "
@@ -1884,12 +1979,12 @@
 "si fa in modo che il sistema selezioni la shell di connessione predefinita."
 
 # type: SS
-#: useradd.8.xml:497(title)
+#: useradd.8.xml:513(title)
 msgid "Changing the default values"
 msgstr "Cambiare i valori predefiniti"
 
 # type: Plain text
-#: useradd.8.xml:498(para)
+#: useradd.8.xml:514(para)
 #, fuzzy
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
@@ -1902,7 +1997,7 @@
 "valori predefiniti dalla linea di comando. Le opzioni valide sono"
 
 # type: Plain text
-#: useradd.8.xml:512(para)
+#: useradd.8.xml:528(para)
 #, fuzzy
 msgid ""
 "The path prefix for a new user's home directory. The user's name will be "
@@ -1915,25 +2010,25 @@
 "nome della nuova directory se non viene usata l'opzione <option>-d</"
 "option>I< quando si crea un nuovo account.>"
 
-#: useradd.8.xml:519(para)
+#: useradd.8.xml:535(para)
 msgid ""
 "This option sets the <option>HOME</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:531(para)
+#: useradd.8.xml:547(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:532(para)
+#: useradd.8.xml:548(para)
 msgid ""
 "This option sets the <option>EXPIRE</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:544(para)
+#: useradd.8.xml:560(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
@@ -1941,13 +2036,13 @@
 "Il numero di giorni dopo la scadenza di una password prima che l'account "
 "venga disabilitato."
 
-#: useradd.8.xml:548(para)
+#: useradd.8.xml:564(para)
 msgid ""
 "This option sets the <option>INACTIVE</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:560(para)
+#: useradd.8.xml:576(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> "
@@ -1956,29 +2051,29 @@
 "have an existing entry."
 msgstr ""
 
-#: useradd.8.xml:569(para)
+#: useradd.8.xml:585(para)
 msgid ""
 "This option sets the <option>GROUP</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:581(para)
+#: useradd.8.xml:597(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
-#: useradd.8.xml:584(para)
+#: useradd.8.xml:600(para)
 msgid ""
 "This option sets the <option>SHELL</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
 # type: SH
-#: useradd.8.xml:596(title)
+#: useradd.8.xml:612(title)
 msgid "NOTES"
 msgstr "NOTE"
 
 # type: Plain text
-#: useradd.8.xml:597(para)
+#: useradd.8.xml:613(para)
 #, fuzzy
 #| msgid ""
 #| "The system administrator is responsible for placing the default user "
@@ -1993,7 +2088,7 @@
 "predefiniti degli utenti nella directory <filename>/etc/skel/</filename>."
 
 # type: Plain text
-#: useradd.8.xml:606(para)
+#: useradd.8.xml:622(para)
 #, fuzzy
 msgid ""
 "You may not add a user to a NIS or LDAP group. This must be performed on the "
@@ -2002,21 +2097,21 @@
 "Non è possibile aggiungere un utente ad un gruppo NIS. Questo deve essere "
 "fatto sul server NIS."
 
-#: useradd.8.xml:611(para)
+#: useradd.8.xml:627(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:617(para)
+#: useradd.8.xml:633(para)
 msgid ""
 "Usernames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
 "dollar sign. In regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 
-#: useradd.8.xml:623(para)
+#: useradd.8.xml:639(para)
 msgid "Usernames may only be up to 32 characters long."
 msgstr ""
 
@@ -2220,78 +2315,78 @@
 "valori predefiniti correnti."
 
 # type: Plain text
-#: useradd.8.xml:682(filename)
+#: useradd.8.xml:698(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
-#: useradd.8.xml:684(para)
+#: useradd.8.xml:700(para)
 msgid "Default values for account creation."
 msgstr ""
 
-#: useradd.8.xml:688(filename)
+#: useradd.8.xml:704(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
 # type: Plain text
-#: useradd.8.xml:690(para)
+#: useradd.8.xml:706(para)
 msgid "Directory containing default files."
 msgstr "Directory contenente i file predefiniti."
 
 # type: IP
-#: useradd.8.xml:726(replaceable) shadow.3.xml:35(manvolnum)
-#: pwck.8.xml:294(replaceable) passwd.1.xml:427(replaceable)
-#: grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable)
-#: groupadd.8.xml:262(replaceable)
+#: useradd.8.xml:742(replaceable) shadow.3.xml:39(manvolnum)
+#: pwck.8.xml:298(replaceable) passwd.1.xml:443(replaceable)
+#: grpck.8.xml:250(replaceable) groupmod.8.xml:225(replaceable)
+#: groupadd.8.xml:277(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:728(para) passwd.1.xml:447(para) groupmod.8.xml:201(para)
-#: groupadd.8.xml:264(para)
+#: useradd.8.xml:744(para) passwd.1.xml:463(para) groupmod.8.xml:227(para)
+#: groupadd.8.xml:279(para)
 msgid "invalid argument to option"
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:732(replaceable) pwck.8.xml:300(replaceable)
-#: passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable)
-#: groupmod.8.xml:205(replaceable) groupadd.8.xml:268(replaceable)
+#: useradd.8.xml:748(replaceable) pwck.8.xml:304(replaceable)
+#: passwd.1.xml:449(replaceable) grpck.8.xml:256(replaceable)
+#: groupmod.8.xml:231(replaceable) groupadd.8.xml:283(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:734(para)
+#: useradd.8.xml:750(para)
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:740(para) groupmod.8.xml:207(para) groupmod.8.xml:213(para)
-#: groupdel.8.xml:126(para)
+#: useradd.8.xml:756(para) groupmod.8.xml:233(para) groupmod.8.xml:239(para)
+#: groupdel.8.xml:159(para)
 msgid "specified group doesn't exist"
 msgstr "il gruppo specificato non esiste"
 
-#: useradd.8.xml:744(replaceable) groupmod.8.xml:217(replaceable)
-#: groupadd.8.xml:274(replaceable)
+#: useradd.8.xml:760(replaceable) groupmod.8.xml:243(replaceable)
+#: groupadd.8.xml:289(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:746(para)
+#: useradd.8.xml:762(para)
 msgid "username already in use"
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:758(para)
+#: useradd.8.xml:774(para)
 msgid "can't create home directory"
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:762(replaceable)
+#: useradd.8.xml:778(replaceable)
 msgid "13"
 msgstr "13"
 
-#: useradd.8.xml:764(para)
+#: useradd.8.xml:780(para)
 msgid "can't create mail spool"
 msgstr ""
 
 # type: TP
-#: useradd.8.xml:704(para)
+#: useradd.8.xml:720(para)
 #, fuzzy
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
@@ -2303,7 +2398,7 @@
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
 # type: Plain text
-#: useradd.8.xml:773(para)
+#: useradd.8.xml:789(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -2341,44 +2436,44 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
+#: suauth.5.xml:38(refentrytitle) suauth.5.xml:45(refname)
 msgid "suauth"
 msgstr "suauth"
 
 # type: IP
-#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
-#: pwck.8.xml:306(replaceable) porttime.5.xml:35(manvolnum)
-#: passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable)
-#: login.defs.5.xml:101(manvolnum) login.access.5.xml:36(manvolnum)
-#: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
-#: grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
+#: suauth.5.xml:39(manvolnum) shadow.5.xml:39(manvolnum)
+#: pwck.8.xml:310(replaceable) porttime.5.xml:39(manvolnum)
+#: passwd.5.xml:39(manvolnum) passwd.1.xml:455(replaceable)
+#: login.defs.5.xml:102(manvolnum) login.access.5.xml:40(manvolnum)
+#: limits.5.xml:40(manvolnum) gshadow.5.xml:38(manvolnum)
+#: grpck.8.xml:262(replaceable) faillog.5.xml:39(manvolnum)
 msgid "5"
 msgstr "5"
 
-#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo)
-#: porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo)
-#: login.defs.5.xml:102(refmiscinfo) login.access.5.xml:37(refmiscinfo)
-#: limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo)
-#: faillog.5.xml:36(refmiscinfo)
+#: suauth.5.xml:40(refmiscinfo) shadow.5.xml:40(refmiscinfo)
+#: porttime.5.xml:40(refmiscinfo) passwd.5.xml:40(refmiscinfo)
+#: login.defs.5.xml:103(refmiscinfo) login.access.5.xml:41(refmiscinfo)
+#: limits.5.xml:41(refmiscinfo) gshadow.5.xml:39(refmiscinfo)
+#: faillog.5.xml:40(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr ""
 
-#: suauth.5.xml:40(refpurpose)
+#: suauth.5.xml:46(refpurpose)
 msgid "detailed su control file"
 msgstr ""
 
-#: suauth.5.xml:45(command) suauth.5.xml:171(filename)
+#: suauth.5.xml:51(command) suauth.5.xml:177(filename)
 msgid "/etc/suauth"
 msgstr "/etc/suauth"
 
-#: suauth.5.xml:51(para)
+#: suauth.5.xml:57(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:58(literallayout)
+#: suauth.5.xml:64(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2387,18 +2482,18 @@
 msgstr ""
 
 #. .fi
-#: suauth.5.xml:62(para)
+#: suauth.5.xml:68(para)
 msgid ""
 "2) the user executing the su command (or any groups he might be a member of)"
 msgstr ""
 
-#: suauth.5.xml:67(para)
+#: suauth.5.xml:73(para)
 msgid ""
 "The file is formatted like this, with lines starting with a # being treated "
 "as comment lines and ignored;"
 msgstr ""
 
-#: suauth.5.xml:72(literallayout)
+#: suauth.5.xml:78(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2406,14 +2501,14 @@
 "    "
 msgstr ""
 
-#: suauth.5.xml:76(para)
+#: suauth.5.xml:82(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 \",\""
+"a list of usernames delimited by \",\"."
 msgstr ""
 
-#: suauth.5.xml:82(para)
+#: suauth.5.xml:88(para)
 msgid ""
 "from-id is formatted the same as to-id except the extra word "
 "<emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</"
@@ -2424,40 +2519,40 @@
 "manvolnum></citerefentry> is neccessary."
 msgstr ""
 
-#: suauth.5.xml:93(para)
+#: suauth.5.xml:99(para)
 msgid "Action can be one only of the following currently supported options."
 msgstr ""
 
-#: suauth.5.xml:99(emphasis)
+#: suauth.5.xml:105(emphasis)
 msgid "DENY"
 msgstr ""
 
-#: suauth.5.xml:102(para)
+#: suauth.5.xml:108(para)
 msgid "The attempt to su is stopped before a password is even asked for."
 msgstr ""
 
 # type: SH
-#: suauth.5.xml:109(emphasis)
+#: suauth.5.xml:115(emphasis)
 msgid "NOPASS"
 msgstr ""
 
-#: suauth.5.xml:112(para)
+#: suauth.5.xml:118(para)
 msgid ""
 "The attempt to su is automatically successful; no password is asked for."
 msgstr ""
 
 # type: TH
-#: suauth.5.xml:120(emphasis)
+#: suauth.5.xml:126(emphasis)
 msgid "OWNPASS"
 msgstr ""
 
-#: suauth.5.xml:123(para)
+#: suauth.5.xml:129(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:131(para)
+#: suauth.5.xml:137(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 "
@@ -2467,12 +2562,12 @@
 msgstr ""
 
 # type: SH
-#: suauth.5.xml:141(title)
+#: suauth.5.xml:147(title)
 #, fuzzy
 msgid "EXAMPLE"
 msgstr "ESEMPI"
 
-#: suauth.5.xml:142(literallayout)
+#: suauth.5.xml:148(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2500,11 +2595,11 @@
 msgstr ""
 
 # type: SH
-#: suauth.5.xml:178(title) pwconv.8.xml:153(title) login.defs.5.xml:488(title)
+#: suauth.5.xml:184(title) pwconv.8.xml:198(title) login.defs.5.xml:491(title)
 msgid "BUGS"
 msgstr "PROBLEMI"
 
-#: suauth.5.xml:179(para)
+#: suauth.5.xml:185(para)
 msgid ""
 "There could be plenty lurking. The file parser is particularly unforgiving "
 "about syntax errors, expecting no spurious whitespace (apart from beginning "
@@ -2512,12 +2607,12 @@
 msgstr ""
 
 # type: SH
-#: suauth.5.xml:188(title) shadow.3.xml:183(title)
+#: suauth.5.xml:194(title) shadow.3.xml:189(title)
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSTICA"
 
 # type: Plain text
-#: suauth.5.xml:189(para)
+#: suauth.5.xml:195(para)
 msgid ""
 "An error parsing the file is reported using "
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
@@ -2525,7 +2620,7 @@
 msgstr ""
 
 # type: Plain text
-#: suauth.5.xml:198(para)
+#: suauth.5.xml:204(para)
 msgid ""
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -2533,33 +2628,33 @@
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command)
-#: login.defs.5.xml:418(term)
+#: su.1.xml:55(refentrytitle) su.1.xml:62(refname) su.1.xml:67(command)
+#: login.defs.5.xml:421(term)
 msgid "su"
 msgstr "su"
 
-#: 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:40(refmiscinfo)
+#: su.1.xml:57(refmiscinfo) sg.1.xml:41(refmiscinfo)
+#: passwd.1.xml:47(refmiscinfo) newgrp.1.xml:41(refmiscinfo)
+#: login.1.xml:73(refmiscinfo) groups.1.xml:40(refmiscinfo)
+#: gpasswd.1.xml:45(refmiscinfo) expiry.1.xml:44(refmiscinfo)
+#: chsh.1.xml:43(refmiscinfo) chfn.1.xml:43(refmiscinfo)
+#: chage.1.xml:41(refmiscinfo)
 msgid "User Commands"
 msgstr ""
 
 # type: Plain text
-#: su.1.xml:60(refpurpose)
+#: su.1.xml:63(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)
+#: su.1.xml:73(replaceable) login.1.xml:88(replaceable)
+#: login.1.xml:96(replaceable)
 msgid "username"
 msgstr ""
 
 # type: Plain text
-#: su.1.xml:78(para)
+#: su.1.xml:81(para)
 #, fuzzy
 msgid ""
 "The <command>su</command> command is used to become another user during a "
@@ -2575,7 +2670,7 @@
 "che l'utente troverebbe se effettuasse il login direttamente."
 
 # type: Plain text
-#: su.1.xml:87(para)
+#: su.1.xml:90(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 "
@@ -2590,14 +2685,14 @@
 "eseguito dalla shell specificata in <filename>/etc/passwd</filename> per "
 "l'utente di destinazione."
 
-#: su.1.xml:96(para)
+#: su.1.xml:99(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:101(para)
+#: su.1.xml:104(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 "
@@ -2609,7 +2704,7 @@
 "abuso del sistema."
 
 # type: Plain text
-#: su.1.xml:106(para)
+#: su.1.xml:109(para)
 #, fuzzy
 msgid ""
 "The current environment is passed to the new shell. The value of <envar>"
@@ -2627,7 +2722,7 @@
 "emphasis> in <filename>/etc/login.defs</filename>."
 
 # type: Plain text
-#: su.1.xml:115(para) login.1.xml:166(para)
+#: su.1.xml:118(para) login.1.xml:169(para)
 #, fuzzy
 msgid ""
 "A subsystem login is indicated by the presence of a \"*\" as the first "
@@ -2644,12 +2739,12 @@
 "di un nuovo file system al quale l'utente accede."
 
 # type: TP
-#: su.1.xml:124(para)
+#: su.1.xml:127(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:128(term)
+#: su.1.xml:131(term)
 #, fuzzy
 msgid ""
 "<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
@@ -2658,62 +2753,68 @@
 "<option>-c</option>, <option>--command</option><replaceable>SHELL</"
 "replaceable>"
 
-#: su.1.xml:133(para)
+#: su.1.xml:136(para)
 msgid ""
 "Specify a command that will be invoked by the shell using its <option>-c</"
 "option>."
 msgstr ""
 
+#: su.1.xml:140(para)
+msgid ""
+"The executed command will have no controlling terminal. This option cannot "
+"be used to execute interractive programs which need a controlling TTY."
+msgstr ""
+
 # type: TP
-#: su.1.xml:140(term)
+#: su.1.xml:150(term)
 msgid "<option>-</option>, <option>-l</option>, <option>--login</option>"
 msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
 
-#: su.1.xml:144(para)
+#: su.1.xml:154(para)
 msgid ""
 "Provide an environment similar to what the user would expect had the user "
 "logged in directly."
 msgstr ""
 
-#: su.1.xml:148(para)
+#: su.1.xml:158(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:162(para)
+#: su.1.xml:172(para)
 msgid "The shell that will be invoked."
 msgstr ""
 
-#: su.1.xml:170(para)
+#: su.1.xml:180(para)
 msgid "The shell specified with --shell."
 msgstr ""
 
-#: su.1.xml:173(para)
+#: su.1.xml:183(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
 msgstr ""
 
-#: su.1.xml:180(para)
+#: su.1.xml:190(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
 msgstr ""
 
-#: su.1.xml:186(para)
+#: su.1.xml:196(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
 msgstr ""
 
-#: su.1.xml:163(para)
+#: su.1.xml:173(para)
 msgid ""
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:191(para)
+#: su.1.xml:201(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>/"
@@ -2723,7 +2824,7 @@
 msgstr ""
 
 # type: IP
-#: su.1.xml:202(term)
+#: su.1.xml:212(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2731,59 +2832,59 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:211(envar)
+#: su.1.xml:221(envar)
 msgid "$PATH"
 msgstr ""
 
-#: su.1.xml:213(para)
+#: su.1.xml:223(para)
 msgid ""
 "reset according to the <filename>/etc/login.defs</filename> options "
 "<option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
 msgstr ""
 
-#: su.1.xml:222(envar)
+#: su.1.xml:232(envar)
 msgid "$IFS"
 msgstr ""
 
-#: su.1.xml:224(para)
+#: su.1.xml:234(para)
 msgid ""
 "reset to <quote><space><tab><newline></quote>, if it was "
 "set."
 msgstr ""
 
 # type: Plain text
-#: su.1.xml:207(para)
+#: su.1.xml:217(para)
 #, fuzzy
 msgid "Preserve the current environment, except for: <placeholder-1/>"
 msgstr "Non modifica l'ambiente."
 
-#: su.1.xml:233(para)
+#: su.1.xml:243(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:242(para)
+#: su.1.xml:252(para)
 msgid ""
 "The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, "
 "<envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> "
 "environment variables are reset."
 msgstr ""
 
-#: su.1.xml:251(para)
+#: su.1.xml:261(para)
 msgid ""
 "If <option>--login</option> is not used, the environment is copied, except "
 "for the variables above."
 msgstr ""
 
-#: su.1.xml:258(para)
+#: su.1.xml:268(para)
 msgid ""
 "If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>"
 "$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> "
 "environment variables are copied if they were set."
 msgstr ""
 
-#: su.1.xml:268(para)
+#: su.1.xml:278(para)
 msgid ""
 "If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</"
 "envar>, and <envar>$MAIL</envar> environment variables are set according to "
@@ -2792,24 +2893,24 @@
 "option> (see below)."
 msgstr ""
 
-#: su.1.xml:281(para)
+#: su.1.xml:291(para)
 msgid ""
 "If <option>--login</option> is used, other environment variables might be "
 "set by the <option>ENVIRON_FILE</option> file (see below)."
 msgstr ""
 
-#: su.1.xml:289(para)
+#: su.1.xml:299(para)
 msgid "Other environments might be set by PAM modules."
 msgstr ""
 
-#: su.1.xml:237(para)
+#: su.1.xml:247(para)
 msgid ""
 "Note that the default behavior for the environment is the following: "
 "<placeholder-1/>"
 msgstr ""
 
 # type: Plain text
-#: su.1.xml:303(para)
+#: su.1.xml:313(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -2861,7 +2962,7 @@
 #: 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."
+"is no."
 msgstr ""
 
 #: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
@@ -2971,7 +3072,7 @@
 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."
+"will not be translated."
 msgstr ""
 
 #: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
@@ -3004,7 +3105,9 @@
 msgstr "<option>-c </option>I<commento>"
 
 #: 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."
+msgid ""
+"Enable setting of resource limits from <filename>/etc/limits</filename> and "
+"ulimit, umask, and niceness from the user's passwd gecos field."
 msgstr ""
 
 # type: IP
@@ -3058,44 +3161,44 @@
 "sulog file logging."
 msgstr ""
 
-#: su.1.xml:363(para)
+#: su.1.xml:373(para)
 msgid ""
 "On success, <command>su</command> returns the exit value of the command it "
 "executed."
 msgstr ""
 
-#: su.1.xml:367(para)
+#: su.1.xml:377(para)
 msgid ""
 "If this command was terminated by a signal, <command>su</command> returns "
 "the number of this signal plus 128."
 msgstr ""
 
-#: su.1.xml:371(para)
+#: su.1.xml:381(para)
 msgid ""
 "If su has to kill the command (because it was asked to terminate, and the "
 "command did not terminate in time), <command>su</command> returns 255."
 msgstr ""
 
 # type: IP
-#: su.1.xml:383(para)
+#: su.1.xml:393(para)
 #, fuzzy
 #| msgid "<option>-d</option> I<lastday>"
 msgid "success (<option>--help</option> only)"
 msgstr "<option>-d</option> I<ultimo_giorno>"
 
-#: su.1.xml:389(para)
+#: su.1.xml:399(para)
 msgid "System or authentication failure"
 msgstr ""
 
 # type: IP
-#: su.1.xml:393(replaceable)
+#: su.1.xml:403(replaceable)
 #, fuzzy
 #| msgid "12"
 msgid "126"
 msgstr "12"
 
 # type: Plain text
-#: su.1.xml:395(para)
+#: su.1.xml:405(para)
 #, fuzzy
 msgid "The requested command was not found"
 msgstr ""
@@ -3105,24 +3208,24 @@
 "sg - esegue un comando con un diverso ID di gruppo"
 
 # type: IP
-#: su.1.xml:399(replaceable)
+#: su.1.xml:409(replaceable)
 #, fuzzy
 #| msgid "12"
 msgid "127"
 msgstr "12"
 
-#: su.1.xml:401(para)
+#: su.1.xml:411(para)
 msgid "The requested command could not be executed"
 msgstr ""
 
-#: su.1.xml:376(para)
+#: su.1.xml:386(para)
 msgid ""
 "Some exit values from <command>su</command> are independent from the "
 "executed command: <placeholder-1/>"
 msgstr ""
 
 # type: Plain text
-#: su.1.xml:410(para)
+#: su.1.xml:420(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
@@ -3139,12 +3242,12 @@
 "citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command)
+#: sg.1.xml:39(refentrytitle) sg.1.xml:46(refname) sg.1.xml:52(command)
 msgid "sg"
 msgstr "sg"
 
 # type: Plain text
-#: sg.1.xml:44(refpurpose)
+#: sg.1.xml:47(refpurpose)
 #, fuzzy
 msgid "execute command as different group ID"
 msgstr ""
@@ -3153,20 +3256,20 @@
 "#-#-#-#-#  newgrp.1.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "sg - esegue un comando con un diverso ID di gruppo"
 
-#: sg.1.xml:50(arg) newgrp.1.xml:49(arg)
+#: sg.1.xml:53(arg) newgrp.1.xml:52(arg)
 msgid "-"
 msgstr "-"
 
-#: sg.1.xml:52(arg) expiry.1.xml:53(arg)
+#: sg.1.xml:55(arg)
 msgid "-c"
 msgstr "-c"
 
-#: sg.1.xml:51(arg)
+#: sg.1.xml:54(arg)
 msgid "group <placeholder-1/> command"
 msgstr ""
 
 # type: Plain text
-#: sg.1.xml:60(para)
+#: sg.1.xml:63(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/"
@@ -3200,7 +3303,7 @@
 msgstr ""
 
 # type: Plain text
-#: sg.1.xml:119(para)
+#: sg.1.xml:122(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -3238,21 +3341,20 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
-#: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
-#: pwck.8.xml:63(replaceable) pwck.8.xml:78(replaceable)
-#: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
+#: shadow.5.xml:38(refentrytitle) shadow.5.xml:45(refname)
+#: shadow.3.xml:38(refentrytitle) shadow.3.xml:45(refname)
+#: pwck.8.xml:65(replaceable) grpck.8.xml:57(replaceable)
 msgid "shadow"
 msgstr "shadow"
 
 # type: Plain text
-#: shadow.5.xml:40(refpurpose)
+#: shadow.5.xml:46(refpurpose)
 #, fuzzy
 msgid "shadowed password file"
 msgstr "impossibile aprire i file delle password"
 
 # type: Plain text
-#: shadow.5.xml:45(para)
+#: shadow.5.xml:51(para)
 #, fuzzy
 #| msgid ""
 #| "<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
@@ -3267,7 +3369,7 @@
 "informazioni sulla durata delle password. Sono inclusi:"
 
 # type: Plain text
-#: shadow.5.xml:51(para) gshadow.5.xml:49(para)
+#: shadow.5.xml:57(para) gshadow.5.xml:55(para)
 #, fuzzy
 msgid ""
 "This file must not be readable by regular users if password security is to "
@@ -3280,23 +3382,23 @@
 "Questo file non deve essere leggibile dagli utenti se si vuole mantenere la "
 "sicurezza delle password."
 
-#: shadow.5.xml:56(para)
+#: shadow.5.xml:62(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)
+#: shadow.5.xml:69(emphasis) passwd.5.xml:59(para)
 msgid "login name"
 msgstr "nome di login"
 
-#: shadow.5.xml:65(para)
+#: shadow.5.xml:71(para)
 msgid "It must be a valid account name, which exist on the system."
 msgstr ""
 
 # type: Plain text
-#: shadow.5.xml:71(emphasis) gshadow.5.xml:68(emphasis)
+#: shadow.5.xml:77(emphasis) gshadow.5.xml:74(emphasis)
 #, fuzzy
 msgid "encrypted password"
 msgstr ""
@@ -3306,7 +3408,7 @@
 "Password cifrata"
 
 # type: Plain text
-#: shadow.5.xml:73(para) gshadow.5.xml:70(para)
+#: shadow.5.xml:79(para) gshadow.5.xml:76(para)
 msgid ""
 "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry> for details on how this string is interpreted."
@@ -3316,7 +3418,7 @@
 "in cui questa stringa viene interpretata."
 
 # type: Plain text
-#: shadow.5.xml:78(para)
+#: shadow.5.xml:84(para)
 #, fuzzy
 msgid ""
 "If the password field contains some string that is not a valid result of "
@@ -3330,7 +3432,7 @@
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> senza la password, i non-membri devono fornire la password."
 
-#: shadow.5.xml:85(para)
+#: shadow.5.xml:91(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 "
@@ -3338,7 +3440,7 @@
 "access at all if the password field is empty."
 msgstr ""
 
-#: shadow.5.xml:92(para) gshadow.5.xml:92(para)
+#: shadow.5.xml:98(para) gshadow.5.xml:98(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 "
@@ -3346,7 +3448,7 @@
 msgstr ""
 
 # type: Plain text
-#: shadow.5.xml:102(emphasis)
+#: shadow.5.xml:108(emphasis)
 #, fuzzy
 msgid "date of last password change"
 msgstr ""
@@ -3355,79 +3457,79 @@
 "#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Giorni prima dei quali la password non può essere cambiata"
 
-#: shadow.5.xml:105(para)
+#: shadow.5.xml:111(para)
 msgid ""
 "The date of the last password change, expressed as the number of days since "
 "Jan 1, 1970."
 msgstr ""
 
-#: shadow.5.xml:109(para)
+#: shadow.5.xml:115(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:114(para)
+#: shadow.5.xml:120(para)
 msgid "An empty field means that password aging features are disabled."
 msgstr ""
 
 # type: SS
-#: shadow.5.xml:121(emphasis)
+#: shadow.5.xml:127(emphasis)
 #, fuzzy
 #| msgid "Password Changes"
 msgid "minimum password age"
 msgstr "Modifiche delle password"
 
-#: shadow.5.xml:123(para)
+#: shadow.5.xml:129(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)
+#: shadow.5.xml:134(para)
 msgid "An empty field and value 0 mean that there are no minimum password age."
 msgstr ""
 
 # type: SS
-#: shadow.5.xml:135(emphasis)
+#: shadow.5.xml:141(emphasis)
 #, fuzzy
 #| msgid "Password Changes"
 msgid "maximum password age"
 msgstr "Modifiche delle password"
 
-#: shadow.5.xml:137(para)
+#: shadow.5.xml:143(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)
+#: shadow.5.xml:147(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)
+#: shadow.5.xml:152(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)
+#: shadow.5.xml:157(para)
 msgid ""
 "If the maximum password age is lower than the minimum password age, the user "
 "cannot change her password."
 msgstr ""
 
 # type: SS
-#: shadow.5.xml:159(emphasis)
+#: shadow.5.xml:165(emphasis)
 #, fuzzy
 #| msgid "Password Changes"
 msgid "password warning period"
 msgstr "Modifiche delle password"
 
 # type: Plain text
-#: shadow.5.xml:162(para)
+#: shadow.5.xml:168(para)
 #, fuzzy
 #| msgid ""
 #| "The number of days after a password has expired before the account will "
@@ -3439,96 +3541,96 @@
 "Il numero di giorni dopo la scadenza di una password prima che l'account "
 "venga disabilitato."
 
-#: shadow.5.xml:167(para)
+#: shadow.5.xml:173(para)
 msgid ""
 "An empty field and value 0 mean that there are no password warning period."
 msgstr ""
 
-#: shadow.5.xml:175(emphasis)
+#: shadow.5.xml:181(emphasis)
 msgid "password inactivity period"
 msgstr ""
 
-#: shadow.5.xml:178(para)
+#: shadow.5.xml:184(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)
+#: shadow.5.xml:190(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)
+#: shadow.5.xml:195(para)
 msgid ""
 "An empty field means that there are no enforcement of an inactivity period."
 msgstr ""
 
 # type: Plain text
-#: shadow.5.xml:197(emphasis)
+#: shadow.5.xml:203(emphasis)
 #, fuzzy
 #| msgid "User account information."
 msgid "account expiration date"
 msgstr "informazioni sugli account utente."
 
-#: shadow.5.xml:200(para)
+#: shadow.5.xml:206(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)
+#: shadow.5.xml:210(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)
+#: shadow.5.xml:216(para)
 msgid "An empty field means that the account will never expire."
 msgstr ""
 
-#: shadow.5.xml:213(para)
+#: shadow.5.xml:219(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:221(emphasis)
+#: shadow.5.xml:227(emphasis)
 #, fuzzy
 #| msgid "a reserved field"
 msgid "reserved field"
 msgstr "Campo riservato"
 
 # type: Plain text
-#: shadow.5.xml:223(para)
+#: shadow.5.xml:229(para)
 #, fuzzy
 #| msgid "sp_flag - reserved for future use"
 msgid "This field is reserved for future use."
 msgstr "sp_flag - riservato per uso futuro."
 
-#: shadow.5.xml:245(filename)
+#: shadow.5.xml:251(filename)
 #, fuzzy
 #| msgid "/etc/shadow"
 msgid "/etc/shadow-"
 msgstr "/etc/shadow"
 
-#: shadow.5.xml:247(para)
+#: shadow.5.xml:253(para)
 msgid "Backup file for /etc/shadow."
 msgstr ""
 
-#: shadow.5.xml:248(para) passwd.5.xml:134(para)
+#: shadow.5.xml:254(para) passwd.5.xml:140(para)
 msgid ""
 "Note that this file is used by the tools of the shadow toolsuite, but not by "
 "all user and password management tools."
 msgstr ""
 
 # type: Plain text
-#: shadow.5.xml:259(para)
+#: shadow.5.xml:265(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
@@ -3576,99 +3678,99 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>"
 
-#: shadow.3.xml:36(refmiscinfo)
+#: shadow.3.xml:40(refmiscinfo)
 msgid "Library Calls"
 msgstr ""
 
-#: shadow.3.xml:40(refname)
+#: shadow.3.xml:46(refname)
 msgid "getspnam"
 msgstr "getspnam"
 
 # type: Plain text
-#: shadow.3.xml:41(refpurpose)
+#: shadow.3.xml:47(refpurpose)
 msgid "encrypted password file routines"
 msgstr "gestione del file delle password cifrate"
 
 # type: SH
-#: shadow.3.xml:45(title)
+#: shadow.3.xml:51(title)
 msgid "SYNTAX"
 msgstr "SINTASSI"
 
-#: shadow.3.xml:47(emphasis)
+#: shadow.3.xml:53(emphasis)
 msgid "#include <shadow.h>"
 msgstr "#include <shadow.h>"
 
 # type: Plain text
-#: shadow.3.xml:51(emphasis)
+#: shadow.3.xml:57(emphasis)
 msgid "struct spwd *getspent();"
 msgstr "struct spwd *getspent();"
 
 # type: Plain text
-#: shadow.3.xml:55(emphasis)
+#: shadow.3.xml:61(emphasis)
 msgid "struct spwd *getspnam(char"
 msgstr "struct spwd *getspnam(char"
 
-#: shadow.3.xml:56(emphasis)
+#: shadow.3.xml:62(emphasis)
 msgid "*name"
 msgstr ""
 
-#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis)
-#: shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:62(emphasis) shadow.3.xml:75(emphasis)
+#: shadow.3.xml:80(emphasis) shadow.3.xml:86(emphasis)
 msgid ");"
 msgstr ");"
 
 # type: Plain text
-#: shadow.3.xml:60(emphasis)
+#: shadow.3.xml:66(emphasis)
 msgid "void setspent();"
 msgstr "void setspent();"
 
 # type: Plain text
-#: shadow.3.xml:64(emphasis)
+#: shadow.3.xml:70(emphasis)
 msgid "void endspent();"
 msgstr "void endspent();"
 
 # type: Plain text
-#: shadow.3.xml:68(emphasis)
+#: shadow.3.xml:74(emphasis)
 msgid "struct spwd *fgetspent(FILE"
 msgstr "struct spwd *fgetspent(FILE"
 
-#: shadow.3.xml:69(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:75(emphasis) shadow.3.xml:86(emphasis)
 msgid "*fp"
 msgstr "*fp"
 
 # type: Plain text
-#: shadow.3.xml:73(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "struct spwd *sgetspent(char"
 msgstr "struct spwd *sgetspent(char"
 
-#: shadow.3.xml:74(emphasis)
+#: shadow.3.xml:80(emphasis)
 msgid "*cp"
 msgstr "*cp"
 
-#: shadow.3.xml:78(emphasis)
+#: shadow.3.xml:84(emphasis)
 msgid "int putspent(struct spwd"
 msgstr "int putspent(struct spwd"
 
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "*p,"
 msgstr "*p,"
 
 # type: SH
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 #, fuzzy
 msgid "FILE"
 msgstr "FILE"
 
-#: shadow.3.xml:84(emphasis)
+#: shadow.3.xml:90(emphasis)
 msgid "int lckpwdf();"
 msgstr "int lckpwdf();"
 
-#: shadow.3.xml:88(emphasis)
+#: shadow.3.xml:94(emphasis)
 msgid "int ulckpwdf();"
 msgstr "int ulckpwdf();"
 
 # type: Plain text
-#: shadow.3.xml:94(para)
+#: shadow.3.xml:100(para)
 #, fuzzy
 msgid ""
 "<emphasis remap=\"I\">shadow</emphasis> manipulates the contents of the "
@@ -3678,7 +3780,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:99(programlisting)
+#: shadow.3.xml:105(programlisting)
 #, no-wrap
 msgid ""
 "struct spwd {\n"
@@ -3699,42 +3801,42 @@
 "    "
 
 # type: Plain text
-#: shadow.3.xml:111(para)
+#: shadow.3.xml:117(para)
 msgid "The meanings of each field are:"
 msgstr "Ciascun campo significa:"
 
 # type: Plain text
-#: shadow.3.xml:114(para)
+#: shadow.3.xml:120(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:117(para)
+#: shadow.3.xml:123(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:120(para)
+#: shadow.3.xml:126(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:123(para)
+#: shadow.3.xml:129(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:126(para)
+#: shadow.3.xml:132(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:129(para)
+#: shadow.3.xml:135(para)
 msgid ""
 "sp_warn - days before password is to expire that user is warned of pending "
 "password expiration"
@@ -3743,7 +3845,7 @@
 "avvertito."
 
 # type: Plain text
-#: shadow.3.xml:134(para)
+#: shadow.3.xml:140(para)
 msgid ""
 "sp_inact - days after password expires that account is considered inactive "
 "and disabled"
@@ -3752,19 +3854,19 @@
 "considerato inattivo e disabilitato."
 
 # type: Plain text
-#: shadow.3.xml:139(para)
+#: shadow.3.xml:145(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:142(para)
+#: shadow.3.xml:148(para)
 msgid "sp_flag - reserved for future use"
 msgstr "sp_flag - riservato per uso futuro."
 
 # type: Plain text
-#: shadow.3.xml:150(para)
+#: shadow.3.xml:156(para)
 #, fuzzy
 msgid ""
 "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, "
@@ -3789,7 +3891,7 @@
 "posizione corrente nel file."
 
 # type: Plain text
-#: shadow.3.xml:163(para)
+#: shadow.3.xml:169(para)
 msgid ""
 "<emphasis>setspent</emphasis> and <emphasis>endspent</emphasis> may be used "
 "to begin and end, respectively, access to the shadow password file."
@@ -3799,7 +3901,7 @@
 "password."
 
 # type: Plain text
-#: shadow.3.xml:169(para)
+#: shadow.3.xml:175(para)
 msgid ""
 "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines "
 "should be used to insure exclusive access to the <filename>/etc/shadow</"
@@ -3821,7 +3923,7 @@
 "entrambi i lock."
 
 # type: Plain text
-#: shadow.3.xml:184(para)
+#: shadow.3.xml:190(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 "
@@ -3833,7 +3935,7 @@
 "errore."
 
 # type: Plain text
-#: shadow.3.xml:194(para)
+#: shadow.3.xml:200(para)
 #, fuzzy
 msgid ""
 "These routines may only be used by the superuser as access to the shadow "
@@ -3843,7 +3945,7 @@
 "l'accesso al file delle shadow password è riservato."
 
 # type: Plain text
-#: shadow.3.xml:214(para)
+#: shadow.3.xml:220(para)
 msgid ""
 "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -3853,32 +3955,32 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: pwconv.8.xml:43(refentrytitle) pwconv.8.xml:48(refname)
-#: pwconv.8.xml:57(command) login.defs.5.xml:401(term)
+#: pwconv.8.xml:44(refentrytitle) pwconv.8.xml:51(refname)
+#: pwconv.8.xml:60(command) login.defs.5.xml:404(term)
 msgid "pwconv"
 msgstr "pwconv"
 
-#: pwconv.8.xml:49(refname) pwconv.8.xml:60(command)
-#: login.defs.5.xml:410(term)
+#: pwconv.8.xml:52(refname) pwconv.8.xml:66(command)
+#: login.defs.5.xml:413(term)
 msgid "pwunconv"
 msgstr "pwunconv"
 
-#: pwconv.8.xml:50(refname) pwconv.8.xml:63(command)
-#: login.defs.5.xml:314(term)
+#: pwconv.8.xml:53(refname) pwconv.8.xml:72(command)
+#: login.defs.5.xml:317(term)
 msgid "grpconv"
 msgstr "grpconv"
 
-#: pwconv.8.xml:51(refname) pwconv.8.xml:66(command)
-#: login.defs.5.xml:320(term)
+#: pwconv.8.xml:54(refname) pwconv.8.xml:78(command)
+#: login.defs.5.xml:323(term)
 msgid "grpunconv"
 msgstr "grpunconv"
 
 # type: Plain text
-#: pwconv.8.xml:52(refpurpose)
+#: pwconv.8.xml:55(refpurpose)
 msgid "convert to and from shadow passwords and groups"
 msgstr "convertono a e da password e gruppi shadow."
 
-#: pwconv.8.xml:72(para)
+#: pwconv.8.xml:87(para)
 #, fuzzy
 msgid ""
 "The <command>pwconv</command> command creates <emphasis remap=\"I\">shadow</"
@@ -3889,7 +3991,7 @@
 "<emphasis remap=\"I\">passwd</emphasis> e, in modo opzionale, da un "
 "preesistente <emphasis remap=\"I\">shadow</emphasis>."
 
-#: pwconv.8.xml:77(para)
+#: pwconv.8.xml:92(para)
 msgid ""
 "<command>pwconv</command> does not work with <option>USE_TCB</option> "
 "enabled. To convert to tcb passwords, you should first use <command>pwconv</"
@@ -3899,7 +4001,7 @@
 "in <filename>login.defs</filename>.)"
 msgstr ""
 
-#: pwconv.8.xml:87(para)
+#: pwconv.8.xml:102(para)
 #, fuzzy
 msgid ""
 "The <command>pwunconv</command> command creates <emphasis remap=\"I"
@@ -3912,7 +4014,7 @@
 "\">shadow</emphasis> and then removes <emphasis remap=\"I\">shadow</"
 "emphasis>."
 
-#: pwconv.8.xml:93(para)
+#: pwconv.8.xml:108(para)
 msgid ""
 "<command>pwunconv</command> does not work with <option>USE_TCB</option> "
 "enabled. You should first switch back from tcb to shadowed passwords using "
@@ -3920,7 +4022,7 @@
 "in <filename>login.defs</filename> before using <command>pwunconv</command>."
 msgstr ""
 
-#: pwconv.8.xml:102(para)
+#: pwconv.8.xml:117(para)
 #, fuzzy
 msgid ""
 "The <command>grpconv</command> command creates <emphasis remap=\"I"
@@ -3931,7 +4033,7 @@
 "<emphasis remap=\"I\">group</emphasis> e, in modo opzionale, da un "
 "preesistente <emphasis remap=\"I\">gshadow</emphasis>."
 
-#: pwconv.8.xml:108(para)
+#: pwconv.8.xml:123(para)
 #, fuzzy
 msgid ""
 "The <command>grpunconv</command> command creates <emphasis remap=\"I"
@@ -3944,7 +4046,7 @@
 "emphasis> e quindi rimuove <emphasis remap=\"I\">gshadow</emphasis>."
 
 # type: Plain text
-#: pwconv.8.xml:115(para)
+#: pwconv.8.xml:130(para)
 msgid ""
 "These four programs all operate on the normal and shadow password and group "
 "files: <filename>/etc/passwd</filename>, <filename>/etc/group</filename>, "
@@ -3956,7 +4058,7 @@
 "<filename>/etc/gshadow</filename>."
 
 # type: Plain text
-#: pwconv.8.xml:122(para)
+#: pwconv.8.xml:137(para)
 msgid ""
 "Each program acquires the necessary locks before conversion. "
 "<command>pwconv</command> and <command>grpconv</command> are similar. First, "
@@ -3978,7 +4080,7 @@
 "principale viene editato a mano."
 
 # type: Plain text
-#: pwconv.8.xml:133(para)
+#: pwconv.8.xml:148(para)
 #, fuzzy
 msgid ""
 "<command>pwconv</command> will use the values of <emphasis remap=\"I"
@@ -3991,7 +4093,7 @@
 "quando si aggiungono nuove voci a <filename>/etc/shadow</filename>."
 
 # type: Plain text
-#: pwconv.8.xml:142(para)
+#: pwconv.8.xml:157(para)
 msgid ""
 "Likewise <command>pwunconv</command> and <command>grpunconv</command> are "
 "similar. Passwords in the main file are updated from the shadowed file. "
@@ -4007,29 +4109,38 @@
 "informazioni sull'invecchiamento delle password vengono perse da "
 "<command>pwunconv</command>. Convertirà solo quello che potrà."
 
-#: pwconv.8.xml:154(para)
+# type: Plain text
+#: pwconv.8.xml:169(para)
+#, fuzzy
 msgid ""
+"The options which apply to the <command>pwconv</command>, <command>pwunconv</"
+"command>, <command>grpconv</command>, and <command>grpunconv</command> "
+"commands are:"
+msgstr "Il comando <command>chage</command> accetta le seguenti opzioni:"
+
+#: pwconv.8.xml:199(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. "
 "Please run <command>pwck</command> and <command>grpck</command> to correct "
 "any such errors before converting to or from shadow passwords or groups."
 msgstr ""
 
-#: pwconv.8.xml:165(para)
+#: pwconv.8.xml:210(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:173(para)
+#: pwconv.8.xml:218(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:200(para)
+#: pwconv.8.xml:245(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
@@ -4059,40 +4170,26 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: pwck.8.xml:43(refentrytitle) pwck.8.xml:48(refname) pwck.8.xml:54(command)
-#: pwck.8.xml:69(command) login.defs.5.xml:392(term)
+#: pwck.8.xml:44(refentrytitle) pwck.8.xml:51(refname) pwck.8.xml:57(command)
+#: login.defs.5.xml:395(term)
 msgid "pwck"
 msgstr "pwck"
 
 # type: Plain text
-#: pwck.8.xml:49(refpurpose)
+#: pwck.8.xml:52(refpurpose)
 #, fuzzy
 msgid "verify integrity of password files"
 msgstr "verifica l'integrità dei file delle password"
 
-#: pwck.8.xml:55(arg) pwck.8.xml:70(arg) pwck.8.xml:177(option)
-msgid "-q"
-msgstr "-q"
-
-#: pwck.8.xml:56(arg) pwck.8.xml:198(option) grpck.8.xml:58(arg)
-#: grpck.8.xml:149(option)
-msgid "-s"
-msgstr "-s"
-
-#: pwck.8.xml:59(replaceable) pwck.8.xml:74(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:381(term)
+#: pwck.8.xml:61(replaceable) passwd.5.xml:38(refentrytitle)
+#: passwd.5.xml:45(refname) passwd.1.xml:45(refentrytitle)
+#: passwd.1.xml:52(refname) passwd.1.xml:58(command)
+#: login.defs.5.xml:384(term)
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:71(arg) pwck.8.xml:188(option) login.1.xml:222(option)
-#: grpck.8.xml:49(arg) grpck.8.xml:139(option)
-msgid "-r"
-msgstr "-r"
-
 # type: Plain text
-#: pwck.8.xml:87(para)
+#: pwck.8.xml:74(para)
 #, fuzzy
 msgid ""
 "The <command>pwck</command> command verifies the integrity of the users and "
@@ -4111,75 +4208,75 @@
 "hanno altri errori impossibili da correggere."
 
 # type: Plain text
-#: pwck.8.xml:99(para) grpck.8.xml:80(para)
+#: pwck.8.xml:86(para) grpck.8.xml:75(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:102(para) grpck.8.xml:84(para)
+#: pwck.8.xml:89(para) grpck.8.xml:79(para)
 msgid "the correct number of fields"
 msgstr "il corretto numero di campi"
 
 # type: Plain text
-#: pwck.8.xml:105(para)
+#: pwck.8.xml:92(para)
 #, fuzzy
 #| msgid "a unique user name"
 msgid "a unique and valid user name"
 msgstr "un nome utente univoco"
 
 # type: Plain text
-#: pwck.8.xml:108(para)
+#: pwck.8.xml:95(para)
 msgid "a valid user and group identifier"
 msgstr "identificatori validi dell'utente e del gruppo"
 
 # type: Plain text
-#: pwck.8.xml:111(para)
+#: pwck.8.xml:98(para)
 msgid "a valid primary group"
 msgstr "un gruppo primario valido"
 
 # type: Plain text
-#: pwck.8.xml:114(para)
+#: pwck.8.xml:101(para)
 msgid "a valid home directory"
 msgstr "una home directory valida"
 
 # type: Plain text
-#: pwck.8.xml:117(para)
+#: pwck.8.xml:104(para)
 msgid "a valid login shell"
 msgstr "una shell di login valida"
 
-#: pwck.8.xml:121(para)
+#: pwck.8.xml:108(para)
 msgid ""
 "<filename>shadow</filename> checks are enabled when a second file parameter "
 "is specified or when <filename>/etc/shadow</filename> exists on the system."
 msgstr ""
 
-#: pwck.8.xml:126(para)
+#: pwck.8.xml:113(para)
 msgid "These checks are the following:"
 msgstr ""
 
-#: pwck.8.xml:131(para)
+#: pwck.8.xml:118(para)
 msgid ""
 "every passwd entry has a matching shadow entry, and every shadow entry has a "
 "matching passwd entry"
 msgstr ""
 
-#: pwck.8.xml:137(para)
+#: pwck.8.xml:124(para)
 msgid "passwords are specified in the shadowed file"
 msgstr ""
 
 # type: Plain text
-#: pwck.8.xml:140(para)
+#: pwck.8.xml:127(para)
 #, fuzzy
 #| msgid "the correct number of fields"
 msgid "shadow entries have the correct number of fields"
 msgstr "il corretto numero di campi"
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:130(para)
 msgid "shadow entries are unique in shadow"
 msgstr ""
 
 # type: Plain text
-#: pwck.8.xml:146(para)
+#: pwck.8.xml:133(para)
 #, fuzzy
 msgid "the last password changes are not in the future"
 msgstr ""
@@ -4189,7 +4286,7 @@
 "Giorni prima dei quali la password non può essere cambiata"
 
 # type: Plain text
-#: pwck.8.xml:150(para)
+#: pwck.8.xml:137(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 "
@@ -4209,7 +4306,7 @@
 "<command>usermod</command> per correggerli."
 
 # type: Plain text
-#: pwck.8.xml:161(para)
+#: pwck.8.xml:148(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> "
@@ -4220,35 +4317,59 @@
 "<command>pwck</command> per rimuovere la voce scorretta."
 
 # type: Plain text
-#: pwck.8.xml:171(para)
+#: pwck.8.xml:158(para) grpck.8.xml:129(para)
+#, fuzzy
+msgid ""
+"The <option>-r</option> and <option>-s</option> options cannot be combined."
+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."
+
+# type: Plain text
+#: pwck.8.xml:162(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:180(para)
+#: pwck.8.xml:175(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
 msgstr ""
 
+# type: IP
+#: pwck.8.xml:182(term) grpck.8.xml:144(term)
+#, fuzzy
+#| msgid "<option>-r</option>, <option>--remove</option>"
+msgid "<option>-r</option>, <option>--read-only</option>"
+msgstr "<option>-r</option>, <option>--remove</option>"
+
 # type: TP
-#: pwck.8.xml:191(para)
+#: pwck.8.xml:184(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr ""
 
-#: pwck.8.xml:201(para)
+# type: IP
+#: pwck.8.xml:203(term) grpck.8.xml:167(term)
+#, fuzzy
+#| msgid "<option>-s</option>, <option>--shadow</option>"
+msgid "<option>-s</option>, <option>--sort</option>"
+msgstr "<option>-s</option>, <option>--shadow</option>"
+
+#: pwck.8.xml:205(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
 msgstr ""
 
 # type: IP
-#: pwck.8.xml:205(para)
+#: pwck.8.xml:209(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "This option has no effect when <option>USE_TCB</option> is enabled."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: pwck.8.xml:212(para)
+#: pwck.8.xml:216(para)
 #, fuzzy
 #| msgid ""
 #| "By default, <command>pwck</command> operates on the files <filename>/etc/"
@@ -4267,7 +4388,7 @@
 "L'utente può selezionare file alternativi con i parametri <emphasis remap=\"I"
 "\">passwd</emphasis> e <emphasis remap=\"I\">shadow</emphasis>."
 
-#: pwck.8.xml:221(para)
+#: pwck.8.xml:225(para)
 msgid ""
 "Note that when <option>USE_TCB</option> is enabled, you cannot specify an "
 "alternative <replaceable>shadow</replaceable> file. In future releases, this "
@@ -4275,34 +4396,34 @@
 msgstr ""
 
 # type: Plain text
-#: pwck.8.xml:290(para)
+#: pwck.8.xml:294(para)
 msgid "one or more bad password entries"
 msgstr "una o più voci di password conengono errori"
 
 # type: Plain text
-#: pwck.8.xml:296(para)
+#: pwck.8.xml:300(para)
 msgid "can't open password files"
 msgstr "impossibile aprire i file delle password"
 
 # type: Plain text
-#: pwck.8.xml:302(para)
+#: pwck.8.xml:306(para)
 msgid "can't lock password files"
 msgstr "impossibile fare il lock dei file delle password"
 
 # type: Plain text
-#: pwck.8.xml:308(para)
+#: pwck.8.xml:312(para)
 msgid "can't update password files"
 msgstr "impossibile aggiornare i file delle password"
 
 # type: Plain text
-#: pwck.8.xml:314(para)
+#: pwck.8.xml:318(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:272(para)
+#: pwck.8.xml:276(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4311,7 +4432,7 @@
 "<placeholder-1/>"
 
 # type: Plain text
-#: pwck.8.xml:323(para)
+#: pwck.8.xml:327(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
@@ -4341,17 +4462,17 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
+#: porttime.5.xml:38(refentrytitle) porttime.5.xml:45(refname)
 msgid "porttime"
 msgstr "porttime"
 
 # type: Plain text
-#: porttime.5.xml:40(refpurpose)
+#: porttime.5.xml:46(refpurpose)
 msgid "port access time file"
 msgstr "file delle porte e degli orari d'accesso"
 
 # type: Plain text
-#: porttime.5.xml:45(para)
+#: porttime.5.xml:51(para)
 msgid ""
 "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, "
 "user names, and permitted login times."
@@ -4360,7 +4481,7 @@
 "nomi utente e orari di accesso permessi."
 
 # type: Plain text
-#: porttime.5.xml:50(para)
+#: porttime.5.xml:56(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 "
@@ -4377,7 +4498,7 @@
 "separati da virgole, in cui è consentito l'accesso."
 
 # type: Plain text
-#: porttime.5.xml:59(para)
+#: porttime.5.xml:65(para)
 msgid ""
 "Each access time entry consists of zero or more days of the week, "
 "abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</"
@@ -4397,12 +4518,12 @@
 "specifica alcun giorno, viene usato implicitamente <emphasis>Al</emphasis>."
 
 # type: SH
-#: porttime.5.xml:73(title)
+#: porttime.5.xml:79(title)
 msgid "EXAMPLES"
 msgstr "ESEMPI"
 
 # type: Plain text
-#: porttime.5.xml:74(para)
+#: porttime.5.xml:80(para)
 msgid ""
 "The following entry allows access to user <emphasis remap=\"B\">jfh</"
 "emphasis> on every port during weekdays from 9am to 5pm."
@@ -4411,12 +4532,12 @@
 "emphasis> da qualsiasi porta durante i giorni lavorativi dalle 9 alle 17."
 
 # type: Plain text
-#: porttime.5.xml:80(para)
+#: porttime.5.xml:86(para)
 msgid "*:jfh:Wk0900-1700"
 msgstr "*:jfh:Wk0900-1700"
 
 # type: Plain text
-#: porttime.5.xml:82(para)
+#: porttime.5.xml:88(para)
 #, fuzzy
 msgid ""
 "The following entries allow access only to the users <emphasis>root</"
@@ -4433,7 +4554,7 @@
 
 # type: Plain text
 # no-wrap
-#: porttime.5.xml:91(programlisting)
+#: porttime.5.xml:97(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -4447,7 +4568,7 @@
 "    "
 
 # type: Plain text
-#: porttime.5.xml:96(para)
+#: porttime.5.xml:102(para)
 #, fuzzy
 msgid ""
 "The following entry allows access for the user <emphasis>games</emphasis> on "
@@ -4457,21 +4578,21 @@
 "durante gli orari non lavorativi."
 
 # type: Plain text
-#: porttime.5.xml:101(para)
+#: porttime.5.xml:107(para)
 msgid "*:games:Wk1700-0900,SaSu0000-2400"
 msgstr "*:games:Wk1700-0900,SaSu0000-2400"
 
-#: porttime.5.xml:108(filename) logoutd.8.xml:67(filename)
+#: porttime.5.xml:114(filename) logoutd.8.xml:73(filename)
 msgid "/etc/porttime"
 msgstr "/etc/porttime"
 
-#: porttime.5.xml:110(para) logoutd.8.xml:69(para)
+#: porttime.5.xml:116(para) logoutd.8.xml:75(para)
 #, fuzzy
 msgid "File containing port access."
 msgstr "file contenente le porte e gli orari di accesso"
 
 # type: Plain text
-#: porttime.5.xml:118(para) login.access.5.xml:109(para)
+#: porttime.5.xml:124(para) login.access.5.xml:115(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -4480,19 +4601,19 @@
 "citerefentry>."
 
 # type: Plain text
-#: passwd.5.xml:40(refpurpose)
+#: passwd.5.xml:46(refpurpose)
 #, fuzzy
 msgid "the password file"
 msgstr "impossibile aprire i file delle password"
 
-#: passwd.5.xml:45(para)
+#: passwd.5.xml:51(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:56(para)
+#: passwd.5.xml:62(para)
 #, fuzzy
 msgid "optional encrypted password"
 msgstr ""
@@ -4501,31 +4622,31 @@
 "#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Password cifrata"
 
-#: passwd.5.xml:59(para)
+#: passwd.5.xml:65(para)
 msgid "numerical user ID"
 msgstr ""
 
-#: passwd.5.xml:62(para)
+#: passwd.5.xml:68(para)
 msgid "numerical group ID"
 msgstr ""
 
 # type: Plain text
-#: passwd.5.xml:65(para)
+#: passwd.5.xml:71(para)
 #, fuzzy
 msgid "user name or comment field"
 msgstr "Il campo commento del nuovo utente nel file password."
 
 # type: Plain text
-#: passwd.5.xml:68(para)
+#: passwd.5.xml:74(para)
 #, fuzzy
 msgid "user home directory"
 msgstr "- una home directory valida"
 
-#: passwd.5.xml:71(para)
+#: passwd.5.xml:77(para)
 msgid "optional user command interpreter"
 msgstr ""
 
-#: passwd.5.xml:75(para)
+#: passwd.5.xml:81(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 "
@@ -4544,21 +4665,21 @@
 msgstr ""
 
 # type: Plain text
-#: passwd.5.xml:94(para)
+#: passwd.5.xml:100(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:100(para)
+#: passwd.5.xml:106(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:106(para)
+#: passwd.5.xml:112(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 "
@@ -4568,7 +4689,7 @@
 msgstr ""
 
 # type: Plain text
-#: passwd.5.xml:127(para)
+#: passwd.5.xml:133(para)
 #, fuzzy
 msgid "optional encrypted password file"
 msgstr ""
@@ -4577,18 +4698,18 @@
 "#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "shadow - file delle password cifrate"
 
-#: passwd.5.xml:131(filename)
+#: passwd.5.xml:137(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/passwd-"
 msgstr "/etc/passwd"
 
-#: passwd.5.xml:133(para)
+#: passwd.5.xml:139(para)
 msgid "Backup file for /etc/passwd."
 msgstr ""
 
 # type: Plain text
-#: passwd.5.xml:145(para)
+#: passwd.5.xml:151(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
@@ -4645,12 +4766,12 @@
 "manvolnum></citerefentry>."
 
 # type: Plain text
-#: passwd.1.xml:50(refpurpose)
+#: passwd.1.xml:53(refpurpose)
 msgid "change user password"
 msgstr "cambia la password utente"
 
 # type: Plain text
-#: passwd.1.xml:67(para)
+#: passwd.1.xml:70(para)
 #, fuzzy
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
@@ -4667,12 +4788,12 @@
 "password."
 
 # type: SS
-#: passwd.1.xml:76(title)
+#: passwd.1.xml:79(title)
 msgid "Password Changes"
 msgstr "Modifiche delle password"
 
 # type: Plain text
-#: passwd.1.xml:77(para)
+#: passwd.1.xml:80(para)
 #, fuzzy
 msgid ""
 "The user is first prompted for his/her old password, if one is present. This "
@@ -4686,7 +4807,7 @@
 "Il super utente non ha questo obbligo."
 
 # type: Plain text
-#: passwd.1.xml:85(para)
+#: passwd.1.xml:88(para)
 #, fuzzy
 msgid ""
 "After the password has been entered, password aging information is checked "
@@ -4699,7 +4820,7 @@
 "command> non fa cambiare la password ed esce."
 
 # type: Plain text
-#: passwd.1.xml:92(para)
+#: passwd.1.xml:95(para)
 #, fuzzy
 msgid ""
 "The user is then prompted twice for a replacement password. The second entry "
@@ -4711,7 +4832,7 @@
 "eguali affinché la password venga accettata."
 
 # type: Plain text
-#: passwd.1.xml:98(para)
+#: passwd.1.xml:101(para)
 #, fuzzy
 msgid ""
 "Then, the password is tested for complexity. As a general guideline, "
@@ -4723,22 +4844,22 @@
 "contenere dai 6 agli 8 caratteri di uno o più dei seguenti insiemi:"
 
 # type: Plain text
-#: passwd.1.xml:106(para)
+#: passwd.1.xml:109(para)
 msgid "lower case alphabetics"
 msgstr "lettere minuscole"
 
 # type: Plain text
-#: passwd.1.xml:109(para)
+#: passwd.1.xml:112(para)
 msgid "digits 0 thru 9"
 msgstr "numeri da 0 a 9"
 
 # type: Plain text
-#: passwd.1.xml:112(para)
+#: passwd.1.xml:115(para)
 msgid "punctuation marks"
 msgstr "segni di punteggiatura"
 
 # type: Plain text
-#: passwd.1.xml:116(para)
+#: passwd.1.xml:119(para)
 #, fuzzy
 msgid ""
 "Care must be taken not to include the system default erase or kill "
@@ -4750,12 +4871,12 @@
 "password non sufficientemente complesse."
 
 # type: SS
-#: passwd.1.xml:125(title)
+#: passwd.1.xml:128(title)
 msgid "Hints for user passwords"
 msgstr "Suggerimenti per password utente"
 
 # type: Plain text
-#: passwd.1.xml:126(para)
+#: passwd.1.xml:129(para)
 #, fuzzy
 msgid ""
 "The security of a password depends upon the strength of the encryption "
@@ -4772,7 +4893,7 @@
 "della password che viene utilizzata."
 
 # type: Plain text
-#: passwd.1.xml:135(para)
+#: passwd.1.xml:138(para)
 #, fuzzy
 msgid ""
 "Compromises in password security normally result from careless password "
@@ -4788,58 +4909,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:144(para)
+#: passwd.1.xml:147(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:153(para)
+#: passwd.1.xml:156(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:158(term) faillog.8.xml:71(term)
+#: passwd.1.xml:161(term) faillog.8.xml:77(term)
 msgid "<option>-a</option>, <option>--all</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
-#: passwd.1.xml:162(para)
+#: passwd.1.xml:165(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:169(term)
+#: passwd.1.xml:172(term)
 msgid "<option>-d</option>, <option>--delete</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: passwd.1.xml:173(para)
+#: passwd.1.xml:176(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:181(term)
+#: passwd.1.xml:184(term)
 msgid "<option>-e</option>, <option>--expire</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
-#: passwd.1.xml:185(para)
+#: passwd.1.xml:188(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:198(term)
+#: passwd.1.xml:201(term)
 msgid ""
 "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 msgstr ""
 
-#: passwd.1.xml:202(para)
+#: passwd.1.xml:205(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 "
@@ -4848,11 +4969,11 @@
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:211(term)
+#: passwd.1.xml:214(term)
 msgid "<option>-k</option>, <option>--keep-tokens</option>"
 msgstr "<option>-k</option>, <option>--keep-tokens</option>"
 
-#: passwd.1.xml:215(para)
+#: passwd.1.xml:218(para)
 msgid ""
 "Indicate password change should be performed only for expired authentication "
 "tokens (passwords). The user wishes to keep their non-expired tokens as "
@@ -4860,18 +4981,18 @@
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:223(term)
+#: passwd.1.xml:226(term)
 msgid "<option>-l</option>, <option>--lock</option>"
 msgstr "<option>-l</option>, <option>--lock</option>"
 
-#: passwd.1.xml:227(para)
+#: passwd.1.xml:230(para)
 msgid ""
 "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:233(para)
+#: passwd.1.xml:236(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 "
@@ -4879,12 +5000,12 @@
 "(this set the account's expire date to Jan 2, 1970)."
 msgstr ""
 
-#: passwd.1.xml:240(para)
+#: passwd.1.xml:243(para)
 msgid "Users with a locked password are not allowed to change their password."
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:247(term)
+#: passwd.1.xml:250(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -4896,7 +5017,7 @@
 "<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
 
 # type: Plain text
-#: passwd.1.xml:251(para) chage.1.xml:146(para)
+#: passwd.1.xml:254(para) chage.1.xml:149(para)
 #, fuzzy
 msgid ""
 "Set the minimum number of days between password changes to "
@@ -4908,23 +5029,23 @@
 "momento."
 
 # type: IP
-#: passwd.1.xml:269(term)
+#: passwd.1.xml:272(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
 msgstr ""
 
-#: passwd.1.xml:273(para)
+#: passwd.1.xml:276(para)
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:279(term)
+#: passwd.1.xml:295(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
 # type: Plain text
-#: passwd.1.xml:283(para)
+#: passwd.1.xml:299(para)
 #, fuzzy
 msgid ""
 "Display account status information. The status information consists of 7 "
@@ -4946,11 +5067,11 @@
 "campi."
 
 # type: IP
-#: passwd.1.xml:297(term)
+#: passwd.1.xml:313(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
-#: passwd.1.xml:301(para)
+#: passwd.1.xml:317(para)
 msgid ""
 "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 "
@@ -4958,14 +5079,14 @@
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:310(term)
+#: passwd.1.xml:326(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: passwd.1.xml:314(para)
+#: passwd.1.xml:330(para)
 #, fuzzy
 msgid ""
 "Set the number of days of warning before a password change is required. The "
@@ -4979,20 +5100,20 @@
 "scadenza."
 
 # type: IP
-#: passwd.1.xml:323(term)
+#: passwd.1.xml:339(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
 msgstr ""
 
-#: passwd.1.xml:327(para)
+#: passwd.1.xml:343(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:339(para)
+#: passwd.1.xml:355(para)
 #, fuzzy
 #| msgid ""
 #| "Not all options may be supported. Password complexity checking may vary "
@@ -5011,13 +5132,13 @@
 "di modificare la propria password se NIS è abilitato e loro non hanno fatto "
 "il login sul server NIS."
 
-#: passwd.1.xml:344(para)
+#: passwd.1.xml:360(para)
 msgid ""
 "Users may not be able to change their password on a system if NIS is enabled "
 "and they are not logged into the NIS server."
 msgstr ""
 
-#: passwd.1.xml:349(para)
+#: passwd.1.xml:365(para)
 msgid ""
 "<command>passwd</command> uses PAM to authenticate users and to change their "
 "passwords."
@@ -5089,7 +5210,7 @@
 #: 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 "
+"This variable is superseded by the <option>ENCRYPT_METHOD</option> variable "
 "or by any command line option used to configure the encryption algorithm."
 msgstr ""
 
@@ -5183,7 +5304,7 @@
 
 #: 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."
+msgid "The values must be inside the 1000-999,999,999 range."
 msgstr ""
 
 #: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para)
@@ -5201,83 +5322,88 @@
 "option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:395(filename)
+#: passwd.1.xml:411(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/passwd"
 
 # type: Plain text
-#: passwd.1.xml:397(para)
+#: passwd.1.xml:413(para)
 #, fuzzy
 #| msgid "<command>gpasswd </command>I<group>"
 msgid "PAM configuration for <command>passwd</command>."
 msgstr "<command>gpasswd </command>I<gruppo>"
 
-#: passwd.1.xml:417(para) chage.1.xml:257(para)
+#: passwd.1.xml:433(para) chage.1.xml:273(para)
 msgid "permission denied"
 msgstr ""
 
-#: passwd.1.xml:423(para)
+#: passwd.1.xml:439(para)
 msgid "invalid combination of options"
 msgstr ""
 
-#: passwd.1.xml:429(para)
+#: passwd.1.xml:445(para)
 msgid "unexpected failure, nothing done"
 msgstr ""
 
-#: passwd.1.xml:435(para)
+#: passwd.1.xml:451(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr ""
 
 # type: TP
-#: passwd.1.xml:441(para)
+#: passwd.1.xml:457(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 
 # type: TP
-#: passwd.1.xml:405(para)
+#: passwd.1.xml:421(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:456(para)
+#: passwd.1.xml:472(para)
 #, fuzzy
 #| msgid ""
-#| "<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>."
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
-"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
-"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>chpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <phrase condition=\"no_pam"
+"\"><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, </phrase><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>."
 
-#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname)
-#: nologin.8.xml:45(command)
+#: nologin.8.xml:38(refentrytitle) nologin.8.xml:45(refname)
+#: nologin.8.xml:51(command)
 msgid "nologin"
 msgstr "nologin"
 
-#: nologin.8.xml:40(refpurpose)
+#: nologin.8.xml:46(refpurpose)
 msgid "politely refuse a login"
 msgstr ""
 
-#: nologin.8.xml:51(para)
+#: nologin.8.xml:57(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 "
@@ -5285,14 +5411,14 @@
 msgstr ""
 
 # type: Plain text
-#: nologin.8.xml:56(para)
+#: nologin.8.xml:62(para)
 msgid ""
 "To disable all logins, investigate <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
 # type: Plain text
-#: nologin.8.xml:65(para)
+#: nologin.8.xml:71(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
@@ -5302,12 +5428,12 @@
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: nologin.8.xml:76(title)
+#: nologin.8.xml:82(title)
 msgid "HISTORY"
 msgstr ""
 
 # type: TP
-#: nologin.8.xml:77(para)
+#: nologin.8.xml:83(para)
 #, fuzzy
 msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr ""
@@ -5316,112 +5442,112 @@
 "#-#-#-#-#  grpck.8.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
-#: newusers.8.xml:50(refentrytitle) newusers.8.xml:55(refname)
-#: newusers.8.xml:61(command) login.defs.5.xml:365(term)
+#: newusers.8.xml:51(refentrytitle) newusers.8.xml:58(refname)
+#: newusers.8.xml:64(command) login.defs.5.xml:368(term)
 msgid "newusers"
 msgstr "newusers"
 
-#: newusers.8.xml:56(refpurpose)
+#: newusers.8.xml:59(refpurpose)
 msgid "update and create new users in batch"
 msgstr ""
 
-#: newusers.8.xml:64(replaceable)
-msgid "new_users"
+#: newusers.8.xml:69(replaceable)
+msgid "file"
 msgstr ""
 
-#: newusers.8.xml:71(para)
+#: newusers.8.xml:76(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 exceptions "
-"explained below:"
+"The <command>newusers</command> command reads a <replaceable>file</"
+"replaceable> (or the standard input by default) and uses this information to "
+"update a set 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 exceptions explained below:"
 msgstr ""
 
-#: newusers.8.xml:79(para)
+#: newusers.8.xml:84(para)
 msgid "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
 msgstr ""
 
-#: newusers.8.xml:84(emphasis)
+#: newusers.8.xml:89(emphasis)
 msgid "pw_name"
 msgstr ""
 
-#: newusers.8.xml:87(para)
+#: newusers.8.xml:92(para)
 msgid "This is the name of the user."
 msgstr ""
 
-#: newusers.8.xml:90(para)
+#: newusers.8.xml:95(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:101(emphasis)
+#: newusers.8.xml:106(emphasis)
 msgid "pw_passwd"
 msgstr ""
 
-#: newusers.8.xml:104(para)
+#: newusers.8.xml:109(para)
 msgid ""
 "This field will be encrypted and used as the new value of the encrypted "
 "password."
 msgstr ""
 
-#: newusers.8.xml:112(emphasis)
+#: newusers.8.xml:117(emphasis)
 msgid "pw_uid"
 msgstr ""
 
-#: newusers.8.xml:115(para)
+#: newusers.8.xml:120(para)
 msgid "This field is used to define the UID of the user."
 msgstr ""
 
-#: newusers.8.xml:118(para)
+#: newusers.8.xml:123(para)
 msgid ""
 "If the field is empty, an new (unused) UID will be defined automatically by "
 "<command>newusers</command>."
 msgstr ""
 
-#: newusers.8.xml:122(para)
+#: newusers.8.xml:127(para)
 msgid "If this field contains a number, this number will be used as the UID."
 msgstr ""
 
-#: newusers.8.xml:126(para)
+#: newusers.8.xml:131(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:132(para)
+#: newusers.8.xml:137(para)
 msgid ""
 "If the UID of an existing user is changed, the files ownership of the user's "
 "file should be fixed manually."
 msgstr ""
 
-#: newusers.8.xml:140(emphasis)
+#: newusers.8.xml:145(emphasis)
 msgid "pw_gid"
 msgstr ""
 
-#: newusers.8.xml:143(para)
+#: newusers.8.xml:148(para)
 msgid "This field is used to define the primary group ID for the user."
 msgstr ""
 
-#: newusers.8.xml:146(para)
+#: newusers.8.xml:151(para)
 msgid ""
 "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:152(para)
+#: newusers.8.xml:157(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:158(para)
+#: newusers.8.xml:163(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> "
@@ -5429,56 +5555,56 @@
 "group."
 msgstr ""
 
-#: newusers.8.xml:164(para)
+#: newusers.8.xml:169(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 "
+"created before 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."
+"and GID for the new group."
 msgstr ""
 
-#: newusers.8.xml:176(emphasis)
+#: newusers.8.xml:181(emphasis)
 msgid "pw_gecos"
 msgstr ""
 
-#: newusers.8.xml:179(para)
+#: newusers.8.xml:184(para)
 msgid "This field is copied in the GECOS field of the user."
 msgstr ""
 
-#: newusers.8.xml:186(emphasis)
+#: newusers.8.xml:191(emphasis)
 msgid "pw_dir"
 msgstr ""
 
-#: newusers.8.xml:189(para)
+#: newusers.8.xml:194(para)
 msgid "This field is used to define the home directory of the user."
 msgstr ""
 
-#: newusers.8.xml:192(para)
+#: newusers.8.xml:197(para)
 msgid ""
 "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:197(para)
+#: newusers.8.xml:202(para)
 msgid ""
 "If the home directory of an existing user is changed, <command>newusers</"
 "command> does not move or copy the content of the old directory to the new "
 "location. This should be done manually."
 msgstr ""
 
-#: newusers.8.xml:207(emphasis)
+#: newusers.8.xml:212(emphasis)
 msgid "pw_shell"
 msgstr ""
 
-#: newusers.8.xml:210(para)
+#: newusers.8.xml:215(para)
 msgid ""
 "This field defines the shell of the user. No checks are performed on this "
 "field."
 msgstr ""
 
-#: newusers.8.xml:218(para)
+#: newusers.8.xml:223(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 "
@@ -5486,7 +5612,7 @@
 "no changes are committed to the databases."
 msgstr ""
 
-#: newusers.8.xml:224(para)
+#: newusers.8.xml:229(para)
 msgid ""
 "During this first pass, users are created with a locked password (and "
 "passwords are not changed for the users which are not created). A second "
@@ -5495,7 +5621,7 @@
 msgstr ""
 
 # type: Plain text
-#: newusers.8.xml:232(para)
+#: newusers.8.xml:237(para)
 #, fuzzy
 msgid ""
 "This command is intended to be used in a large system environment where many "
@@ -5505,7 +5631,7 @@
 "necessità di creare molti account nello stesso momento."
 
 # type: TP
-#: newusers.8.xml:240(para)
+#: newusers.8.xml:245(para)
 #, fuzzy
 #| msgid ""
 #| "The options which apply to the <command>usermod</command> command are:"
@@ -5513,22 +5639,22 @@
 msgstr "Il comando <command>usermod</command> accetta le seguenti opzioni:"
 
 # type: IP
-#: newusers.8.xml:245(term) chgpasswd.8.xml:95(term)
+#: newusers.8.xml:250(term) chgpasswd.8.xml:98(term)
 #, fuzzy
 msgid "<option>-c</option>, <option>--crypt-method</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: newusers.8.xml:247(para) chpasswd.8.xml:120(para) chgpasswd.8.xml:97(para)
+#: newusers.8.xml:252(para) chpasswd.8.xml:123(para) chgpasswd.8.xml:100(para)
 msgid "Use the specified method to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:248(para) chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
+#: newusers.8.xml:253(para) chpasswd.8.xml:127(para) chgpasswd.8.xml:104(para)
 msgid ""
 "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc "
 "support these methods."
 msgstr ""
 
-#: newusers.8.xml:270(para)
+#: newusers.8.xml:275(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are chosen in the "
@@ -5539,59 +5665,59 @@
 msgstr ""
 
 # type: IP
-#: newusers.8.xml:284(term) chgpasswd.8.xml:129(term)
+#: newusers.8.xml:302(term) chgpasswd.8.xml:145(term)
 #, fuzzy
 msgid "<option>-s</option>, <option>--sha-rounds</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: newusers.8.xml:286(para) chpasswd.8.xml:172(para) chgpasswd.8.xml:131(para)
+#: newusers.8.xml:304(para) chpasswd.8.xml:188(para) chgpasswd.8.xml:147(para)
 msgid "Use the specified number of rounds to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:289(para) chpasswd.8.xml:175(para) chgpasswd.8.xml:134(para)
+#: newusers.8.xml:307(para) chpasswd.8.xml:191(para) chgpasswd.8.xml:150(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:293(para) chpasswd.8.xml:179(para) chgpasswd.8.xml:138(para)
+#: newusers.8.xml:311(para) chpasswd.8.xml:195(para) chgpasswd.8.xml:154(para)
 msgid ""
 "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr ""
 
-#: newusers.8.xml:297(para) chpasswd.8.xml:183(para) chgpasswd.8.xml:142(para)
+#: newusers.8.xml:315(para) chpasswd.8.xml:199(para) chgpasswd.8.xml:158(para)
 msgid "You can only use this option with the SHA256 or SHA512 crypt method."
 msgstr ""
 
-#: newusers.8.xml:301(para) chgpasswd.8.xml:146(para)
+#: newusers.8.xml:319(para) chgpasswd.8.xml:162(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:313(para)
+#: newusers.8.xml:331(para)
 msgid ""
 "The input file must be protected since it contains unencrypted passwords."
 msgstr ""
 
-#: newusers.8.xml:317(para) chgpasswd.8.xml:162(para)
+#: newusers.8.xml:335(para) chgpasswd.8.xml:178(para)
 msgid ""
 "You should make sure the passwords and the encryption method respect the "
 "system's password policy."
 msgstr ""
 
-#: newusers.8.xml:390(filename)
+#: newusers.8.xml:408(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/newusers"
 msgstr "/etc/passwd"
 
-#: newusers.8.xml:392(para)
+#: newusers.8.xml:410(para)
 msgid "PAM configuration for <command>newusers</command>."
 msgstr ""
 
 # type: Plain text
-#: newusers.8.xml:400(para)
+#: newusers.8.xml:418(para)
 msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5605,13 +5731,13 @@
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname)
-#: newgrp.1.xml:49(command)
+#: newgrp.1.xml:39(refentrytitle) newgrp.1.xml:46(refname)
+#: newgrp.1.xml:52(command)
 msgid "newgrp"
 msgstr "newgrp"
 
 # type: Plain text
-#: newgrp.1.xml:44(refpurpose)
+#: newgrp.1.xml:47(refpurpose)
 #, fuzzy
 msgid "log in to a new group"
 msgstr ""
@@ -5620,14 +5746,13 @@
 "#-#-#-#-#  newgrp.1.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "newgrp - effettua l'accesso a un nuovo gruppo"
 
-#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
-#: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
-#: groupadd.8.xml:57(replaceable) gpasswd.1.xml:66(replaceable)
+#: newgrp.1.xml:53(replaceable) grpck.8.xml:55(replaceable)
+#: groupadd.8.xml:59(replaceable) gpasswd.1.xml:69(replaceable)
 msgid "group"
 msgstr ""
 
 # type: Plain text
-#: newgrp.1.xml:56(para)
+#: newgrp.1.xml:59(para)
 #, fuzzy
 msgid ""
 "The <command>newgrp</command> command is used to change the current group ID "
@@ -5650,7 +5775,7 @@
 "directory corrente non viene cambiata."
 
 # type: Plain text
-#: newgrp.1.xml:64(para)
+#: newgrp.1.xml:67(para)
 #, fuzzy
 msgid ""
 "<command>newgrp</command> changes the current real group ID to the named "
@@ -5671,7 +5796,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:78(para)
+#: newgrp.1.xml:81(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 "
@@ -5680,7 +5805,7 @@
 msgstr ""
 
 # type: Plain text
-#: newgrp.1.xml:130(para)
+#: newgrp.1.xml:133(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -5706,18 +5831,20 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname)
-#: logoutd.8.xml:45(command)
+#: logoutd.8.xml:38(refentrytitle) logoutd.8.xml:45(refname)
+#: logoutd.8.xml:51(command)
 msgid "logoutd"
 msgstr "logoutd"
 
 # type: Plain text
-#: logoutd.8.xml:40(refpurpose)
-msgid "Enforce login time restrictions"
+#: logoutd.8.xml:46(refpurpose)
+#, fuzzy
+#| msgid "Enforce login time restrictions"
+msgid "enforce login time restrictions"
 msgstr "fa rispettare le limitazioni sugli accessi"
 
 # type: Plain text
-#: logoutd.8.xml:51(para)
+#: logoutd.8.xml:57(para)
 #, fuzzy
 msgid ""
 "<command>logoutd</command> enforces the login time and port restrictions "
@@ -5737,26 +5864,26 @@
 "violando le limitazioni in <filename>/etc/porttime</filename> viene "
 "terminata."
 
-#: logoutd.8.xml:73(filename) login.1.xml:319(filename)
+#: logoutd.8.xml:79(filename) login.1.xml:322(filename)
 msgid "/var/run/utmp"
 msgstr "/var/run/utmp"
 
 # type: Plain text
-#: logoutd.8.xml:75(para) login.1.xml:321(para)
+#: logoutd.8.xml:81(para) login.1.xml:324(para)
 msgid "List of current login sessions."
 msgstr "Elenco delle sessioni attive"
 
-#: login.defs.5.xml:100(refentrytitle) login.defs.5.xml:105(refname)
+#: login.defs.5.xml:101(refentrytitle) login.defs.5.xml:108(refname)
 msgid "login.defs"
 msgstr "login.defs"
 
 # type: Plain text
-#: login.defs.5.xml:106(refpurpose)
+#: login.defs.5.xml:109(refpurpose)
 #, fuzzy
 msgid "shadow password suite configuration"
 msgstr "shadow - gestione del file delle password cifrate"
 
-#: login.defs.5.xml:111(para)
+#: login.defs.5.xml:114(para)
 msgid ""
 "The <filename>/etc/login.defs</filename> file defines the site-specific "
 "configuration for the shadow password suite. This file is required. Absence "
@@ -5764,7 +5891,7 @@
 "undesirable operation."
 msgstr ""
 
-#: login.defs.5.xml:118(para)
+#: login.defs.5.xml:121(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 "
@@ -5773,7 +5900,7 @@
 "the first non-white character of the line."
 msgstr ""
 
-#: login.defs.5.xml:126(para)
+#: login.defs.5.xml:129(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 "
@@ -5786,7 +5913,7 @@
 "and long numeric parameters is machine-dependent."
 msgstr ""
 
-#: login.defs.5.xml:141(para)
+#: login.defs.5.xml:144(para)
 msgid "The following configuration items are provided:"
 msgstr ""
 
@@ -5990,7 +6117,7 @@
 #: login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "This will most likely be overridden by PAM, since the default pam_unix "
-"module has it's own built in of 3 retries. However, this is a safe fallback "
+"module has its 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 ""
@@ -6030,7 +6157,7 @@
 "inhibited."
 msgstr ""
 
-#: login.defs.5.xml:184(para)
+#: login.defs.5.xml:187(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 "
@@ -6043,9 +6170,20 @@
 msgid "<option>PORTTIME_CHECKS_ENAB</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
+# type: Plain text
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "Enable checking of time restrictions specified in /etc/porttime."
+#, fuzzy
+msgid ""
+"Enable checking of time restrictions specified in <filename>/etc/porttime</"
+"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: IP
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -6110,117 +6248,117 @@
 msgid "Default <command>ulimit</command> value."
 msgstr "<command>groups</command> [I<utente>]"
 
-#: login.defs.5.xml:215(title)
+#: login.defs.5.xml:218(title)
 msgid "CROSS REFERENCES"
 msgstr ""
 
-#: login.defs.5.xml:216(para)
+#: login.defs.5.xml:219(para)
 msgid ""
 "The following cross references show which programs in the shadow password "
 "suite use which parameters."
 msgstr ""
 
-#: login.defs.5.xml:223(term) chage.1.xml:38(refentrytitle)
-#: chage.1.xml:43(refname) chage.1.xml:48(command)
+#: login.defs.5.xml:226(term) chage.1.xml:39(refentrytitle)
+#: chage.1.xml:46(refname) chage.1.xml:51(command)
 msgid "chage"
 msgstr "chage"
 
-#: login.defs.5.xml:225(para) login.defs.5.xml:413(phrase)
-#: login.defs.5.xml:480(phrase)
+#: login.defs.5.xml:228(para) login.defs.5.xml:416(phrase)
+#: login.defs.5.xml:483(phrase)
 msgid "USE_TCB"
 msgstr ""
 
-#: login.defs.5.xml:229(term) chfn.1.xml:41(refentrytitle)
-#: chfn.1.xml:46(refname) chfn.1.xml:52(command)
+#: login.defs.5.xml:232(term) chfn.1.xml:41(refentrytitle)
+#: chfn.1.xml:48(refname) chfn.1.xml:54(command)
 msgid "chfn"
 msgstr ""
 
-#: login.defs.5.xml:231(para)
+#: login.defs.5.xml:234(para)
 msgid ""
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:239(term) chgpasswd.8.xml:42(refentrytitle)
-#: chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
+#: login.defs.5.xml:242(term) chgpasswd.8.xml:43(refentrytitle)
+#: chgpasswd.8.xml:50(refname) chgpasswd.8.xml:56(command)
 msgid "chgpasswd"
 msgstr "chgpasswd"
 
-#: login.defs.5.xml:241(para) login.defs.5.xml:272(para)
+#: login.defs.5.xml:244(para) login.defs.5.xml:275(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:249(term) chpasswd.8.xml:41(refentrytitle)
-#: chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
+#: login.defs.5.xml:252(term) chpasswd.8.xml:42(refentrytitle)
+#: chpasswd.8.xml:49(refname) chpasswd.8.xml:55(command)
 msgid "chpasswd"
 msgstr "chpasswd"
 
-#: login.defs.5.xml:252(phrase)
+#: login.defs.5.xml:255(phrase)
 msgid "ENCRYPT_METHOD MD5_CRYPT_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:254(phrase)
+#: login.defs.5.xml:257(phrase)
 msgid "SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS"
 msgstr ""
 
-#: login.defs.5.xml:260(term) chsh.1.xml:40(refentrytitle)
-#: chsh.1.xml:45(refname) chsh.1.xml:51(command)
+#: login.defs.5.xml:263(term) chsh.1.xml:41(refentrytitle)
+#: chsh.1.xml:48(refname) chsh.1.xml:54(command)
 msgid "chsh"
 msgstr ""
 
-#: login.defs.5.xml:262(para)
+#: login.defs.5.xml:265(para)
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr ""
 
-#: login.defs.5.xml:270(term) gpasswd.1.xml:42(refentrytitle)
-#: gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
+#: login.defs.5.xml:273(term) gpasswd.1.xml:43(refentrytitle)
+#: gpasswd.1.xml:50(refname) gpasswd.1.xml:64(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
-#: login.defs.5.xml:280(term) groupadd.8.xml:41(refentrytitle)
-#: groupadd.8.xml:46(refname) groupadd.8.xml:52(command)
+#: login.defs.5.xml:283(term) groupadd.8.xml:41(refentrytitle)
+#: groupadd.8.xml:48(refname) groupadd.8.xml:54(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:282(para)
+#: login.defs.5.xml:285(para)
 msgid "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 msgstr ""
 
-#: login.defs.5.xml:289(term) groupdel.8.xml:38(refentrytitle)
-#: groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
+#: login.defs.5.xml:292(term) groupdel.8.xml:39(refentrytitle)
+#: groupdel.8.xml:46(refname) groupdel.8.xml:52(command)
 msgid "groupdel"
 msgstr "groupdel"
 
-#: login.defs.5.xml:291(para) login.defs.5.xml:297(para)
-#: login.defs.5.xml:303(para) login.defs.5.xml:310(para)
-#: login.defs.5.xml:316(para) login.defs.5.xml:322(para)
+#: login.defs.5.xml:294(para) login.defs.5.xml:300(para)
+#: login.defs.5.xml:306(para) login.defs.5.xml:313(para)
+#: login.defs.5.xml:319(para) login.defs.5.xml:325(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:295(term) groupmems.8.xml:38(refentrytitle)
-#: groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
+#: login.defs.5.xml:298(term) groupmems.8.xml:39(refentrytitle)
+#: groupmems.8.xml:46(refname) groupmems.8.xml:52(command)
 msgid "groupmems"
 msgstr "groupmems"
 
-#: login.defs.5.xml:301(term) groupmod.8.xml:38(refentrytitle)
-#: groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
+#: login.defs.5.xml:304(term) groupmod.8.xml:39(refentrytitle)
+#: groupmod.8.xml:46(refname) groupmod.8.xml:52(command)
 msgid "groupmod"
 msgstr "groupmod"
 
-#: login.defs.5.xml:308(term) grpck.8.xml:38(refentrytitle)
-#: grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
+#: login.defs.5.xml:311(term) grpck.8.xml:39(refentrytitle)
+#: grpck.8.xml:46(refname) grpck.8.xml:52(command)
 msgid "grpck"
 msgstr "grpck"
 
-#: login.defs.5.xml:328(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)
+#: login.defs.5.xml:331(term) login.1.xml:71(refentrytitle)
+#: login.1.xml:78(refname) login.1.xml:84(command) login.1.xml:92(command)
+#: login.1.xml:99(command)
 msgid "login"
 msgstr "login"
 
-#: login.defs.5.xml:330(para)
+#: login.defs.5.xml:333(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</"
@@ -6235,17 +6373,17 @@
 "phrase> USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:357(term)
+#: login.defs.5.xml:360(term)
 #, fuzzy
 #| msgid "newgrp"
 msgid "newgrp / sg"
 msgstr "newgrp"
 
-#: login.defs.5.xml:359(para)
+#: login.defs.5.xml:362(para)
 msgid "SYSLOG_SG_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:367(para)
+#: login.defs.5.xml:370(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"
@@ -6253,26 +6391,26 @@
 "SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX UID_MIN UMASK"
 msgstr ""
 
-#: login.defs.5.xml:383(para)
+#: login.defs.5.xml:386(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:394(para)
+#: login.defs.5.xml:397(para)
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb"
 "\">TCB_AUTH_GROUP TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:403(para)
+#: login.defs.5.xml:406(para)
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">USE_TCB</"
 "phrase>"
 msgstr ""
 
-#: login.defs.5.xml:420(para)
+#: login.defs.5.xml:423(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH "
@@ -6282,16 +6420,16 @@
 "\">USERGROUPS_ENAB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:435(term)
+#: login.defs.5.xml:438(term)
 #, fuzzy
 msgid "sulogin"
 msgstr "login"
 
-#: login.defs.5.xml:437(para)
+#: login.defs.5.xml:440(para)
 msgid "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:446(para)
+#: login.defs.5.xml:449(para)
 msgid ""
 "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 "
@@ -6299,20 +6437,20 @@
 "USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:460(para)
+#: login.defs.5.xml:463(para)
 msgid ""
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB <phrase "
 "condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:470(para)
+#: login.defs.5.xml:473(para)
 msgid ""
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP <phrase condition=\"tcb"
 "\">TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
 # type: Plain text
-#: login.defs.5.xml:489(para)
+#: login.defs.5.xml:492(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
@@ -6339,7 +6477,7 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Plain text
-#: login.defs.5.xml:505(para)
+#: login.defs.5.xml:508(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -6361,22 +6499,22 @@
 "citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
+#: login.access.5.xml:39(refentrytitle) login.access.5.xml:46(refname)
 msgid "login.access"
 msgstr "login.access"
 
-#: login.access.5.xml:41(refpurpose)
+#: login.access.5.xml:47(refpurpose)
 msgid "login access control table"
 msgstr ""
 
-#: login.access.5.xml:46(para)
+#: login.access.5.xml:52(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:52(para)
+#: login.access.5.xml:58(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, "
@@ -6385,20 +6523,20 @@
 "whether the login will be accepted or refused."
 msgstr ""
 
-#: login.access.5.xml:60(para)
+#: login.access.5.xml:66(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:65(para)
+#: login.access.5.xml:71(para)
 msgid ""
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
 "emphasis>:<emphasis remap=\"I\">origins</emphasis>"
 msgstr ""
 
-#: login.access.5.xml:69(para)
+#: login.access.5.xml:75(para)
 msgid ""
 "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or "
 "\"<emphasis>-</emphasis>\" (access denied) character. The second field "
@@ -6412,13 +6550,13 @@
 "@netgroupname in host or user patterns."
 msgstr ""
 
-#: login.access.5.xml:83(para)
+#: login.access.5.xml:89(para)
 msgid ""
 "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
 "compact rules."
 msgstr ""
 
-#: login.access.5.xml:88(para)
+#: login.access.5.xml:94(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 "
@@ -6426,39 +6564,39 @@
 msgstr ""
 
 # type: Plain text
-#: login.1.xml:76(refpurpose)
+#: login.1.xml:79(refpurpose)
 #, fuzzy
 msgid "begin session on the system"
 msgstr "login - apre una sessione sul sistema"
 
-#: 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)
+#: login.1.xml:85(arg) login.1.xml:93(arg) login.1.xml:100(arg)
+#: login.1.xml:217(option) groupmems.8.xml:57(arg)
 msgid "-p"
 msgstr "-p"
 
-#: login.1.xml:83(replaceable) login.1.xml:91(replaceable)
-#: login.1.xml:98(replaceable)
+#: login.1.xml:86(replaceable) login.1.xml:94(replaceable)
+#: login.1.xml:101(replaceable)
 msgid "host"
 msgstr ""
 
-#: login.1.xml:83(arg) login.1.xml:91(arg) chfn.1.xml:56(arg)
+#: login.1.xml:86(arg) login.1.xml:94(arg)
 msgid "-h <placeholder-1/>"
 msgstr "-h <placeholder-1/>"
 
-#: login.1.xml:86(replaceable)
+#: login.1.xml:89(replaceable)
 msgid "ENV=VAR"
 msgstr ""
 
-#: login.1.xml:92(arg) login.1.xml:192(option) expiry.1.xml:54(arg)
+#: login.1.xml:95(arg) login.1.xml:195(option)
 msgid "-f"
 msgstr "-f"
 
-#: login.1.xml:98(arg) chfn.1.xml:54(arg)
+#: login.1.xml:101(arg)
 msgid "-r <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
 # type: Plain text
-#: login.1.xml:104(para)
+#: login.1.xml:107(para)
 #, fuzzy
 msgid ""
 "The <command>login</command> program is used to establish a new session with "
@@ -6482,7 +6620,7 @@
 "da una shell che non sia quella di login produce un messaggio d'errore."
 
 # type: Plain text
-#: login.1.xml:118(para)
+#: login.1.xml:121(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 "
@@ -6495,7 +6633,7 @@
 "<command>login</command> termini e che la connessione sia rallentata."
 
 # type: Plain text
-#: login.1.xml:125(para)
+#: login.1.xml:128(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 "
@@ -6511,7 +6649,7 @@
 "citerefentry>."
 
 # type: Plain text
-#: login.1.xml:134(para)
+#: login.1.xml:137(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 "
@@ -6531,7 +6669,7 @@
 "dello stato della propria casella di posta."
 
 # type: Plain text
-#: login.1.xml:145(para)
+#: login.1.xml:148(para)
 #, fuzzy
 msgid ""
 "Your user and group ID will be set according to their values in the "
@@ -6557,7 +6695,7 @@
 "impostati in base al campo GECOS."
 
 # type: Plain text
-#: login.1.xml:154(para)
+#: login.1.xml:157(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 "
@@ -6568,7 +6706,7 @@
 "come specificato in <filename>/etc/ttytype</filename>."
 
 # type: Plain text
-#: login.1.xml:160(para)
+#: login.1.xml:163(para)
 #, fuzzy
 msgid ""
 "An initialization script for your command interpreter may also be executed. "
@@ -6585,7 +6723,7 @@
 "maggiori informazioni su questa funzione."
 
 # type: Plain text
-#: login.1.xml:172(para) login.1.xml:248(para)
+#: login.1.xml:175(para) login.1.xml:251(para)
 #, fuzzy
 msgid ""
 "The <command>login</command> program is NOT responsible for removing users "
@@ -6608,30 +6746,34 @@
 "sempre connesso al sistema fino al termine della \"sottosessione\"."
 
 # type: Plain text
-#: login.1.xml:195(para)
+#: login.1.xml:198(para)
 msgid "Do not perform authentication, user is preauthenticated."
 msgstr "Non effettua l'autenticazione, l'utente è già autenticato"
 
-#: login.1.xml:198(para)
+#: login.1.xml:201(para)
 msgid "Note: In that case, <replaceable>username</replaceable> is mandatory."
 msgstr ""
 
-#: login.1.xml:206(option)
+#: login.1.xml:209(option)
 msgid "-h"
 msgstr "-h"
 
 # type: Plain text
-#: login.1.xml:209(para)
+#: login.1.xml:212(para)
 msgid "Name of the remote host for this login."
 msgstr "Nome dell'host remoto per questo login."
 
 # type: Plain text
-#: login.1.xml:217(para)
+#: login.1.xml:220(para)
 msgid "Preserve environment."
 msgstr "Non modifica l'ambiente."
 
+#: login.1.xml:225(option)
+msgid "-r"
+msgstr "-r"
+
 # type: Plain text
-#: login.1.xml:225(para)
+#: login.1.xml:228(para)
 #, fuzzy
 msgid "Perform autologin protocol for rlogin."
 msgstr ""
@@ -6641,7 +6783,7 @@
 "Attiva il protocollo autologin di rlogin."
 
 # type: Plain text
-#: login.1.xml:230(para)
+#: login.1.xml:233(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."
@@ -6651,7 +6793,7 @@
 "invocato da root."
 
 # type: Plain text
-#: login.1.xml:239(para)
+#: login.1.xml:242(para)
 #, fuzzy
 msgid ""
 "This version of <command>login</command> has many compilation options, only "
@@ -6666,7 +6808,7 @@
 "determinato sistema."
 
 # type: Plain text
-#: login.1.xml:244(para)
+#: login.1.xml:247(para)
 #, fuzzy
 msgid ""
 "The location of files is subject to differences in system configuration."
@@ -6678,7 +6820,7 @@
 "La posizione dei file è soggetta a differenze in base alla configurazione "
 "del sistema."
 
-#: login.1.xml:260(para)
+#: login.1.xml:263(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 "
@@ -6687,47 +6829,47 @@
 "trusted path and prevent this kind of attack."
 msgstr ""
 
-#: login.1.xml:325(filename)
+#: login.1.xml:328(filename)
 msgid "/var/log/wtmp"
 msgstr "/var/log/wtmp"
 
 # type: Plain text
-#: login.1.xml:327(para)
+#: login.1.xml:330(para)
 msgid "List of previous login sessions."
 msgstr "Elenco delle precedenti sessioni."
 
-#: login.1.xml:343(filename)
+#: login.1.xml:346(filename)
 msgid "/etc/motd"
 msgstr "/etc/motd"
 
-#: login.1.xml:345(para)
+#: login.1.xml:348(para)
 msgid "System message of the day file."
 msgstr ""
 
-#: login.1.xml:349(filename)
+#: login.1.xml:352(filename)
 msgid "/etc/nologin"
 msgstr "/etc/nologin"
 
 # type: Plain text
-#: login.1.xml:351(para)
+#: login.1.xml:354(para)
 msgid "Prevent non-root users from logging in."
 msgstr "Inibisce l\\'accesso al sistema per utenti diversi da root."
 
-#: login.1.xml:355(filename)
+#: login.1.xml:358(filename)
 msgid "/etc/ttytype"
 msgstr "/etc/ttytype"
 
 # type: Plain text
-#: login.1.xml:357(para)
+#: login.1.xml:360(para)
 msgid "List of terminal types."
 msgstr "Elenco di tipi di terminale."
 
-#: login.1.xml:361(filename)
+#: login.1.xml:364(filename)
 msgid "$HOME/.hushlogin"
 msgstr "$HOME/.hushlogin"
 
 # type: Plain text
-#: login.1.xml:363(para)
+#: login.1.xml:366(para)
 msgid "Suppress printing of system messages."
 msgstr ""
 "#-#-#-#-#    #-#-#-#-#\n"
@@ -6736,7 +6878,7 @@
 "Impedisce che vengano mostrati i messaggi di sistema."
 
 # type: Plain text
-#: login.1.xml:377(para)
+#: login.1.xml:380(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -6766,15 +6908,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getty</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
+#: limits.5.xml:39(refentrytitle) limits.5.xml:46(refname)
 msgid "limits"
 msgstr "limits"
 
-#: limits.5.xml:41(refpurpose)
+#: limits.5.xml:47(refpurpose)
 msgid "resource limits definition"
 msgstr ""
 
-#: limits.5.xml:47(para)
+#: limits.5.xml:53(para)
 msgid ""
 "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</"
 "filename> by default or LIMITS_FILE defined <filename>config.h</filename>) "
@@ -6782,113 +6924,113 @@
 "and readable by root account only."
 msgstr ""
 
-#: limits.5.xml:55(para)
+#: limits.5.xml:61(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:61(para)
+#: limits.5.xml:67(para)
 msgid "Each line describes a limit for a user in the form:"
 msgstr ""
 
-#: limits.5.xml:64(emphasis)
+#: limits.5.xml:70(emphasis)
 msgid "user LIMITS_STRING"
 msgstr ""
 
-#: limits.5.xml:67(para)
+#: limits.5.xml:73(para)
 msgid "or in the form:"
 msgstr ""
 
-#: limits.5.xml:70(emphasis)
+#: limits.5.xml:76(emphasis)
 msgid "@group LIMITS_STRING"
 msgstr ""
 
-#: limits.5.xml:73(para)
+#: limits.5.xml:79(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:79(para)
+#: limits.5.xml:85(para)
 msgid "The valid identifiers are:"
 msgstr ""
 
-#: limits.5.xml:82(para)
+#: limits.5.xml:88(para)
 msgid "A: max address space (KB)"
 msgstr ""
 
-#: limits.5.xml:83(para)
+#: limits.5.xml:89(para)
 msgid "C: max core file size (KB)"
 msgstr ""
 
-#: limits.5.xml:84(para)
+#: limits.5.xml:90(para)
 msgid "D: max data size (KB)"
 msgstr ""
 
-#: limits.5.xml:85(para)
+#: limits.5.xml:91(para)
 msgid "F: maximum filesize (KB)"
 msgstr ""
 
-#: limits.5.xml:86(para)
-msgid "M: max locked-in-memory address space (KB)"
+# type: Plain text
+#: limits.5.xml:92(para)
+msgid ""
+"K: file creation mask, set by <citerefentry><refentrytitle>umask</"
+"refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
-#: limits.5.xml:87(para)
-msgid "N: max number of open files"
+#: limits.5.xml:97(para)
+msgid "I: max nice value (0..39 which translates to 20..-19)"
 msgstr ""
 
-#: limits.5.xml:88(para)
-msgid "R: max resident set size (KB)"
+#: limits.5.xml:99(para)
+msgid "L: max number of logins for this user"
 msgstr ""
 
-#: limits.5.xml:89(para)
-msgid "S: max stack size (KB)"
+#: limits.5.xml:100(para)
+msgid "M: max locked-in-memory address space (KB)"
 msgstr ""
 
-#: limits.5.xml:90(para)
-msgid "T: max CPU time (MIN)"
+#: limits.5.xml:101(para)
+msgid "N: max number of open files"
 msgstr ""
 
-#: limits.5.xml:91(para)
-msgid "U: max number of processes"
+#: limits.5.xml:102(para)
+msgid "O: max real time priority"
 msgstr ""
 
 # type: Plain text
-#: limits.5.xml:92(para)
+#: limits.5.xml:103(para)
 msgid ""
-"K: file creation mask, set by <citerefentry><refentrytitle>umask</"
+"P: process priority, set by <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
-#: limits.5.xml:97(para)
-msgid "L: max number of logins for this user"
+#: limits.5.xml:108(para)
+msgid "R: max resident set size (KB)"
 msgstr ""
 
-# type: Plain text
-#: limits.5.xml:98(para)
-msgid ""
-"P: process priority, set by <citerefentry><refentrytitle>setpriority</"
-"refentrytitle><manvolnum>2</manvolnum></citerefentry>."
+#: limits.5.xml:109(para)
+msgid "S: max stack size (KB)"
 msgstr ""
 
-#: limits.5.xml:103(para)
-msgid "I: max nice value (0..39 which translates to 20..-19)"
+#: limits.5.xml:110(para)
+msgid "T: max CPU time (MIN)"
 msgstr ""
 
-#: limits.5.xml:105(para)
-msgid "O: max real time priority"
+#: limits.5.xml:111(para)
+msgid "U: max number of processes"
 msgstr ""
 
-#: limits.5.xml:108(para)
+#: limits.5.xml:114(para)
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
 "<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
 "entries are equivalent:"
 msgstr ""
 
-#: limits.5.xml:114(programlisting)
+#: limits.5.xml:120(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -6897,7 +7039,7 @@
 "    "
 msgstr ""
 
-#: limits.5.xml:119(para)
+#: limits.5.xml:125(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 "
@@ -6905,7 +7047,7 @@
 "<command>login</command> program."
 msgstr ""
 
-#: limits.5.xml:126(para)
+#: limits.5.xml:132(para)
 msgid ""
 "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
 "have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
@@ -6914,7 +7056,7 @@
 msgstr ""
 
 # type: Plain text
-#: limits.5.xml:133(para)
+#: limits.5.xml:139(para)
 #, fuzzy
 msgid ""
 "The limits specified in the form \"<replaceable>@group</replaceable>\" apply "
@@ -6923,45 +7065,45 @@
 "Il nome del gruppo verrà modificato da <replaceable>gruppo</replaceable> a "
 "<replaceable>nome_gruppo</replaceable>."
 
-#: limits.5.xml:139(para)
+#: limits.5.xml:145(para)
 msgid ""
-"If a line with limits for an user exist, only the first line for this user "
-"will be considered."
+"If more than one line with limits for an user exist, only the first line for "
+"this user will be considered."
 msgstr ""
 
-#: limits.5.xml:144(para)
+#: limits.5.xml:150(para)
 msgid ""
 "If no lines are specified for an user, the last <replaceable>@group</"
 "replaceable> line matching a group whose the user is a member of will be "
-"conisdered, or the last line with default limits if no groups contain the "
-"user)."
+"considered, or the last line with default limits if no groups contain the "
+"user."
 msgstr ""
 
-#: limits.5.xml:151(para)
+#: limits.5.xml:157(para)
 msgid ""
 "To completely disable limits for a user, a single dash \"<emphasis>-</"
 "emphasis>\" will do."
 msgstr ""
 
-#: limits.5.xml:156(para)
+#: limits.5.xml:162(para)
 msgid ""
 "To disable a limit for a user, a single dash \"<replaceable>-</replaceable>"
 "\" can be used instead of the numerical value for this limit."
 msgstr ""
 
-#: limits.5.xml:162(para)
+#: limits.5.xml:168(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:173(filename)
+#: limits.5.xml:179(filename)
 msgid "/etc/limits"
 msgstr ""
 
 # type: Plain text
-#: limits.5.xml:181(para)
+#: limits.5.xml:187(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>setpriority</"
@@ -6975,17 +7117,17 @@
 "<citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
-#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname)
-#: lastlog.8.xml:46(command)
+#: lastlog.8.xml:39(refentrytitle) lastlog.8.xml:46(refname)
+#: lastlog.8.xml:52(command)
 msgid "lastlog"
 msgstr "lastlog"
 
-#: lastlog.8.xml:41(refpurpose)
+#: lastlog.8.xml:47(refpurpose)
 msgid "reports the most recent login of all users or of a given user"
 msgstr ""
 
 # type: Plain text
-#: lastlog.8.xml:55(para)
+#: lastlog.8.xml:61(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</"
@@ -7002,18 +7144,18 @@
 "filename>."
 
 # type: TP
-#: lastlog.8.xml:67(para)
+#: lastlog.8.xml:73(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:72(term)
+#: lastlog.8.xml:78(term)
 msgid ""
 "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
 
 # type: Plain text
-#: lastlog.8.xml:76(para)
+#: lastlog.8.xml:82(para)
 #, fuzzy
 msgid ""
 "Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
@@ -7021,14 +7163,14 @@
 "Mostra solo i record di ultimo accesso più recenti di un numero di I<GIORNI>."
 
 # type: IP
-#: lastlog.8.xml:90(term) faillog.8.xml:157(term)
+#: lastlog.8.xml:109(term) faillog.8.xml:176(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:95(para)
+#: lastlog.8.xml:114(para)
 msgid ""
 "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
 "emphasis>."
@@ -7037,7 +7179,7 @@
 "remap=\"I\">GIORNI</emphasis>."
 
 # type: IP
-#: lastlog.8.xml:102(term) faillog.8.xml:168(term)
+#: lastlog.8.xml:121(term) faillog.8.xml:187(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
@@ -7049,7 +7191,7 @@
 "<option>-u</option>, <option>--user</option> <replaceable>LOGIN</replaceable>"
 
 # type: Plain text
-#: lastlog.8.xml:107(para)
+#: lastlog.8.xml:126(para)
 #, fuzzy
 #| msgid ""
 #| "Print the lastlog record for user with specified <emphasis remap=\"I"
@@ -7059,7 +7201,7 @@
 "Mostra il record di ultimo accesso per l'utente specificato da <emphasis "
 "remap=\"I\">LOGIN</emphasis>."
 
-#: lastlog.8.xml:110(para) faillog.8.xml:178(para)
+#: lastlog.8.xml:129(para) faillog.8.xml:197(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</"
@@ -7069,7 +7211,7 @@
 msgstr ""
 
 # type: Plain text
-#: lastlog.8.xml:122(para)
+#: lastlog.8.xml:141(para)
 #, fuzzy
 msgid ""
 "If the user has never logged in the message <emphasis>** Never logged in**</"
@@ -7084,19 +7226,19 @@
 "posto della porta e della data, il messaggio <emphasis>\"**Nessun accesso "
 "effettuato**\"</emphasis>."
 
-#: lastlog.8.xml:127(para)
+#: lastlog.8.xml:146(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:135(title) groups.1.xml:65(title) chsh.1.xml:106(title)
-#: chage.1.xml:197(title)
+#: lastlog.8.xml:154(title) groups.1.xml:71(title) chsh.1.xml:122(title)
+#: chage.1.xml:213(title)
 msgid "NOTE"
 msgstr "NOTA"
 
-#: lastlog.8.xml:136(para)
+#: lastlog.8.xml:155(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, "
@@ -7106,16 +7248,16 @@
 "its real size with \"<command>ls -s</command>\"."
 msgstr ""
 
-#: lastlog.8.xml:150(filename)
+#: lastlog.8.xml:169(filename)
 msgid "/var/log/lastlog"
 msgstr ""
 
-#: lastlog.8.xml:152(para)
+#: lastlog.8.xml:171(para)
 msgid "Database times of previous user logins."
 msgstr ""
 
 # type: Plain text
-#: lastlog.8.xml:160(para)
+#: lastlog.8.xml:179(para)
 #, fuzzy
 msgid ""
 "Large gaps in UID numbers will cause the lastlog program to run longer with "
@@ -7134,17 +7276,17 @@
 "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:33(refentrytitle) gshadow.5.xml:38(refname)
+#: gshadow.5.xml:37(refentrytitle) gshadow.5.xml:44(refname)
 msgid "gshadow"
 msgstr "gshadow"
 
 # type: Plain text
-#: gshadow.5.xml:39(refpurpose)
+#: gshadow.5.xml:45(refpurpose)
 msgid "shadowed group file"
 msgstr ""
 
 # type: Plain text
-#: gshadow.5.xml:44(para)
+#: gshadow.5.xml:50(para)
 #, fuzzy
 #| msgid ""
 #| "<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
@@ -7158,21 +7300,21 @@
 "password cifrate per gli account degli utenti e, opzionalmente, le "
 "informazioni sulla durata delle password. Sono inclusi:"
 
-#: gshadow.5.xml:54(para)
+#: gshadow.5.xml:60(para)
 msgid "Each line of this file contains the following colon-separated fields:"
 msgstr ""
 
 # type: Plain text
-#: gshadow.5.xml:60(emphasis)
+#: gshadow.5.xml:66(emphasis)
 msgid "group name"
 msgstr ""
 
-#: gshadow.5.xml:62(para)
+#: gshadow.5.xml:68(para)
 msgid "It must be a valid group name, which exist on the system."
 msgstr ""
 
 # type: Plain text
-#: gshadow.5.xml:75(para)
+#: gshadow.5.xml:81(para)
 #, fuzzy
 msgid ""
 "If the password field contains some string that is not a valid result of "
@@ -7187,7 +7329,7 @@
 "citerefentry> senza la password, i non-membri devono fornire la password."
 
 # type: Plain text
-#: gshadow.5.xml:82(para)
+#: gshadow.5.xml:88(para)
 #, fuzzy
 #| msgid ""
 #| "The new value of the user's password file comment field. It is normally "
@@ -7202,14 +7344,14 @@
 "modificato usando l'utilità <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: gshadow.5.xml:88(para)
+#: gshadow.5.xml:94(para)
 msgid ""
 "This field may be empty, in which case only the group members can gain the "
 "group permissions."
 msgstr ""
 
 # type: Plain text
-#: gshadow.5.xml:98(para)
+#: gshadow.5.xml:104(para)
 #, fuzzy
 msgid ""
 "This password supersedes any password specified in <filename>/etc/group</"
@@ -7223,12 +7365,12 @@
 "Queste informazioni hanno la precedenza su qualunque informazione sulle "
 "password o sulla loro durata presente in <filename>/etc/passwd</filename>."
 
-#: gshadow.5.xml:106(emphasis)
+#: gshadow.5.xml:112(emphasis)
 msgid "administrators"
 msgstr ""
 
 # type: Plain text
-#: gshadow.5.xml:108(para) gshadow.5.xml:124(para)
+#: gshadow.5.xml:114(para) gshadow.5.xml:130(para)
 #, fuzzy
 msgid "It must be a comma-separated list of user names."
 msgstr ""
@@ -7237,25 +7379,25 @@
 "#-#-#-#-#  grpck.8.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "- una lista valida di membri e amministratori"
 
-#: gshadow.5.xml:111(para)
+#: gshadow.5.xml:117(para)
 msgid "Administrators can change the password or the members of the group."
 msgstr ""
 
-#: gshadow.5.xml:115(para)
+#: gshadow.5.xml:121(para)
 msgid ""
 "Administrators also have the same permissions as the members (see below)."
 msgstr ""
 
-#: gshadow.5.xml:122(emphasis)
+#: gshadow.5.xml:128(emphasis)
 msgid "members"
 msgstr ""
 
-#: gshadow.5.xml:127(para)
+#: gshadow.5.xml:133(para)
 msgid "Members can access the group without being prompted for a password."
 msgstr ""
 
 # type: Plain text
-#: gshadow.5.xml:131(para)
+#: gshadow.5.xml:137(para)
 #, fuzzy
 msgid ""
 "You should use the same list of users as in <filename>/etc/group</filename>."
@@ -7269,7 +7411,7 @@
 "password o sulla loro durata presente in <filename>/etc/passwd</filename>."
 
 # type: Plain text
-#: gshadow.5.xml:160(para)
+#: gshadow.5.xml:166(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
@@ -7300,12 +7442,12 @@
 "citerefentry>."
 
 # type: Plain text
-#: grpck.8.xml:44(refpurpose)
+#: grpck.8.xml:47(refpurpose)
 msgid "verify integrity of group files"
 msgstr "verifica l'integrità dei file di gruppo"
 
 # type: Plain text
-#: grpck.8.xml:70(para)
+#: grpck.8.xml:65(para)
 #, fuzzy
 msgid ""
 "The <command>grpck</command> command verifies the integrity of the groups "
@@ -7323,20 +7465,20 @@
 "hanno altri errori impossibili da correggere."
 
 # type: Plain text
-#: grpck.8.xml:87(para)
+#: grpck.8.xml:82(para)
 #, fuzzy
 #| msgid "a unique group name"
 msgid "a unique and valid group name"
 msgstr "un nome univoco di gruppo"
 
-#: grpck.8.xml:90(para)
+#: grpck.8.xml:85(para)
 msgid ""
 "a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/"
 "group</filename> only)</phrase>"
 msgstr ""
 
 # type: Plain text
-#: grpck.8.xml:97(para)
+#: grpck.8.xml:92(para)
 #, fuzzy
 msgid ""
 "a valid list of members <phrase condition=\"gshadow\"> and administrators</"
@@ -7348,7 +7490,7 @@
 "- una lista valida di membri e amministratori"
 
 # type: Plain text
-#: grpck.8.xml:103(para)
+#: grpck.8.xml:98(para)
 #, fuzzy
 #| msgid ""
 #| "These four programs all operate on the normal and shadow password and "
@@ -7366,7 +7508,7 @@
 "<filename>/etc/gshadow</filename>."
 
 # type: Plain text
-#: grpck.8.xml:111(para)
+#: grpck.8.xml:106(para)
 #, fuzzy
 #| msgid ""
 #| "The checks for correct number of fields and unique group name are fatal. "
@@ -7395,7 +7537,7 @@
 "<command>groupmod</command> per correggerli."
 
 # type: Plain text
-#: grpck.8.xml:122(para)
+#: grpck.8.xml:117(para)
 #, fuzzy
 #| msgid ""
 #| "The commands which operate on the <filename>/etc/group</filename> file "
@@ -7414,26 +7556,26 @@
 "<command>grpck</command> per rimuovere la voce scorretta."
 
 # type: Plain text
-#: grpck.8.xml:134(para)
+#: grpck.8.xml:133(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:141(para)
+#: grpck.8.xml:146(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:151(para)
+#: grpck.8.xml:169(para)
 msgid ""
 "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
 "\">and <filename>/etc/gshadow</filename></phrase> by GID."
 msgstr ""
 
-#: grpck.8.xml:160(para)
+#: grpck.8.xml:178(para)
 #, fuzzy
 #| msgid ""
 #| "By default, <command>pwck</command> operates on the files <filename>/etc/"
@@ -7454,27 +7596,27 @@
 "\">passwd</emphasis> e <emphasis remap=\"I\">shadow</emphasis>."
 
 # type: Plain text
-#: grpck.8.xml:228(para)
+#: grpck.8.xml:246(para)
 msgid "one or more bad group entries"
 msgstr "una o più voci di gruppo contengono errori"
 
 # type: Plain text
-#: grpck.8.xml:234(para)
+#: grpck.8.xml:252(para)
 msgid "can't open group files"
 msgstr "impossibile aprire i file dei gruppi"
 
 # type: Plain text
-#: grpck.8.xml:240(para)
+#: grpck.8.xml:258(para)
 msgid "can't lock group files"
 msgstr "impossibile fare il lock dei file dei gruppi"
 
 # type: Plain text
-#: grpck.8.xml:246(para)
+#: grpck.8.xml:264(para)
 msgid "can't update group files"
 msgstr "impossibile aggiornare i file dei gruppi"
 
 # type: TP
-#: grpck.8.xml:210(para)
+#: grpck.8.xml:228(para)
 #, fuzzy
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
@@ -7486,7 +7628,7 @@
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
 # type: Plain text
-#: grpck.8.xml:255(para)
+#: grpck.8.xml:273(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -7520,22 +7662,22 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
-#: groups.1.xml:45(command)
+#: groups.1.xml:38(refentrytitle) groups.1.xml:45(refname)
+#: groups.1.xml:51(command)
 msgid "groups"
 msgstr "groups"
 
 # type: Plain text
-#: groups.1.xml:40(refpurpose)
+#: groups.1.xml:46(refpurpose)
 msgid "display current group names"
 msgstr "mostra i nomi dei gruppi correnti"
 
-#: groups.1.xml:47(replaceable) chfn.1.xml:58(replaceable)
+#: groups.1.xml:53(replaceable)
 msgid "user"
 msgstr ""
 
 # type: Plain text
-#: groups.1.xml:54(para)
+#: groups.1.xml:60(para)
 #, fuzzy
 msgid ""
 "The <command>groups</command> command displays the current group names or ID "
@@ -7552,11 +7694,17 @@
 "emphasis>."
 
 # type: Plain text
-#: groups.1.xml:66(para)
+#: groups.1.xml:72(para)
+#, fuzzy
+#| msgid ""
+#| "Systems which do not support concurrent group sets will have the "
+#| "information from <filename>/etc/group</filename> reported. The user must "
+#| "use <command>newgrp</command> or <command>sg</command> to change their "
+#| "current real and effective group ID."
 msgid ""
 "Systems which do not support concurrent group sets will have the information "
 "from <filename>/etc/group</filename> reported. The user must use "
-"<command>newgrp</command> or <command>sg</command> to change their current "
+"<command>newgrp</command> or <command>sg</command> to change his current "
 "real and effective group ID."
 msgstr ""
 "Sui sistemi che non supportano l'appartenenza a più gruppi "
@@ -7565,7 +7713,7 @@
 "<command>sg</command> per cambiare gli ID dei gruppi reale ed efficace."
 
 # type: Plain text
-#: groups.1.xml:88(para)
+#: groups.1.xml:94(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getgid</"
@@ -7582,16 +7730,16 @@
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
 # type: Plain text
-#: groupmod.8.xml:44(refpurpose)
+#: groupmod.8.xml:47(refpurpose)
 msgid "modify a group definition on the system"
 msgstr ""
 
 # type: TH
-#: groupmod.8.xml:53(replaceable)
+#: groupmod.8.xml:56(replaceable) groupdel.8.xml:56(replaceable)
 msgid "GROUP"
 msgstr ""
 
-#: groupmod.8.xml:59(para)
+#: groupmod.8.xml:62(para)
 msgid ""
 "The <command>groupmod</command> command modifies the definition of the "
 "specified <replaceable>GROUP</replaceable> by modifying the appropriate "
@@ -7599,18 +7747,18 @@
 msgstr ""
 
 # type: Plain text
-#: groupmod.8.xml:68(para)
+#: groupmod.8.xml:71(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:74(term) groupadd.8.xml:93(term)
+#: groupmod.8.xml:77(term) groupadd.8.xml:95(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 
 # type: Plain text
-#: groupmod.8.xml:78(para)
+#: groupmod.8.xml:81(para)
 #, fuzzy
 #| msgid ""
 #| "The name of the group will be changed from <replaceable>GROUP</"
@@ -7623,7 +7771,7 @@
 "<replaceable>nome_gruppo</replaceable>."
 
 # type: Plain text
-#: groupmod.8.xml:82(para)
+#: groupmod.8.xml:85(para)
 #, fuzzy
 #| msgid ""
 #| "The numerical value of the user's ID. This value must be unique, unless "
@@ -7643,21 +7791,27 @@
 "gruppo.  Valori tra 0 e 999 sono tipicamente riservati per account di "
 "sistema."
 
-#: groupmod.8.xml:89(para)
+#: groupmod.8.xml:92(para)
 msgid ""
+"Users who use the group as primary group will be updated to keep the group "
+"as their primary group."
+msgstr ""
+
+#: groupmod.8.xml:96(para)
+msgid ""
 "Any files that have the old group ID and must continue to belong to "
 "<replaceable>GROUP</replaceable>, must have their group ID changed manually."
 msgstr ""
 
 # type: TP
-#: groupmod.8.xml:104(term)
+#: groupmod.8.xml:111(term)
 msgid ""
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: groupmod.8.xml:109(para)
+#: groupmod.8.xml:116(para)
 msgid ""
 "The name of the group will be changed from <replaceable>GROUP</replaceable> "
 "to <replaceable>NEW_GROUP</replaceable> name."
@@ -7665,18 +7819,18 @@
 "Il nome del gruppo verrà modificato da <replaceable>gruppo</replaceable> a "
 "<replaceable>nome_gruppo</replaceable>."
 
-#: groupmod.8.xml:120(para)
+#: groupmod.8.xml:127(para)
 msgid ""
 "When used with the <option>-g</option> option, allow to change the group "
 "<replaceable>GID</replaceable> to a non-unique value."
 msgstr ""
 
-#: groupmod.8.xml:219(para)
+#: groupmod.8.xml:245(para)
 msgid "group name already in use"
 msgstr ""
 
 # type: TP
-#: groupmod.8.xml:183(para)
+#: groupmod.8.xml:209(para)
 #, fuzzy
 msgid ""
 "The <command>groupmod</command> command exits with the following values: "
@@ -7688,7 +7842,7 @@
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
 # type: Plain text
-#: groupmod.8.xml:234(para)
+#: groupmod.8.xml:260(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7721,35 +7875,35 @@
 "manvolnum></citerefentry>."
 
 # type: Plain text
-#: groupmems.8.xml:44(refpurpose)
+#: groupmems.8.xml:47(refpurpose)
 msgid "administer members of a user's primary group"
 msgstr ""
 
-#: groupmems.8.xml:51(replaceable) groupmems.8.xml:52(replaceable)
+#: groupmems.8.xml:54(replaceable) groupmems.8.xml:55(replaceable)
 msgid "user_name"
 msgstr ""
 
-#: groupmems.8.xml:51(arg)
+#: groupmems.8.xml:54(arg)
 msgid "-a <placeholder-1/>"
 msgstr "-a <placeholder-1/>"
 
-#: groupmems.8.xml:52(arg)
+#: groupmems.8.xml:55(arg)
 msgid "-d <placeholder-1/>"
 msgstr "-d <placeholder-1/>"
 
-#: groupmems.8.xml:53(replaceable)
+#: groupmems.8.xml:56(replaceable)
 msgid "group_name"
 msgstr ""
 
-#: groupmems.8.xml:53(arg)
+#: groupmems.8.xml:56(arg)
 msgid "-g <placeholder-1/>"
 msgstr "-g <placeholder-1/>"
 
-#: groupmems.8.xml:54(arg)
+#: groupmems.8.xml:57(arg)
 msgid "-l"
 msgstr "-l"
 
-#: groupmems.8.xml:61(para)
+#: groupmems.8.xml:64(para)
 msgid ""
 "The <command>groupmems</command> command allows a user to administer his/her "
 "own group membership list without the requirement of superuser privileges. "
@@ -7757,20 +7911,20 @@
 "users to be in their own name sake primary group (i.e., guest / guest)."
 msgstr ""
 
-#: groupmems.8.xml:69(para)
+#: groupmems.8.xml:72(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:76(para)
+#: groupmems.8.xml:79(para)
 msgid ""
 "The options which apply to the <command>groupmems</command> command are:"
 msgstr "Il comando <command>groupmems</command> accetta le seguenti opzioni:"
 
 # type: IP
-#: groupmems.8.xml:82(term)
+#: groupmems.8.xml:85(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-m</option>, <option>--maximum</option><replaceable>MAX</"
@@ -7781,12 +7935,12 @@
 msgstr ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 
-#: groupmems.8.xml:84(para)
+#: groupmems.8.xml:87(para)
 msgid "Add an user to the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:85(para) groupmems.8.xml:101(para)
-#: groupmems.8.xml:132(para)
+#: groupmems.8.xml:88(para) groupmems.8.xml:104(para)
+#: groupmems.8.xml:135(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 "
@@ -7794,7 +7948,7 @@
 msgstr ""
 
 # type: IP
-#: groupmems.8.xml:93(term)
+#: groupmems.8.xml:96(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -7805,18 +7959,18 @@
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
 
-#: groupmems.8.xml:95(para)
+#: groupmems.8.xml:98(para)
 msgid "Delete a user from the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:96(para)
+#: groupmems.8.xml:99(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: IP
-#: groupmems.8.xml:109(term)
+#: groupmems.8.xml:112(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
@@ -7827,35 +7981,35 @@
 msgstr ""
 "<option>-u</option>, <option>--user</option> <replaceable>LOGIN</replaceable>"
 
-#: groupmems.8.xml:111(para)
+#: groupmems.8.xml:114(para)
 msgid "The superuser can specify which group membership list to modify."
 msgstr ""
 
 # type: IP
-#: groupmems.8.xml:123(term) chage.1.xml:132(term)
+#: groupmems.8.xml:126(term) chage.1.xml:135(term)
 msgid "<option>-l</option>, <option>--list</option>"
 msgstr "<option>-l</option>, <option>--list</option>"
 
-#: groupmems.8.xml:125(para)
+#: groupmems.8.xml:128(para)
 msgid "List the group membership list."
 msgstr ""
 
 # type: TP
-#: groupmems.8.xml:129(term)
+#: groupmems.8.xml:132(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:131(para)
+#: groupmems.8.xml:134(para)
 msgid "Purge all users from the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:143(title)
+#: groupmems.8.xml:159(title)
 msgid "SETUP"
 msgstr ""
 
-#: groupmems.8.xml:144(para)
+#: groupmems.8.xml:160(para)
 msgid ""
 "The <command>groupmems</command> executable should be in mode <literal>2770</"
 "literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</"
@@ -7864,7 +8018,7 @@
 "utility to manage their own group membership list."
 msgstr ""
 
-#: groupmems.8.xml:153(programlisting)
+#: groupmems.8.xml:169(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -7876,12 +8030,12 @@
 msgstr ""
 
 # type: Plain text
-#: groupmems.8.xml:185(para)
+#: groupmems.8.xml:201(para)
 msgid "secure group account information"
 msgstr "informazioni sicure sugli account di gruppo"
 
 # type: Plain text
-#: groupmems.8.xml:193(para)
+#: groupmems.8.xml:209(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7910,23 +8064,36 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Plain text
-#: groupdel.8.xml:44(refpurpose)
+#: groupdel.8.xml:47(refpurpose)
 msgid "delete a group"
 msgstr "Rimuove un gruppo"
 
 # type: Plain text
-#: groupdel.8.xml:58(para)
+#: groupdel.8.xml:62(para)
+#, fuzzy
+#| 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."
 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."
+"deleting all entries that refer to <replaceable>GROUP</replaceable>. The "
+"named group must exist."
 msgstr ""
 "Il comando <command>groupdel</command> modifica i file di account di "
 "sistema, rimuovendo tutte le voci che si riferiscono a <emphasis remap=\"I"
 "\">gruppo</emphasis>.  Il gruppo nominato deve esistere."
 
 # type: Plain text
-#: groupdel.8.xml:66(para)
+#: groupdel.8.xml:70(para)
+#, fuzzy
+#| msgid ""
+#| "The options which apply to the <command>groupmod</command> command are:"
+msgid "The options which apply to the <command>groupdel</command> command are:"
+msgstr "Il comando <command>groupmod</command> accetta le seguenti opzioni:"
+
+# type: Plain text
+#: groupdel.8.xml:99(para)
 msgid ""
 "You may not remove the primary group of any existing user. You must remove "
 "the user before you remove the group."
@@ -7935,7 +8102,7 @@
 "rimuovere l'utente prima di rimuovere il gruppo."
 
 # type: Plain text
-#: groupdel.8.xml:70(para)
+#: groupdel.8.xml:103(para)
 #, fuzzy
 #| msgid ""
 #| "You must manually check all file systems to insure that no files remain "
@@ -7948,12 +8115,12 @@
 "rimanga alcun file avente come ID di gruppo il gruppo specificato."
 
 # type: Plain text
-#: groupdel.8.xml:132(para)
+#: groupdel.8.xml:165(para)
 msgid "can't remove user's primary group"
 msgstr "operazione impossibile perché il gruppo è primario per un utente"
 
 # type: TP
-#: groupdel.8.xml:108(para)
+#: groupdel.8.xml:141(para)
 #, fuzzy
 msgid ""
 "The <command>groupdel</command> command exits with the following values: "
@@ -7965,7 +8132,23 @@
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
 # type: Plain text
-#: groupdel.8.xml:147(para)
+#: groupdel.8.xml:180(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>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7980,7 +8163,7 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7998,12 +8181,12 @@
 "manvolnum></citerefentry>"
 
 # type: Plain text
-#: groupadd.8.xml:47(refpurpose)
+#: groupadd.8.xml:49(refpurpose)
 msgid "create a new group"
 msgstr "Crea un nuovo gruppo"
 
 # type: Plain text
-#: groupadd.8.xml:64(para)
+#: groupadd.8.xml:66(para)
 #, fuzzy
 msgid ""
 "The <command>groupadd</command> command creates a new group account using "
@@ -8016,11 +8199,11 @@
 "necessitano."
 
 # type: Plain text
-#: groupadd.8.xml:73(para)
+#: groupadd.8.xml:75(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:83(para)
+#: groupadd.8.xml:85(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 "
@@ -8029,7 +8212,7 @@
 msgstr ""
 
 # type: Plain text
-#: groupadd.8.xml:97(para)
+#: groupadd.8.xml:99(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 "
@@ -8044,14 +8227,14 @@
 "gruppo.  Valori tra 0 e 999 sono tipicamente riservati per account di "
 "sistema."
 
-#: groupadd.8.xml:117(para)
+#: groupadd.8.xml:119(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (GID_MIN, GID_MAX "
 "and others). Multiple <option>-K</option> options can be specified."
 msgstr ""
 
 # type: IP
-#: groupadd.8.xml:122(para)
+#: groupadd.8.xml:124(para)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
@@ -8063,25 +8246,25 @@
 msgstr ""
 "<option>-u</option>, <option>--user</option> <replaceable>LOGIN</replaceable>"
 
-#: groupadd.8.xml:126(para)
+#: groupadd.8.xml:128(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:138(para)
+#: groupadd.8.xml:140(para)
 msgid "This option permits to add a group with a non-unique GID."
 msgstr ""
 
 # type: Plain text
-#: groupadd.8.xml:170(para)
+#: groupadd.8.xml:172(para)
 #, fuzzy
 #| msgid "create a new group"
 msgid "Create a system group."
 msgstr "Crea un nuovo gruppo"
 
-#: groupadd.8.xml:173(para)
+#: groupadd.8.xml:175(para)
 msgid ""
 "The numeric identifiers of new system groups are chosen in the "
 "<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
@@ -8089,19 +8272,19 @@
 "<option>GID_MAX</option>."
 msgstr ""
 
-#: groupadd.8.xml:224(para)
+#: groupadd.8.xml:239(para)
 msgid ""
 "Groupnames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
 "dollar sign. In regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 
-#: groupadd.8.xml:230(para)
+#: groupadd.8.xml:245(para)
 msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr ""
 
 # type: Plain text
-#: groupadd.8.xml:233(para)
+#: groupadd.8.xml:248(para)
 #, fuzzy
 msgid ""
 "You may not add a NIS or LDAP group. This must be performed on the "
@@ -8110,22 +8293,22 @@
 "Non è possibile aggiungere un utente ad un gruppo NIS. Questo deve essere "
 "fatto sul server NIS."
 
-#: groupadd.8.xml:237(para)
+#: groupadd.8.xml:252(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:270(para)
+#: groupadd.8.xml:285(para)
 msgid "GID not unique (when <option>-o</option> not used)"
 msgstr ""
 
-#: groupadd.8.xml:276(para)
+#: groupadd.8.xml:291(para)
 msgid "group name not unique"
 msgstr ""
 
 # type: TP
-#: groupadd.8.xml:246(para)
+#: groupadd.8.xml:261(para)
 #, fuzzy
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
@@ -8137,7 +8320,7 @@
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
 # type: Plain text
-#: groupadd.8.xml:291(para)
+#: groupadd.8.xml:306(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -8171,23 +8354,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:49(phrase)
+#: gpasswd.1.xml:52(phrase)
 #, fuzzy
 #| msgid "administer the <placeholder-1/> file"
 msgid "administer <placeholder-1/>"
 msgstr "amministra il file <placeholder-1/>"
 
-#: gpasswd.1.xml:52(phrase)
+#: gpasswd.1.xml:55(phrase)
 #, fuzzy
 msgid "administer <placeholder-1/> and <placeholder-2/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:63(replaceable)
+#: gpasswd.1.xml:66(replaceable) expiry.1.xml:57(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "opzioni"
 
-#: gpasswd.1.xml:73(para)
+#: gpasswd.1.xml:76(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -8196,7 +8379,7 @@
 msgstr ""
 
 # type: Plain text
-#: gpasswd.1.xml:81(para)
+#: gpasswd.1.xml:84(para)
 #, fuzzy
 msgid ""
 "System administrators can use the <option>-A</option> option to define group "
@@ -8211,7 +8394,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:86(para)
+#: gpasswd.1.xml:89(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -8220,7 +8403,7 @@
 msgstr ""
 
 # type: Plain text
-#: gpasswd.1.xml:93(para)
+#: gpasswd.1.xml:96(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still use "
@@ -8234,12 +8417,12 @@
 "citerefentry> senza la password, i non-membri devono fornire la password."
 
 # type: SS
-#: gpasswd.1.xml:101(title)
+#: gpasswd.1.xml:104(title)
 msgid "Notes about group passwords"
 msgstr "Note sulle password di gruppo"
 
 # type: Plain text
-#: gpasswd.1.xml:102(para)
+#: gpasswd.1.xml:105(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 "
@@ -8250,7 +8433,7 @@
 "la cooperazione tra vari utenti."
 
 # type: Plain text
-#: gpasswd.1.xml:113(para)
+#: gpasswd.1.xml:116(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
@@ -8260,18 +8443,18 @@
 "possono essere utilizzate solo quando <command>login</command> viene "
 "invocato da root."
 
-#: gpasswd.1.xml:117(para)
+#: gpasswd.1.xml:120(para)
 msgid "The options cannot be combined."
 msgstr ""
 
 # type: Plain text
-#: gpasswd.1.xml:120(para)
+#: gpasswd.1.xml:123(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:125(term)
+#: gpasswd.1.xml:128(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-m</option>, <option>--maximum</option><replaceable>MAX</"
@@ -8282,7 +8465,7 @@
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 
 # type: Plain text
-#: gpasswd.1.xml:129(para)
+#: gpasswd.1.xml:132(para)
 #, fuzzy
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
@@ -8292,7 +8475,7 @@
 "<replaceable>nome_gruppo</replaceable>."
 
 # type: IP
-#: gpasswd.1.xml:138(term)
+#: gpasswd.1.xml:141(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -8303,7 +8486,7 @@
 "<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
 
 # type: Plain text
-#: gpasswd.1.xml:142(para)
+#: gpasswd.1.xml:145(para)
 #, fuzzy
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
@@ -8313,13 +8496,25 @@
 "<replaceable>nome_gruppo</replaceable>."
 
 # type: IP
-#: gpasswd.1.xml:159(term)
+#: gpasswd.1.xml:162(term)
 #, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
+#| "replaceable>"
+msgid ""
+"<option>-Q</option>, <option>--root</option><replaceable>CHROOT_DIR</"
+"replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--user</option> <replaceable>LOGIN</replaceable>"
+
+# type: IP
+#: gpasswd.1.xml:177(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:163(para)
+#: gpasswd.1.xml:181(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 "
@@ -8327,13 +8522,13 @@
 msgstr ""
 
 # type: IP
-#: gpasswd.1.xml:174(term)
+#: gpasswd.1.xml:192(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:178(para)
+#: gpasswd.1.xml:196(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 "
@@ -8341,7 +8536,7 @@
 msgstr ""
 
 # type: IP
-#: gpasswd.1.xml:189(term)
+#: gpasswd.1.xml:207(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
@@ -8353,7 +8548,7 @@
 "<option>-u</option>, <option>--user</option> <replaceable>LOGIN</replaceable>"
 
 # type: Plain text
-#: gpasswd.1.xml:193(para)
+#: gpasswd.1.xml:211(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr ""
@@ -8363,7 +8558,7 @@
 "- una lista valida di membri e amministratori"
 
 # type: IP
-#: gpasswd.1.xml:201(term)
+#: gpasswd.1.xml:219(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -8374,11 +8569,11 @@
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
 
-#: gpasswd.1.xml:205(para)
+#: gpasswd.1.xml:223(para)
 msgid "Set the list of group members."
 msgstr ""
 
-#: gpasswd.1.xml:215(para)
+#: gpasswd.1.xml:233(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -8388,7 +8583,7 @@
 msgstr ""
 
 # type: Plain text
-#: gpasswd.1.xml:260(para)
+#: gpasswd.1.xml:278(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -8415,19 +8610,19 @@
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: 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:86(refentrytitle)
+#: faillog.8.xml:38(refentrytitle) faillog.8.xml:45(refname)
+#: faillog.8.xml:51(command) faillog.5.xml:38(refentrytitle)
+#: faillog.5.xml:45(refname) faillog.5.xml:92(refentrytitle)
 msgid "faillog"
 msgstr "faillog"
 
 # type: Plain text
-#: faillog.8.xml:40(refpurpose)
+#: faillog.8.xml:46(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:54(para)
+#: faillog.8.xml:60(para)
 #, fuzzy
 #| msgid ""
 #| "<command>faillog</command> formats the contents of the failure log from "
@@ -8449,31 +8644,31 @@
 "utenti che hanno fallito almeno un tentativo di accesso."
 
 # type: Plain text
-#: faillog.8.xml:65(para)
+#: faillog.8.xml:71(para)
 msgid "The options which apply to the <command>faillog</command> command are:"
 msgstr "Il comando <command>faillog</command> accetta le seguenti opzioni:"
 
-#: faillog.8.xml:73(para)
+#: faillog.8.xml:79(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:77(para)
+#: faillog.8.xml:83(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "The range of users can be restricted with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: faillog.8.xml:81(para)
+#: faillog.8.xml:87(para)
 msgid ""
 "In display mode, this is still restricted to existing users but forces the "
 "display of the faillog entries even if they are empty."
 msgstr ""
 
-#: faillog.8.xml:86(para)
+#: faillog.8.xml:92(para)
 msgid ""
 "With the <option>-l</option>, <option>-m</option>, <option>-r</option>, "
 "<option>-t</option> options, the users' records are changed, even if the "
@@ -8482,7 +8677,7 @@
 msgstr ""
 
 # type: IP
-#: faillog.8.xml:103(term)
+#: faillog.8.xml:109(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
@@ -8495,7 +8690,7 @@
 "replaceable>"
 
 # type: Plain text
-#: faillog.8.xml:108(para)
+#: faillog.8.xml:114(para)
 #, fuzzy
 #| msgid ""
 #| "Lock account to <replaceable>SEC</replaceable> seconds after failed login."
@@ -8505,21 +8700,21 @@
 "Blocca l'account per <replaceable>SEC</replaceable> secondi dopo un "
 "tentativo di accesso fallito."
 
-#: faillog.8.xml:112(para) faillog.8.xml:138(para) faillog.8.xml:150(para)
+#: faillog.8.xml:118(para) faillog.8.xml:144(para) faillog.8.xml:156(para)
 msgid ""
 "Write access to <filename>/var/log/faillog</filename> is required for this "
 "option."
 msgstr ""
 
 # type: IP
-#: faillog.8.xml:119(term)
+#: faillog.8.xml:125(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:124(para)
+#: faillog.8.xml:130(para)
 #, fuzzy
 #| msgid ""
 #| "Reset the counters of login failures or one record if used with the "
@@ -8534,29 +8729,29 @@
 "replaceable>. Per usare questa opzione è richiesto l'accesso in scrittura a "
 "<filename>/var/log/faillog</filename>."
 
-#: faillog.8.xml:128(para)
+#: faillog.8.xml:134(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:133(para)
+#: faillog.8.xml:139(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:145(term)
+#: faillog.8.xml:151(term)
 msgid "<option>-r</option>, <option>--reset</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: faillog.8.xml:147(para)
+#: faillog.8.xml:153(para)
 msgid "Reset the counters of login failures."
 msgstr ""
 
 # type: Plain text
-#: faillog.8.xml:161(para)
+#: faillog.8.xml:180(para)
 #, fuzzy
 #| msgid ""
 #| "Display faillog records more recent than <replaceable>DAYS</replaceable>. "
@@ -8569,7 +8764,7 @@
 "precedenza sull'uso di <option>-u</option>."
 
 # type: Plain text
-#: faillog.8.xml:173(para)
+#: faillog.8.xml:192(para)
 #, fuzzy
 #| msgid ""
 #| "Display faillog record or maintains failure counters and limits (if used "
@@ -8586,7 +8781,7 @@
 "replaceable>."
 
 # type: Plain text
-#: faillog.8.xml:191(para)
+#: faillog.8.xml:210(para)
 #, fuzzy
 #| msgid ""
 #| "The <option>-r</option>, <option>-h</option> and <option>-f</option> "
@@ -8601,7 +8796,7 @@
 "invocato da root."
 
 # type: Plain text
-#: faillog.8.xml:200(para)
+#: faillog.8.xml:219(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 "
@@ -8616,17 +8811,17 @@
 "option> o se viene richiesto di mostrare tutti gli utenti con l'opzione "
 "<option>-a</option>."
 
-#: faillog.8.xml:213(filename) faillog.5.xml:74(filename)
+#: faillog.8.xml:232(filename) faillog.5.xml:80(filename)
 msgid "/var/log/faillog"
 msgstr "/var/log/faillog"
 
 # type: Plain text
-#: faillog.8.xml:215(para) faillog.5.xml:76(para)
+#: faillog.8.xml:234(para) faillog.5.xml:82(para)
 msgid "Failure logging file."
 msgstr ""
 
 # type: Plain text
-#: faillog.8.xml:223(para)
+#: faillog.8.xml:242(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
@@ -8637,24 +8832,24 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Plain text
-#: faillog.5.xml:40(refpurpose)
+#: faillog.5.xml:46(refpurpose)
 msgid "login failure logging file"
 msgstr "File di log degli accessi falliti"
 
-#: faillog.5.xml:45(para)
+#: faillog.5.xml:51(para)
 msgid ""
 "<filename>/var/log/faillog</filename> maintains a count of login failures "
 "and the limits for each account."
 msgstr ""
 
 # type: Plain text
-#: faillog.5.xml:49(para)
+#: faillog.5.xml:55(para)
 #, fuzzy
 msgid ""
 "The file contains fixed length records, indexed by numerical UID. Each "
 "record contains the count of login failures since the last successful login; "
 "the maximum number of failures before the account is disabled; the line on "
-"whiche the last login failure occurred; the date of the last login failure; "
+"which the last login failure occurred; the date of the last login failure; "
 "and the duration (in seconds) during which the account will be locked after "
 "a failure."
 msgstr ""
@@ -8667,12 +8862,12 @@
 "avvenuto e infine la data in cui è avvenuto."
 
 # type: Plain text
-#: faillog.5.xml:59(para)
+#: faillog.5.xml:65(para)
 msgid "The structure of the file is:"
 msgstr "La struttura del file è la seguente:"
 
 # type: Plain text
-#: faillog.5.xml:60(programlisting)
+#: faillog.5.xml:66(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -8693,18 +8888,18 @@
 "\tlong    fail_locktime;\n"
 "};"
 
-#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
-#: expiry.1.xml:52(command)
+#: expiry.1.xml:42(refentrytitle) expiry.1.xml:49(refname)
+#: expiry.1.xml:55(command)
 msgid "expiry"
 msgstr "expiry"
 
 # type: Plain text
-#: expiry.1.xml:47(refpurpose)
+#: expiry.1.xml:50(refpurpose)
 msgid "check and enforce password expiration policy"
 msgstr "controlla e fa rispettare la scadenza della password"
 
 # type: Plain text
-#: expiry.1.xml:60(para)
+#: expiry.1.xml:64(para)
 #, fuzzy
 msgid ""
 "The <command>expiry</command> command checks (<option>-c</option>) the "
@@ -8716,7 +8911,32 @@
 "cambiata. Questo comando può essere eseguito da un utente qualsiasi."
 
 # type: Plain text
-#: expiry.1.xml:87(para) chage.1.xml:278(para)
+#: expiry.1.xml:73(para)
+#, fuzzy
+#| msgid "The options which apply to the <command>pwck</command> command are:"
+msgid "The options which apply to the <command>expiry</command> command are:"
+msgstr "Il comando <command>pwck</command> accetta le seguenti opzioni:"
+
+# type: IP
+#: expiry.1.xml:78(term)
+#, fuzzy
+#| msgid "<option>-L</option>, <option>--lock</option>"
+msgid "<option>-c</option>, <option>--check</option>"
+msgstr "<option>-L</option>, <option>--lock</option>"
+
+# type: Plain text
+#: expiry.1.xml:80(para)
+#, fuzzy
+#| msgid "check and enforce password expiration policy"
+msgid "Check the password expiration of the current user."
+msgstr "controlla e fa rispettare la scadenza della password"
+
+#: expiry.1.xml:86(para)
+msgid "Force a password change if the current user has an expired password."
+msgstr ""
+
+# type: Plain text
+#: expiry.1.xml:121(para) chage.1.xml:294(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -8727,12 +8947,12 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Plain text
-#: chsh.1.xml:46(refpurpose)
+#: chsh.1.xml:49(refpurpose)
 msgid "change login shell"
 msgstr "cambia la shell di login"
 
 # type: Plain text
-#: chsh.1.xml:63(para)
+#: chsh.1.xml:66(para)
 #, fuzzy
 msgid ""
 "The <command>chsh</command> command changes the user login shell. This "
@@ -8747,12 +8967,12 @@
 "account."
 
 # type: Plain text
-#: chsh.1.xml:74(para)
+#: chsh.1.xml:77(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:96(para)
+#: chsh.1.xml:112(para)
 #, fuzzy
 msgid ""
 "If the <option>-s</option> option is not selected, <command>chsh</command> "
@@ -8768,7 +8988,7 @@
 "[ ]</emphasis>."
 
 # type: Plain text
-#: chsh.1.xml:107(para)
+#: chsh.1.xml:123(para)
 #, fuzzy
 msgid ""
 "The only restriction placed on the login shell is that the command name must "
@@ -8788,12 +9008,12 @@
 "accidentalmente un utente selezionasse una shell limitata, non potrebbe più "
 "tornare alla shell di login che usava originariamente."
 
-#: chsh.1.xml:142(filename)
+#: chsh.1.xml:158(filename)
 msgid "/etc/shells"
 msgstr "/etc/shells"
 
 # type: Plain text
-#: chsh.1.xml:144(para)
+#: chsh.1.xml:160(para)
 msgid "List of valid login shells."
 msgstr ""
 "#-#-#-#-#    #-#-#-#-#\n"
@@ -8802,7 +9022,7 @@
 "Elenco delle shell di login ammesse."
 
 # type: Plain text
-#: chsh.1.xml:158(para)
+#: chsh.1.xml:174(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -8817,12 +9037,12 @@
 "citerefentry>."
 
 # type: Plain text
-#: chpasswd.8.xml:47(refpurpose)
+#: chpasswd.8.xml:50(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "aggiorna le password in modo non interattivo"
 
 # type: Plain text
-#: chpasswd.8.xml:61(para)
+#: chpasswd.8.xml:64(para)
 #, fuzzy
 msgid ""
 "The <command>chpasswd</command> command reads a list of user name and "
@@ -8834,7 +9054,7 @@
 "utenti esistenti. Ciascuna riga usa il formato:"
 
 # type: Plain text
-#: chpasswd.8.xml:66(para)
+#: chpasswd.8.xml:69(para)
 msgid ""
 "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -8843,7 +9063,7 @@
 "emphasis>"
 
 # type: Plain text
-#: chpasswd.8.xml:70(para)
+#: chpasswd.8.xml:73(para)
 #, fuzzy
 msgid ""
 "By default the passwords must be supplied in clear-text, and are encrypted "
@@ -8854,7 +9074,7 @@
 "L'algoritmo di cifratura predefinito è DES. Se sono presenti, vengono "
 "aggiornate anche le informazioni sulla durata delle password."
 
-#: chpasswd.8.xml:75(para)
+#: chpasswd.8.xml:78(para)
 msgid ""
 "The default encryption algorithm can be defined for the system with the "
 "<option>ENCRYPT_METHOD</option> or <option>MD5_CRYPT_ENAB</option> variables "
@@ -8862,14 +9082,14 @@
 "<option>-e</option>, <option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
-#: chpasswd.8.xml:83(para)
+#: chpasswd.8.xml:86(para)
 msgid ""
 "By default, passwords are encrypted by PAM, but (even if not recommended) "
 "you can select a different encryption method with the <option>-e</option>, "
 "<option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
-#: chpasswd.8.xml:89(para)
+#: chpasswd.8.xml:92(para)
 msgid ""
 "<phrase condition=\"pam\">Except when PAM is used to encrypt the passwords,</"
 "phrase><command>chpasswd</command> first updates all the passwords in "
@@ -8877,7 +9097,7 @@
 "any user."
 msgstr ""
 
-#: chpasswd.8.xml:95(para)
+#: chpasswd.8.xml:98(para)
 msgid ""
 "When PAM is used to encrypt the passwords (and update the passwords in the "
 "system database) then if a password cannot be updated <command>chpasswd</"
@@ -8886,7 +9106,7 @@
 msgstr ""
 
 # type: Plain text
-#: chpasswd.8.xml:101(para) chgpasswd.8.xml:81(para)
+#: chpasswd.8.xml:104(para) chgpasswd.8.xml:84(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
@@ -8895,12 +9115,12 @@
 "necessità di creare molti account nello stesso momento."
 
 # type: Plain text
-#: chpasswd.8.xml:109(para)
+#: chpasswd.8.xml:112(para)
 msgid "The options which apply to the <command>chpasswd</command> command are:"
 msgstr "Il comando <command>chpasswd</command> accetta le seguenti opzioni:"
 
 # type: IP
-#: chpasswd.8.xml:115(term)
+#: chpasswd.8.xml:118(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -8911,15 +9131,15 @@
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
 
-#: chpasswd.8.xml:121(para) chgpasswd.8.xml:98(para)
+#: chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
 msgid "The available methods are DES, MD5, and NONE."
 msgstr ""
 
-#: chpasswd.8.xml:128(para)
+#: chpasswd.8.xml:131(para)
 msgid "By default, PAM is used to encrypt the passwords."
 msgstr ""
 
-#: chpasswd.8.xml:131(para)
+#: chpasswd.8.xml:134(para)
 msgid ""
 "By default (if none of the <option>-c</option>, <option>-m</option>, or "
 "<option>-e</option> options are specified), the encryption method is defined "
@@ -8928,22 +9148,22 @@
 msgstr ""
 
 # type: IP
-#: chpasswd.8.xml:142(term) chgpasswd.8.xml:108(term)
+#: chpasswd.8.xml:145(term) chgpasswd.8.xml:111(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
 # type: Plain text
-#: chpasswd.8.xml:144(para) chgpasswd.8.xml:110(para)
+#: chpasswd.8.xml:147(para) chgpasswd.8.xml:113(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Le password fornite sono in forma cifrata."
 
 # type: IP
-#: chpasswd.8.xml:158(term) chgpasswd.8.xml:120(term)
+#: chpasswd.8.xml:161(term) chgpasswd.8.xml:123(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
 # type: Plain text
-#: chpasswd.8.xml:160(para) chgpasswd.8.xml:122(para)
+#: chpasswd.8.xml:163(para) chgpasswd.8.xml:125(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -8951,7 +9171,7 @@
 "Usa la cifratura MD5 anziché DES quando le password fornite non sono cifrate."
 
 # type: IP
-#: chpasswd.8.xml:167(term)
+#: chpasswd.8.xml:183(term)
 #, fuzzy
 msgid ""
 "<option>-s</option>, <option>--sha-rounds</option><replaceable>ROUNDS</"
@@ -8960,34 +9180,34 @@
 "<option>-c</option>, <option>--command</option><replaceable>SHELL</"
 "replaceable>"
 
-#: chpasswd.8.xml:187(para)
+#: chpasswd.8.xml:203(para)
 msgid ""
 "By default, the number of rounds is defined by the "
 "<option>SHA_CRYPT_MIN_ROUNDS</option> and <option>SHA_CRYPT_MAX_ROUNDS</"
 "option> variables in <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: chpasswd.8.xml:200(para) chgpasswd.8.xml:158(para)
+#: chpasswd.8.xml:216(para) chgpasswd.8.xml:174(para)
 msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
 msgstr ""
 
-#: chpasswd.8.xml:244(filename)
+#: chpasswd.8.xml:260(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/chpasswd"
 msgstr "/etc/passwd"
 
 # type: Plain text
-#: chpasswd.8.xml:246(para)
+#: chpasswd.8.xml:262(para)
 #, fuzzy
 #| msgid "<command>chpasswd</command> [B<options>]"
 msgid "PAM configuration for <command>chpasswd</command>."
 msgstr "<command>chpasswd</command> [B<opzioni>]"
 
 # type: Plain text
-#: chpasswd.8.xml:254(para)
+#: chpasswd.8.xml:270(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
@@ -9005,12 +9225,12 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Plain text
-#: chgpasswd.8.xml:48(refpurpose)
+#: chgpasswd.8.xml:51(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr ""
 
 # type: Plain text
-#: chgpasswd.8.xml:62(para)
+#: chgpasswd.8.xml:65(para)
 #, fuzzy
 msgid ""
 "The <command>chgpasswd</command> command reads a list of group name and "
@@ -9022,14 +9242,14 @@
 "utenti esistenti. Ciascuna riga usa il formato:"
 
 # type: Plain text
-#: chgpasswd.8.xml:67(para)
+#: chgpasswd.8.xml:70(para)
 msgid ""
 "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
 msgstr ""
 
 # type: Plain text
-#: chgpasswd.8.xml:71(para)
+#: chgpasswd.8.xml:74(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -9038,22 +9258,22 @@
 "Come impostazione predefinita, si devono fornire password in chiaro. "
 "L'algoritmo di cifratura predefinito è DES."
 
-#: chgpasswd.8.xml:75(para)
+#: chgpasswd.8.xml:78(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 "
-"overwiten with the <option>-e</option>, <option>-m</option>, or <option>-c</"
-"option> options."
+"<option>ENCRYPT_METHOD</option> variable of <filename>/etc/login.defs</"
+"filename>, and can be overwiten with the <option>-e</option>, <option>-m</"
+"option>, or <option>-c</option> options."
 msgstr ""
 
 # type: Plain text
-#: chgpasswd.8.xml:89(para)
+#: chgpasswd.8.xml:92(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:209(para)
+#: chgpasswd.8.xml:225(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
@@ -9069,7 +9289,7 @@
 "citerefentry>."
 
 # type: Plain text
-#: chfn.1.xml:47(refpurpose)
+#: chfn.1.xml:49(refpurpose)
 #, fuzzy
 msgid "change real user name and information"
 msgstr ""
@@ -9078,45 +9298,13 @@
 "#-#-#-#-#  chfn.1.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "chfn - cambia le informazioni personali dell'utente"
 
-#: chfn.1.xml:53(replaceable)
-msgid "full_name"
-msgstr ""
-
-#: 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:55(replaceable)
-msgid "work_ph"
-msgstr ""
-
-#: chfn.1.xml:55(arg)
-msgid "-w <placeholder-1/>"
-msgstr "-w <placeholder-1/>"
-
-#: chfn.1.xml:56(replaceable)
-msgid "home_ph"
-msgstr ""
-
-#: chfn.1.xml:57(replaceable)
-msgid "other"
-msgstr ""
-
-#: chfn.1.xml:57(arg)
-msgid "-o <placeholder-1/>"
-msgstr "-o <placeholder-1/>"
-
 # type: Plain text
-#: chfn.1.xml:64(para)
+#: chfn.1.xml:66(para)
 #, fuzzy
 msgid ""
-"The <command>chfn</command> command changes user fullname, office number, "
-"office extension, and home phone number information for a user's account. "
-"This information is typically printed by "
+"The <command>chfn</command> command changes user fullname, office room "
+"number, office phone number, and home phone number information for a user's "
+"account. This information is typically printed by "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and similar programs. A normal user may only change the fields "
 "for her own account, subject to the restrictions in <filename>/etc/login."
@@ -9137,7 +9325,7 @@
 "utente può usare l'opzione <option>-o</option> per la modifica del campo "
 "GECOS senza restrizioni."
 
-#: chfn.1.xml:78(para)
+#: chfn.1.xml:80(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. "
@@ -9147,8 +9335,106 @@
 msgstr ""
 
 # type: Plain text
-#: chfn.1.xml:87(para)
+#: chfn.1.xml:93(para)
+#, fuzzy
+#| msgid "The options which apply to the <command>chsh</command> command are:"
+msgid "The options which apply to the <command>chfn</command> command are:"
+msgstr "Il comando <command>chsh</command> accetta le seguenti opzioni:"
+
+# type: IP
+#: chfn.1.xml:98(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
 msgid ""
+"<option>-f</option>, <option>--full-name</option><replaceable>FULL_NAME</"
+"replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
+
+# type: SS
+#: chfn.1.xml:102(para)
+#, fuzzy
+#| msgid "Changing the default values"
+msgid "Change the user's full name."
+msgstr "Cambiare i valori predefiniti"
+
+# type: IP
+#: chfn.1.xml:106(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-h</option>, <option>--home-phone</option><replaceable>HOME_PHONE</"
+"replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
+
+#: chfn.1.xml:110(para)
+msgid "Change the user's home phone number."
+msgstr ""
+
+# type: IP
+#: chfn.1.xml:114(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-o</option>, <option>--other</option><replaceable>OTHER</replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
+
+#: chfn.1.xml:118(para)
+msgid ""
+"Change the user's other GECOS information. This field is used to store "
+"accounting information used by other applications, and can be changed only "
+"by a superuser."
+msgstr ""
+
+# type: IP
+#: chfn.1.xml:126(term)
+#, fuzzy
+msgid ""
+"<option>-r</option>, <option>--room</option><replaceable>ROOM_NUMBER</"
+"replaceable>"
+msgstr ""
+"<option>-c</option>, <option>--command</option><replaceable>SHELL</"
+"replaceable>"
+
+#: chfn.1.xml:130(para)
+msgid "Change the user's room number."
+msgstr ""
+
+# type: TP
+#: chfn.1.xml:147(term)
+#, fuzzy
+#| msgid "<option>-h</option>, <option>--help</option>"
+msgid "<option>-u</option>, <option>--help</option>"
+msgstr "<option>-h</option>, <option>--help</option>"
+
+# type: IP
+#: chfn.1.xml:155(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
+#| "replaceable>"
+msgid ""
+"<option>-w</option>, <option>--work-phone</option><replaceable>WORK_PHONE</"
+"replaceable>"
+msgstr ""
+"<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
+"replaceable>"
+
+#: chfn.1.xml:159(para)
+msgid "Change the user's office phone number."
+msgstr ""
+
+# type: Plain text
+#: chfn.1.xml:163(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 "
 "the fields. Enter the new value to change the field, or leave the line blank "
@@ -9164,7 +9450,7 @@
 "<command>chfn</command>, chiede l'account sul quale operare."
 
 # type: Plain text
-#: chfn.1.xml:132(para)
+#: chfn.1.xml:208(para)
 msgid ""
 "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -9179,12 +9465,12 @@
 "citerefentry>."
 
 # type: Plain text
-#: chage.1.xml:44(refpurpose)
+#: chage.1.xml:47(refpurpose)
 msgid "change user password expiry information"
 msgstr "cambia le informazioni sulla scadenza della password"
 
 # type: Plain text
-#: chage.1.xml:60(para)
+#: chage.1.xml:63(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 "
@@ -9195,19 +9481,19 @@
 "sistema per determinare quando un utente deve cambiare la propria password."
 
 # type: Plain text
-#: chage.1.xml:70(para)
+#: chage.1.xml:73(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:75(term)
+#: chage.1.xml:78(term)
 msgid ""
 "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: chage.1.xml:79(para)
+#: chage.1.xml:82(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 "
@@ -9218,14 +9504,14 @@
 "nel formato AAAA-MM-GG o nella notazione comunemente usata nel proprio paese."
 
 # type: TP
-#: chage.1.xml:87(term)
+#: chage.1.xml:90(term)
 msgid ""
 "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: chage.1.xml:91(para)
+#: chage.1.xml:94(para)
 #, fuzzy
 msgid ""
 "Set the date or number of days since January 1, 1970 on which the user's "
@@ -9241,7 +9527,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:99(para)
+#: chage.1.xml:102(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>EXPIRE_DATE</replaceable> will remove an account expiration "
@@ -9249,14 +9535,14 @@
 msgstr ""
 
 # type: TP
-#: chage.1.xml:113(term)
+#: chage.1.xml:116(term)
 msgid ""
 "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: chage.1.xml:117(para)
+#: chage.1.xml:120(para)
 #, fuzzy
 msgid ""
 "Set the number of days of inactivity after a password has expired before the "
@@ -9270,33 +9556,33 @@
 "disabilita questa funzione. Un utente con l'account bloccato deve contattare "
 "l'amministratore prima di poter usare ancora il sistema."
 
-#: chage.1.xml:124(para)
+#: chage.1.xml:127(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>INACTIVE</replaceable> will remove an account's inactivity."
 msgstr ""
 
 # type: Plain text
-#: chage.1.xml:136(para)
+#: chage.1.xml:139(para)
 msgid "Show account aging information."
 msgstr ""
 
 # type: IP
-#: chage.1.xml:142(term)
+#: chage.1.xml:145(term)
 msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 msgstr ""
 
 # type: IP
-#: chage.1.xml:154(term)
+#: chage.1.xml:157(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: chage.1.xml:158(para)
+#: chage.1.xml:161(para)
 #, fuzzy
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
@@ -9313,7 +9599,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:167(para)
+#: chage.1.xml:170(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as "
 "<replaceable>MAX_DAYS</replaceable> will remove checking a password's "
@@ -9321,14 +9607,14 @@
 msgstr ""
 
 # type: IP
-#: chage.1.xml:175(term)
+#: chage.1.xml:191(term)
 msgid ""
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: chage.1.xml:179(para)
+#: chage.1.xml:195(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 "
@@ -9341,7 +9627,7 @@
 "avvertito dell'imminente scadenza."
 
 # type: Plain text
-#: chage.1.xml:188(para)
+#: chage.1.xml:204(para)
 #, fuzzy
 msgid ""
 "If none of the options are selected, <command>chage</command> operates in an "
@@ -9357,7 +9643,7 @@
 "a usare il valore attuale."
 
 # type: Plain text
-#: chage.1.xml:198(para)
+#: chage.1.xml:214(para)
 msgid ""
 "The <command>chage</command> program requires a shadow password file to be "
 "available."
@@ -9366,7 +9652,7 @@
 "disponibile."
 
 # type: Plain text
-#: chage.1.xml:202(para)
+#: chage.1.xml:218(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 "
@@ -9378,17 +9664,17 @@
 "dell'account."
 
 # type: IP
-#: chage.1.xml:267(replaceable)
+#: chage.1.xml:283(replaceable)
 msgid "15"
 msgstr "15"
 
 # type: Plain text
-#: chage.1.xml:269(para)
+#: chage.1.xml:285(para)
 msgid "can't find the shadow password file"
 msgstr ""
 
 # type: TP
-#: chage.1.xml:245(para)
+#: chage.1.xml:261(para)
 msgid ""
 "The <command>chage</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -9403,9 +9689,49 @@
 "Giuseppe Sacco <eppesuig at debian.org>, 2005.\n"
 "Danilo Piazzalunga <danilopiazza at libero.it>, 2005."
 
+#~ msgid "-q"
+#~ msgstr "-q"
+
+#~ msgid "-s"
+#~ msgstr "-s"
+
 # type: Plain text
 #, 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>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+#~ "\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+#~ "phrase><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><refentrytitle>usermod</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid "-f <placeholder-1/>"
+#~ msgstr "-f <placeholder-1/>"
+
+#~ msgid "-w <placeholder-1/>"
+#~ msgstr "-w <placeholder-1/>"
+
+#~ msgid "-o <placeholder-1/>"
+#~ msgstr "-o <placeholder-1/>"
+
+# type: Plain text
+#, fuzzy
+#~| msgid ""
 #~| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
 #~| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
 #~| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "

Modified: upstream/trunk/man/po/pl.po
===================================================================
--- upstream/trunk/man/po/pl.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/man/po/pl.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: man pages for shadow 4.0.16\n"
-"POT-Creation-Date: 2010-08-29 17:54+0200\n"
+"POT-Creation-Date: 2011-11-13 18:43+0100\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"
@@ -12,75 +12,104 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: vipw.8.xml:39(refentrytitle) vipw.8.xml:44(refname) vipw.8.xml:53(command)
-#: login.defs.5.xml:477(term)
+#: vipw.8.xml:40(refentrytitle) vipw.8.xml:47(refname) vipw.8.xml:56(command)
+#: login.defs.5.xml:480(term)
 msgid "vipw"
 msgstr "vipw"
 
-#: vipw.8.xml:40(manvolnum) usermod.8.xml:42(manvolnum)
-#: userdel.8.xml:44(manvolnum) userdel.8.xml:203(replaceable)
-#: useradd.8.xml:53(manvolnum) pwconv.8.xml:44(manvolnum)
-#: pwck.8.xml:44(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:130(replaceable)
-#: groupadd.8.xml:42(manvolnum) faillog.8.xml:35(manvolnum)
-#: faillog.5.xml:86(manvolnum) chpasswd.8.xml:42(manvolnum)
-#: chgpasswd.8.xml:43(manvolnum)
+#: vipw.8.xml:41(manvolnum) usermod.8.xml:43(manvolnum)
+#: userdel.8.xml:45(manvolnum) userdel.8.xml:219(replaceable)
+#: useradd.8.xml:54(manvolnum) pwconv.8.xml:45(manvolnum)
+#: pwck.8.xml:45(manvolnum) nologin.8.xml:39(manvolnum)
+#: newusers.8.xml:52(manvolnum) logoutd.8.xml:39(manvolnum)
+#: lastlog.8.xml:40(manvolnum) grpck.8.xml:40(manvolnum)
+#: groupmod.8.xml:40(manvolnum) groupmems.8.xml:40(manvolnum)
+#: groupdel.8.xml:40(manvolnum) groupdel.8.xml:163(replaceable)
+#: groupadd.8.xml:42(manvolnum) faillog.8.xml:39(manvolnum)
+#: faillog.5.xml:92(manvolnum) chpasswd.8.xml:43(manvolnum)
+#: chgpasswd.8.xml:44(manvolnum)
 msgid "8"
 msgstr "8"
 
-#: vipw.8.xml:41(refmiscinfo) usermod.8.xml:43(refmiscinfo)
-#: userdel.8.xml:45(refmiscinfo) useradd.8.xml:54(refmiscinfo)
-#: pwconv.8.xml:45(refmiscinfo) pwck.8.xml:45(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:43(refmiscinfo) faillog.8.xml:36(refmiscinfo)
-#: chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
+#: vipw.8.xml:42(refmiscinfo) usermod.8.xml:44(refmiscinfo)
+#: userdel.8.xml:46(refmiscinfo) useradd.8.xml:55(refmiscinfo)
+#: pwconv.8.xml:46(refmiscinfo) pwck.8.xml:46(refmiscinfo)
+#: nologin.8.xml:40(refmiscinfo) newusers.8.xml:53(refmiscinfo)
+#: logoutd.8.xml:40(refmiscinfo) lastlog.8.xml:41(refmiscinfo)
+#: grpck.8.xml:41(refmiscinfo) groupmod.8.xml:41(refmiscinfo)
+#: groupmems.8.xml:41(refmiscinfo) groupdel.8.xml:41(refmiscinfo)
+#: groupadd.8.xml:43(refmiscinfo) faillog.8.xml:40(refmiscinfo)
+#: chpasswd.8.xml:44(refmiscinfo) chgpasswd.8.xml:45(refmiscinfo)
 msgid "System Management Commands"
 msgstr "Polecenia Zarządzania Systemem"
 
-#: vipw.8.xml:45(refname) vipw.8.xml:59(command)
+#: vipw.8.xml:43(refmiscinfo) usermod.8.xml:45(refmiscinfo)
+#: userdel.8.xml:47(refmiscinfo) useradd.8.xml:56(refmiscinfo)
+#: suauth.5.xml:41(refmiscinfo) su.1.xml:58(refmiscinfo)
+#: sg.1.xml:42(refmiscinfo) shadow.5.xml:41(refmiscinfo)
+#: shadow.3.xml:41(refmiscinfo) pwconv.8.xml:47(refmiscinfo)
+#: pwck.8.xml:47(refmiscinfo) porttime.5.xml:41(refmiscinfo)
+#: passwd.5.xml:41(refmiscinfo) passwd.1.xml:48(refmiscinfo)
+#: nologin.8.xml:41(refmiscinfo) newusers.8.xml:54(refmiscinfo)
+#: newgrp.1.xml:42(refmiscinfo) logoutd.8.xml:41(refmiscinfo)
+#: login.defs.5.xml:104(refmiscinfo) login.access.5.xml:42(refmiscinfo)
+#: login.1.xml:74(refmiscinfo) limits.5.xml:42(refmiscinfo)
+#: lastlog.8.xml:42(refmiscinfo) gshadow.5.xml:40(refmiscinfo)
+#: grpck.8.xml:42(refmiscinfo) groups.1.xml:41(refmiscinfo)
+#: groupmod.8.xml:42(refmiscinfo) groupmems.8.xml:42(refmiscinfo)
+#: groupdel.8.xml:42(refmiscinfo) groupadd.8.xml:44(refmiscinfo)
+#: gpasswd.1.xml:46(refmiscinfo) faillog.8.xml:41(refmiscinfo)
+#: faillog.5.xml:41(refmiscinfo) expiry.1.xml:45(refmiscinfo)
+#: chsh.1.xml:44(refmiscinfo) chpasswd.8.xml:45(refmiscinfo)
+#: chgpasswd.8.xml:46(refmiscinfo) chfn.1.xml:44(refmiscinfo)
+#: chage.1.xml:42(refmiscinfo)
+#, fuzzy
+#| msgid "gshadow"
+msgid "shadow-utils"
+msgstr "gshadow"
+
+#: vipw.8.xml:48(refname) vipw.8.xml:62(command)
 msgid "vigr"
 msgstr "vigr"
 
-#: vipw.8.xml:46(refpurpose)
+#: vipw.8.xml:49(refpurpose)
 msgid "edit the password, group, shadow-password or shadow-group file"
 msgstr "edytuj plik haseł, grup lub ich wersji chronionych"
 
-#: vipw.8.xml:55(replaceable) vipw.8.xml:61(replaceable)
-#: usermod.8.xml:54(replaceable) userdel.8.xml:54(arg)
-#: useradd.8.xml:64(replaceable) useradd.8.xml:76(replaceable)
-#: su.1.xml:66(replaceable) passwd.1.xml:57(replaceable)
-#: newusers.8.xml:63(replaceable) lastlog.8.xml:48(replaceable)
-#: groupmod.8.xml:51(replaceable) groupadd.8.xml:54(replaceable)
-#: faillog.8.xml:47(replaceable) chsh.1.xml:53(replaceable)
-#: chpasswd.8.xml:54(replaceable) chgpasswd.8.xml:55(replaceable)
-#: chage.1.xml:50(replaceable)
+#: vipw.8.xml:58(replaceable) vipw.8.xml:64(replaceable)
+#: usermod.8.xml:57(replaceable) userdel.8.xml:57(arg)
+#: useradd.8.xml:67(replaceable) useradd.8.xml:79(replaceable)
+#: su.1.xml:69(replaceable) pwconv.8.xml:62(replaceable)
+#: pwconv.8.xml:68(replaceable) pwconv.8.xml:74(replaceable)
+#: pwconv.8.xml:80(replaceable) pwck.8.xml:58(arg)
+#: passwd.1.xml:60(replaceable) newusers.8.xml:66(replaceable)
+#: lastlog.8.xml:54(replaceable) grpck.8.xml:53(arg)
+#: groupmod.8.xml:54(replaceable) groupdel.8.xml:54(replaceable)
+#: groupadd.8.xml:56(replaceable) faillog.8.xml:53(replaceable)
+#: chsh.1.xml:56(replaceable) chpasswd.8.xml:57(replaceable)
+#: chgpasswd.8.xml:58(replaceable) chfn.1.xml:56(replaceable)
+#: chage.1.xml:53(replaceable)
 msgid "options"
 msgstr "opcje"
 
-#: vipw.8.xml:67(title) usermod.8.xml:61(title) userdel.8.xml:62(title)
-#: useradd.8.xml:82(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:71(title) pwck.8.xml:86(title)
-#: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
-#: nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title)
-#: logoutd.8.xml:50(title) login.defs.5.xml:110(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:63(title) gpasswd.1.xml:72(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:59(title)
+#: vipw.8.xml:70(title) usermod.8.xml:64(title) userdel.8.xml:65(title)
+#: useradd.8.xml:85(title) suauth.5.xml:56(title) su.1.xml:80(title)
+#: sg.1.xml:62(title) shadow.5.xml:50(title) shadow.3.xml:99(title)
+#: shadow.3.xml:155(title) pwconv.8.xml:86(title) pwck.8.xml:73(title)
+#: porttime.5.xml:50(title) passwd.5.xml:50(title) passwd.1.xml:69(title)
+#: nologin.8.xml:56(title) newusers.8.xml:75(title) newgrp.1.xml:58(title)
+#: logoutd.8.xml:56(title) login.defs.5.xml:113(title)
+#: login.access.5.xml:51(title) login.1.xml:106(title) limits.5.xml:52(title)
+#: lastlog.8.xml:60(title) gshadow.5.xml:49(title) grpck.8.xml:64(title)
+#: groups.1.xml:59(title) groupmod.8.xml:61(title) groupmems.8.xml:63(title)
+#: groupdel.8.xml:61(title) groupadd.8.xml:65(title) gpasswd.1.xml:75(title)
+#: faillog.8.xml:59(title) faillog.5.xml:50(title) expiry.1.xml:63(title)
+#: chsh.1.xml:65(title) chpasswd.8.xml:63(title) chgpasswd.8.xml:64(title)
+#: chfn.1.xml:65(title) chage.1.xml:62(title)
 msgid "DESCRIPTION"
 msgstr "OPIS"
 
-#: vipw.8.xml:68(para)
+#: vipw.8.xml:71(para)
 msgid ""
 "The <command>vipw</command> and <command>vigr</command> commands edits the "
 "files <filename>/etc/passwd</filename> and <filename>/etc/group</filename>, "
@@ -105,17 +134,18 @@
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: vipw.8.xml:85(title) usermod.8.xml:69(title) userdel.8.xml:71(title)
-#: useradd.8.xml:100(title) su.1.xml:123(title) pwck.8.xml:170(title)
-#: passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title)
-#: lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title)
-#: groupmems.8.xml:75(title) groupadd.8.xml:72(title) gpasswd.1.xml:112(title)
-#: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:108(title)
-#: chgpasswd.8.xml:88(title) chage.1.xml:69(title)
+#: vipw.8.xml:88(title) usermod.8.xml:72(title) userdel.8.xml:74(title)
+#: useradd.8.xml:103(title) su.1.xml:126(title) pwconv.8.xml:168(title)
+#: pwck.8.xml:157(title) passwd.1.xml:155(title) newusers.8.xml:244(title)
+#: login.1.xml:191(title) lastlog.8.xml:72(title) grpck.8.xml:128(title)
+#: groupmod.8.xml:70(title) groupmems.8.xml:78(title) groupdel.8.xml:69(title)
+#: groupadd.8.xml:74(title) gpasswd.1.xml:115(title) faillog.8.xml:70(title)
+#: expiry.1.xml:72(title) chsh.1.xml:76(title) chpasswd.8.xml:111(title)
+#: chgpasswd.8.xml:91(title) chfn.1.xml:92(title) chage.1.xml:72(title)
 msgid "OPTIONS"
 msgstr "OPCJE"
 
-#: vipw.8.xml:86(para)
+#: vipw.8.xml:89(para)
 msgid ""
 "The options which apply to the <command>vipw</command> and <command>vigr</"
 "command> commands are:"
@@ -124,83 +154,121 @@
 "następujące opcje:Polecenia <command>vipw</command> i <command>vigr</"
 "command> posiadają następujące opcje:"
 
-#: vipw.8.xml:92(term)
+#: vipw.8.xml:95(term)
 msgid "<option>-g</option>, <option>--group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: vipw.8.xml:94(para)
+#: vipw.8.xml:97(para)
 msgid "Edit group database."
 msgstr "Edycja bazy grup."
 
-#: vipw.8.xml:98(term) userdel.8.xml:101(term) useradd.8.xml:250(term)
-#: passwd.1.xml:192(term) newusers.8.xml:257(term) lastlog.8.xml:82(term)
-#: groupmod.8.xml:98(term) groupmems.8.xml:117(term) groupadd.8.xml:107(term)
-#: gpasswd.1.xml:151(term) faillog.8.xml:97(term) chsh.1.xml:79(term)
-#: chpasswd.8.xml:150(term) chgpasswd.8.xml:114(term) chage.1.xml:107(term)
+#: vipw.8.xml:101(term) userdel.8.xml:104(term) useradd.8.xml:253(term)
+#: pwconv.8.xml:176(term) pwck.8.xml:167(term) passwd.1.xml:195(term)
+#: newusers.8.xml:262(term) lastlog.8.xml:88(term) grpck.8.xml:138(term)
+#: groupmod.8.xml:105(term) groupmems.8.xml:120(term) groupdel.8.xml:76(term)
+#: groupadd.8.xml:109(term) gpasswd.1.xml:154(term) faillog.8.xml:103(term)
+#: expiry.1.xml:93(term) chsh.1.xml:82(term) chpasswd.8.xml:153(term)
+#: chgpasswd.8.xml:117(term) chage.1.xml:110(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
-#: vipw.8.xml:100(para) userdel.8.xml:103(para) useradd.8.xml:252(para)
-#: passwd.1.xml:194(para) newusers.8.xml:259(para) lastlog.8.xml:86(para)
-#: groupmod.8.xml:100(para) groupmems.8.xml:119(para) groupadd.8.xml:109(para)
-#: gpasswd.1.xml:153(para) faillog.8.xml:99(para) chsh.1.xml:81(para)
-#: chpasswd.8.xml:152(para) chgpasswd.8.xml:116(para) chage.1.xml:109(para)
+#: vipw.8.xml:103(para) userdel.8.xml:106(para) useradd.8.xml:255(para)
+#: pwconv.8.xml:178(para) pwck.8.xml:169(para) passwd.1.xml:197(para)
+#: newusers.8.xml:264(para) lastlog.8.xml:92(para) grpck.8.xml:140(para)
+#: groupmod.8.xml:107(para) groupmems.8.xml:122(para) groupdel.8.xml:78(para)
+#: groupadd.8.xml:111(para) gpasswd.1.xml:156(para) faillog.8.xml:105(para)
+#: expiry.1.xml:95(para) chsh.1.xml:84(para) chpasswd.8.xml:155(para)
+#: chgpasswd.8.xml:119(para) chfn.1.xml:151(para) chage.1.xml:112(para)
 msgid "Display help message and exit."
 msgstr "Wyświetlenie komunikatu pomocy i zakończenie działania."
 
-#: vipw.8.xml:104(term)
+#: vipw.8.xml:107(term)
 msgid "<option>-p</option>, <option>--passwd</option>"
 msgstr "<option>-p</option>, <option>--passwd</option>"
 
-#: vipw.8.xml:106(para)
+#: vipw.8.xml:109(para)
 msgid "Edit passwd database."
 msgstr "Edycja bazy passwd."
 
-#: vipw.8.xml:110(term) passwd.1.xml:259(term)
+#: vipw.8.xml:113(term) pwck.8.xml:173(term) passwd.1.xml:262(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:112(para) passwd.1.xml:263(para)
+#: vipw.8.xml:115(para) passwd.1.xml:266(para)
 msgid "Quiet mode."
 msgstr "Cichy tryb pracy."
 
-#: vipw.8.xml:116(term)
+#: vipw.8.xml:119(term) usermod.8.xml:298(term) userdel.8.xml:127(term)
+#: useradd.8.xml:438(term) pwconv.8.xml:182(term) pwck.8.xml:190(term)
+#: passwd.1.xml:282(term) newusers.8.xml:287(term) lastlog.8.xml:96(term)
+#: grpck.8.xml:154(term) groupmod.8.xml:156(term) groupmems.8.xml:143(term)
+#: groupdel.8.xml:82(term) groupadd.8.xml:184(term) faillog.8.xml:163(term)
+#: chsh.1.xml:88(term) chpasswd.8.xml:170(term) chgpasswd.8.xml:132(term)
+#: chfn.1.xml:134(term) chage.1.xml:178(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-R</option>, <option>--root</option><replaceable>CHROOT_DIR</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>KAT_DOMOWY</"
+"replaceable>"
+
+#: vipw.8.xml:124(para) usermod.8.xml:303(para) userdel.8.xml:132(para)
+#: useradd.8.xml:443(para) pwconv.8.xml:187(para) pwck.8.xml:195(para)
+#: passwd.1.xml:287(para) newusers.8.xml:292(para) lastlog.8.xml:101(para)
+#: grpck.8.xml:159(para) groupmod.8.xml:161(para) groupmems.8.xml:148(para)
+#: groupdel.8.xml:87(para) groupadd.8.xml:189(para) gpasswd.1.xml:167(para)
+#: faillog.8.xml:168(para) chsh.1.xml:93(para) chpasswd.8.xml:175(para)
+#: chgpasswd.8.xml:137(para) chfn.1.xml:139(para) chage.1.xml:183(para)
+#, fuzzy
+msgid ""
+"Apply changes in the <replaceable>CHROOT_DIR</replaceable> directory and use "
+"the configuration files from the <replaceable>CHROOT_DIR</replaceable> "
+"directory."
+msgstr ""
+"Nazwa grupy zostanie zmieniona z <replaceable>GRUPA</replaceable> na nazwę "
+"<replaceable>NOWA_GRUPA</replaceable>."
+
+#: vipw.8.xml:132(term)
 msgid "<option>-s</option>, <option>--shadow</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: vipw.8.xml:118(para)
+#: vipw.8.xml:134(para)
 msgid "Edit shadow or gshadow database."
 msgstr "Edycja bazy shadow lub gshadow."
 
-#: vipw.8.xml:122(term)
+#: vipw.8.xml:138(term)
 #, fuzzy
 #| msgid "<option>-q</option>, <option>--quiet</option>"
 msgid "<option>-u</option>, <option>--user</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:124(para)
+#: vipw.8.xml:140(para)
 msgid "Indicates which user's tcb shadow file to edit."
 msgstr ""
 
-#: vipw.8.xml:131(title) usermod.8.xml:374(title) userdel.8.xml:127(title)
-#: useradd.8.xml:629(title) su.1.xml:310(title) sg.1.xml:76(title)
-#: pwconv.8.xml:164(title) pwck.8.xml:230(title) passwd.1.xml:356(title)
-#: newusers.8.xml:324(title) newgrp.1.xml:87(title) login.1.xml:272(title)
-#: grpck.8.xml:173(title) groupmod.8.xml:152(title) groupmems.8.xml:162(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:185(title) gpasswd.1.xml:226(title)
-#: chsh.1.xml:120(title) chpasswd.8.xml:207(title) chgpasswd.8.xml:169(title)
-#: chfn.1.xml:99(title) chage.1.xml:210(title)
+#: vipw.8.xml:147(title) usermod.8.xml:404(title) userdel.8.xml:143(title)
+#: useradd.8.xml:645(title) su.1.xml:320(title) sg.1.xml:79(title)
+#: pwconv.8.xml:209(title) pwck.8.xml:234(title) passwd.1.xml:372(title)
+#: newusers.8.xml:342(title) newgrp.1.xml:90(title) login.1.xml:275(title)
+#: grpck.8.xml:191(title) groupmod.8.xml:172(title) groupmems.8.xml:178(title)
+#: groupdel.8.xml:110(title) groupadd.8.xml:200(title)
+#: gpasswd.1.xml:244(title) chsh.1.xml:136(title) chpasswd.8.xml:223(title)
+#: chgpasswd.8.xml:185(title) chfn.1.xml:175(title) chage.1.xml:226(title)
 msgid "CONFIGURATION"
 msgstr ""
 
-#: vipw.8.xml:132(para) usermod.8.xml:375(para) userdel.8.xml:128(para)
-#: useradd.8.xml:630(para) su.1.xml:311(para) sg.1.xml:77(para)
-#: pwck.8.xml:231(para) passwd.1.xml:357(para) newusers.8.xml:325(para)
-#: newgrp.1.xml:88(para) login.1.xml:273(para) grpck.8.xml:174(para)
-#: groupmod.8.xml:153(para) groupmems.8.xml:163(para) groupdel.8.xml:78(para)
-#: groupadd.8.xml:186(para) gpasswd.1.xml:227(para) chsh.1.xml:121(para)
-#: chpasswd.8.xml:208(para) chgpasswd.8.xml:170(para) chfn.1.xml:100(para)
-#: chage.1.xml:211(para)
+#: vipw.8.xml:148(para) usermod.8.xml:405(para) userdel.8.xml:144(para)
+#: useradd.8.xml:646(para) su.1.xml:321(para) sg.1.xml:80(para)
+#: pwck.8.xml:235(para) passwd.1.xml:373(para) newusers.8.xml:343(para)
+#: newgrp.1.xml:91(para) login.1.xml:276(para) grpck.8.xml:192(para)
+#: groupmod.8.xml:173(para) groupmems.8.xml:179(para) groupdel.8.xml:111(para)
+#: groupadd.8.xml:201(para) gpasswd.1.xml:245(para) chsh.1.xml:137(para)
+#: chpasswd.8.xml:224(para) chgpasswd.8.xml:186(para) chfn.1.xml:176(para)
+#: chage.1.xml:227(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of this tool:"
@@ -226,143 +294,145 @@
 "jest zmieniana przy pomocy polecenia <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: vipw.8.xml:143(title)
+#: vipw.8.xml:159(title)
 msgid "ENVIRONMENT"
 msgstr ""
 
-#: vipw.8.xml:146(option)
+#: vipw.8.xml:162(option)
 msgid "VISUAL"
 msgstr ""
 
-#: vipw.8.xml:148(para)
+#: vipw.8.xml:164(para)
 msgid "Editor to be used."
 msgstr ""
 
-#: vipw.8.xml:152(option)
+#: vipw.8.xml:168(option)
 msgid "EDITOR"
 msgstr ""
 
-#: vipw.8.xml:154(para)
+#: vipw.8.xml:170(para)
 msgid "Editor to be used if <option>VISUAL</option> is not set."
 msgstr ""
 
-#: vipw.8.xml:161(title) usermod.8.xml:389(title) userdel.8.xml:144(title)
-#: useradd.8.xml:655(title) suauth.5.xml:168(title) su.1.xml:338(title)
-#: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
-#: pwconv.8.xml:187(title) pwck.8.xml:247(title) porttime.5.xml:105(title)
-#: passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(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:170(title) lastlog.8.xml:147(title)
-#: gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title)
-#: groupmod.8.xml:164(title) groupmems.8.xml:174(title)
-#: groupdel.8.xml:89(title) groupadd.8.xml:199(title) gpasswd.1.xml:241(title)
-#: faillog.8.xml:210(title) faillog.5.xml:71(title) expiry.1.xml:68(title)
-#: chsh.1.xml:133(title) chpasswd.8.xml:223(title) chgpasswd.8.xml:184(title)
-#: chfn.1.xml:113(title) chage.1.xml:222(title)
+#: vipw.8.xml:177(title) usermod.8.xml:419(title) userdel.8.xml:160(title)
+#: useradd.8.xml:671(title) suauth.5.xml:174(title) su.1.xml:348(title)
+#: sg.1.xml:91(title) shadow.5.xml:236(title) shadow.3.xml:207(title)
+#: pwconv.8.xml:232(title) pwck.8.xml:251(title) porttime.5.xml:111(title)
+#: passwd.5.xml:122(title) passwd.1.xml:390(title) newusers.8.xml:375(title)
+#: newgrp.1.xml:102(title) logoutd.8.xml:70(title)
+#: login.access.5.xml:102(title) login.1.xml:319(title)
+#: limits.5.xml:176(title) lastlog.8.xml:166(title) gshadow.5.xml:147(title)
+#: grpck.8.xml:203(title) groups.1.xml:81(title) groupmod.8.xml:184(title)
+#: groupmems.8.xml:190(title) groupdel.8.xml:122(title)
+#: groupadd.8.xml:214(title) gpasswd.1.xml:259(title) faillog.8.xml:229(title)
+#: faillog.5.xml:77(title) expiry.1.xml:102(title) chsh.1.xml:149(title)
+#: chpasswd.8.xml:239(title) chgpasswd.8.xml:200(title) chfn.1.xml:189(title)
+#: chage.1.xml:238(title)
 msgid "FILES"
 msgstr "PLIKI"
 
-#: vipw.8.xml:164(filename) usermod.8.xml:392(filename)
-#: userdel.8.xml:147(filename) useradd.8.xml:670(filename)
-#: sg.1.xml:103(filename) pwck.8.xml:250(filename)
-#: newusers.8.xml:372(filename) newgrp.1.xml:114(filename)
-#: gshadow.5.xml:144(filename) grpck.8.xml:188(filename)
-#: groups.1.xml:78(filename) groupmod.8.xml:167(filename)
-#: groupmems.8.xml:177(filename) groupdel.8.xml:92(filename)
-#: groupadd.8.xml:202(filename) gpasswd.1.xml:50(filename)
-#: gpasswd.1.xml:53(filename) gpasswd.1.xml:244(filename)
-#: chgpasswd.8.xml:187(filename)
+#: vipw.8.xml:180(filename) usermod.8.xml:422(filename)
+#: userdel.8.xml:163(filename) useradd.8.xml:686(filename)
+#: sg.1.xml:106(filename) pwck.8.xml:254(filename)
+#: newusers.8.xml:390(filename) newgrp.1.xml:117(filename)
+#: gshadow.5.xml:150(filename) grpck.8.xml:206(filename)
+#: groups.1.xml:84(filename) groupmod.8.xml:187(filename)
+#: groupmems.8.xml:193(filename) groupdel.8.xml:125(filename)
+#: groupadd.8.xml:217(filename) gpasswd.1.xml:53(filename)
+#: gpasswd.1.xml:56(filename) gpasswd.1.xml:262(filename)
+#: chgpasswd.8.xml:203(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
-#: vipw.8.xml:166(para) usermod.8.xml:394(para) userdel.8.xml:149(para)
-#: useradd.8.xml:672(para) sg.1.xml:105(para) pwck.8.xml:252(para)
-#: newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para)
-#: grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
-#: groupmems.8.xml:179(para) groupdel.8.xml:94(para) groupadd.8.xml:204(para)
-#: gpasswd.1.xml:246(para) chgpasswd.8.xml:189(para)
+#: vipw.8.xml:182(para) usermod.8.xml:424(para) userdel.8.xml:165(para)
+#: useradd.8.xml:688(para) sg.1.xml:108(para) pwck.8.xml:256(para)
+#: newusers.8.xml:392(para) newgrp.1.xml:119(para) gshadow.5.xml:152(para)
+#: grpck.8.xml:208(para) groups.1.xml:86(para) groupmod.8.xml:189(para)
+#: groupmems.8.xml:195(para) groupdel.8.xml:127(para) groupadd.8.xml:219(para)
+#: gpasswd.1.xml:264(para) chgpasswd.8.xml:205(para)
 msgid "Group account information."
 msgstr "Informacje o grupach użytkowników."
 
-#: vipw.8.xml:170(filename) usermod.8.xml:398(filename)
-#: useradd.8.xml:676(filename) sg.1.xml:109(filename)
-#: newusers.8.xml:378(filename) newgrp.1.xml:120(filename)
-#: gshadow.5.xml:150(filename) grpck.8.xml:194(filename)
-#: groupmod.8.xml:173(filename) groupmems.8.xml:183(filename)
-#: groupdel.8.xml:98(filename) groupadd.8.xml:208(filename)
-#: gpasswd.1.xml:54(filename) gpasswd.1.xml:250(filename)
-#: chgpasswd.8.xml:193(filename)
+#: vipw.8.xml:186(filename) usermod.8.xml:428(filename)
+#: useradd.8.xml:692(filename) sg.1.xml:112(filename)
+#: newusers.8.xml:396(filename) newgrp.1.xml:123(filename)
+#: gshadow.5.xml:156(filename) grpck.8.xml:212(filename)
+#: groupmod.8.xml:193(filename) groupmems.8.xml:199(filename)
+#: groupdel.8.xml:131(filename) groupadd.8.xml:223(filename)
+#: gpasswd.1.xml:57(filename) gpasswd.1.xml:268(filename)
+#: chgpasswd.8.xml:209(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
-#: vipw.8.xml:172(para) usermod.8.xml:400(para) useradd.8.xml:678(para)
-#: sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para)
-#: gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para)
-#: groupdel.8.xml:100(para) groupadd.8.xml:210(para) gpasswd.1.xml:252(para)
-#: chgpasswd.8.xml:195(para)
+#: vipw.8.xml:188(para) usermod.8.xml:430(para) useradd.8.xml:694(para)
+#: sg.1.xml:114(para) newusers.8.xml:398(para) newgrp.1.xml:125(para)
+#: gshadow.5.xml:158(para) grpck.8.xml:214(para) groupmod.8.xml:195(para)
+#: groupdel.8.xml:133(para) groupadd.8.xml:225(para) gpasswd.1.xml:270(para)
+#: chgpasswd.8.xml:211(para)
 msgid "Secure group account information."
 msgstr "Informacje chronione o grupach użytkowników."
 
-#: vipw.8.xml:176(filename) usermod.8.xml:404(filename)
-#: userdel.8.xml:159(filename) useradd.8.xml:658(filename)
-#: su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
-#: pwck.8.xml:256(filename) passwd.5.xml:119(filename)
-#: passwd.1.xml:377(filename) newusers.8.xml:360(filename)
-#: newgrp.1.xml:102(filename) login.1.xml:331(filename)
-#: grpck.8.xml:200(filename) expiry.1.xml:71(filename)
-#: chsh.1.xml:136(filename) chpasswd.8.xml:226(filename)
-#: chfn.1.xml:122(filename) chage.1.xml:226(filename)
+#: vipw.8.xml:192(filename) usermod.8.xml:434(filename)
+#: userdel.8.xml:175(filename) useradd.8.xml:674(filename)
+#: su.1.xml:351(filename) sg.1.xml:94(filename) shadow.5.xml:239(filename)
+#: pwck.8.xml:260(filename) passwd.5.xml:125(filename)
+#: passwd.1.xml:393(filename) newusers.8.xml:378(filename)
+#: newgrp.1.xml:105(filename) login.1.xml:334(filename)
+#: grpck.8.xml:218(filename) groupmod.8.xml:199(filename)
+#: expiry.1.xml:105(filename) chsh.1.xml:152(filename)
+#: chpasswd.8.xml:242(filename) chfn.1.xml:198(filename)
+#: chage.1.xml:242(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
-#: vipw.8.xml:178(para) usermod.8.xml:406(para) userdel.8.xml:161(para)
-#: useradd.8.xml:660(para) su.1.xml:343(para) sg.1.xml:93(para)
-#: shadow.5.xml:235(para) pwck.8.xml:258(para) passwd.5.xml:121(para)
-#: passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
-#: login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para)
-#: chsh.1.xml:138(para) chpasswd.8.xml:228(para) chfn.1.xml:124(para)
-#: chage.1.xml:229(para)
+#: vipw.8.xml:194(para) usermod.8.xml:436(para) userdel.8.xml:177(para)
+#: useradd.8.xml:676(para) su.1.xml:353(para) sg.1.xml:96(para)
+#: shadow.5.xml:241(para) pwck.8.xml:262(para) passwd.5.xml:127(para)
+#: passwd.1.xml:395(para) newusers.8.xml:380(para) newgrp.1.xml:107(para)
+#: login.1.xml:336(para) grpck.8.xml:220(para) groupmod.8.xml:201(para)
+#: expiry.1.xml:107(para) chsh.1.xml:154(para) chpasswd.8.xml:244(para)
+#: chfn.1.xml:200(para) chage.1.xml:245(para)
 msgid "User account information."
 msgstr "Informacja o kontach użytkowników."
 
-#: vipw.8.xml:182(filename) usermod.8.xml:410(filename)
-#: userdel.8.xml:165(filename) useradd.8.xml:664(filename)
-#: su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
-#: shadow.3.xml:204(filename) pwck.8.xml:262(filename)
-#: passwd.5.xml:125(filename) passwd.1.xml:383(filename)
-#: newusers.8.xml:366(filename) newgrp.1.xml:108(filename)
-#: login.1.xml:337(filename) expiry.1.xml:77(filename)
-#: chpasswd.8.xml:232(filename) chage.1.xml:234(filename)
+#: vipw.8.xml:198(filename) usermod.8.xml:440(filename)
+#: userdel.8.xml:181(filename) useradd.8.xml:680(filename)
+#: su.1.xml:357(filename) sg.1.xml:100(filename) shadow.5.xml:245(filename)
+#: shadow.3.xml:210(filename) pwck.8.xml:266(filename)
+#: passwd.5.xml:131(filename) passwd.1.xml:399(filename)
+#: newusers.8.xml:384(filename) newgrp.1.xml:111(filename)
+#: login.1.xml:340(filename) expiry.1.xml:111(filename)
+#: chpasswd.8.xml:248(filename) chage.1.xml:250(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
-#: vipw.8.xml:184(para) usermod.8.xml:412(para) userdel.8.xml:167(para)
-#: useradd.8.xml:666(para) su.1.xml:349(para) sg.1.xml:99(para)
-#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:264(para)
-#: passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
-#: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:234(para)
-#: chage.1.xml:237(para)
+#: vipw.8.xml:200(para) usermod.8.xml:442(para) userdel.8.xml:183(para)
+#: useradd.8.xml:682(para) su.1.xml:359(para) sg.1.xml:102(para)
+#: shadow.5.xml:247(para) shadow.3.xml:212(para) pwck.8.xml:268(para)
+#: passwd.1.xml:401(para) newusers.8.xml:386(para) newgrp.1.xml:113(para)
+#: login.1.xml:342(para) expiry.1.xml:113(para) chpasswd.8.xml:250(para)
+#: chage.1.xml:253(para)
 msgid "Secure user account information."
 msgstr "Informacje chronione o użytkownikach."
 
-#: vipw.8.xml:191(title) usermod.8.xml:419(title) userdel.8.xml:252(title)
-#: useradd.8.xml:772(title) suauth.5.xml:197(title) su.1.xml:409(title)
-#: sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title)
-#: pwconv.8.xml:199(title) pwck.8.xml:322(title) porttime.5.xml:117(title)
-#: passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title)
-#: newusers.8.xml:399(title) newgrp.1.xml:129(title)
-#: login.defs.5.xml:504(title) login.access.5.xml:108(title)
-#: login.1.xml:376(title) limits.5.xml:180(title) gshadow.5.xml:159(title)
-#: grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
-#: groupmems.8.xml:192(title) groupdel.8.xml:146(title)
-#: groupadd.8.xml:290(title) gpasswd.1.xml:259(title) faillog.8.xml:222(title)
-#: faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
-#: chpasswd.8.xml:253(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title)
-#: chage.1.xml:277(title)
+#: vipw.8.xml:207(title) usermod.8.xml:449(title) userdel.8.xml:268(title)
+#: useradd.8.xml:788(title) suauth.5.xml:203(title) su.1.xml:419(title)
+#: sg.1.xml:121(title) shadow.5.xml:264(title) shadow.3.xml:219(title)
+#: pwconv.8.xml:244(title) pwck.8.xml:326(title) porttime.5.xml:123(title)
+#: passwd.5.xml:150(title) passwd.1.xml:471(title) nologin.8.xml:70(title)
+#: newusers.8.xml:417(title) newgrp.1.xml:132(title)
+#: login.defs.5.xml:507(title) login.access.5.xml:114(title)
+#: login.1.xml:379(title) limits.5.xml:186(title) gshadow.5.xml:165(title)
+#: grpck.8.xml:272(title) groups.1.xml:93(title) groupmod.8.xml:259(title)
+#: groupmems.8.xml:208(title) groupdel.8.xml:179(title)
+#: groupadd.8.xml:305(title) gpasswd.1.xml:277(title) faillog.8.xml:241(title)
+#: faillog.5.xml:89(title) expiry.1.xml:120(title) chsh.1.xml:173(title)
+#: chpasswd.8.xml:269(title) chgpasswd.8.xml:224(title) chfn.1.xml:207(title)
+#: chage.1.xml:293(title)
 msgid "SEE ALSO"
 msgstr "ZOBACZ TAKŻE"
 
-#: vipw.8.xml:192(para)
+#: vipw.8.xml:208(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -400,22 +470,23 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: usermod.8.xml:41(refentrytitle) usermod.8.xml:46(refname)
-#: usermod.8.xml:52(command) login.defs.5.xml:468(term)
+#: usermod.8.xml:42(refentrytitle) usermod.8.xml:49(refname)
+#: usermod.8.xml:55(command) login.defs.5.xml:471(term)
 msgid "usermod"
 msgstr "usermod"
 
-#: usermod.8.xml:47(refpurpose)
+#: usermod.8.xml:50(refpurpose)
 msgid "modify a user account"
 msgstr "zmiana danych konta użytkownika"
 
-#: usermod.8.xml:56(replaceable) userdel.8.xml:56(replaceable)
-#: useradd.8.xml:66(replaceable) passwd.1.xml:60(replaceable)
-#: chsh.1.xml:56(replaceable) chage.1.xml:53(replaceable)
+#: usermod.8.xml:59(replaceable) userdel.8.xml:59(replaceable)
+#: useradd.8.xml:69(replaceable) passwd.1.xml:63(replaceable)
+#: chsh.1.xml:59(replaceable) chfn.1.xml:59(replaceable)
+#: chage.1.xml:56(replaceable)
 msgid "LOGIN"
 msgstr "LOGIN"
 
-#: usermod.8.xml:62(para)
+#: usermod.8.xml:65(para)
 msgid ""
 "The <command>usermod</command> command modifies the system account files to "
 "reflect the changes that are specified on the command line."
@@ -423,15 +494,15 @@
 "Polecenie <command>usermod</command> zmienia systemowe pliki kont, "
 "odzwierciedlając zmiany podane w wierszu poleceń."
 
-#: usermod.8.xml:70(para)
+#: usermod.8.xml:73(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:76(term)
+#: usermod.8.xml:79(term)
 msgid "<option>-a</option>, <option>--append</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
-#: usermod.8.xml:80(para)
+#: usermod.8.xml:83(para)
 #, fuzzy
 #| msgid ""
 #| "Add the user to the supplemental group(s). Use only with <option>-G</"
@@ -443,7 +514,7 @@
 "Dodaj użytkownika do dodatkowej grupy lub grup. Może być użyte tylko z opcją "
 "<option>-G</option>."
 
-#: usermod.8.xml:87(term) useradd.8.xml:128(term)
+#: usermod.8.xml:90(term) useradd.8.xml:131(term)
 msgid ""
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
@@ -451,7 +522,7 @@
 "<option>-c</option>, <option>--comment</option><replaceable>KOMENTARZ</"
 "replaceable>"
 
-#: usermod.8.xml:92(para)
+#: usermod.8.xml:95(para)
 msgid ""
 "The new value of the user's password file comment field. It is normally "
 "modified using the <citerefentry><refentrytitle>chfn</"
@@ -461,7 +532,7 @@
 "jest zmieniana przy pomocy polecenia <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: usermod.8.xml:101(term) useradd.8.xml:141(term)
+#: usermod.8.xml:104(term) useradd.8.xml:144(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -469,11 +540,11 @@
 "<option>-d</option>, <option>--home</option><replaceable>KAT_DOMOWY</"
 "replaceable>"
 
-#: usermod.8.xml:106(para)
+#: usermod.8.xml:109(para)
 msgid "The user's new login directory."
 msgstr ""
 
-#: usermod.8.xml:109(para)
+#: usermod.8.xml:112(para)
 #, fuzzy
 #| msgid ""
 #| "The user's new login directory. If the <option>-m</option> option is "
@@ -488,7 +559,7 @@
 "zawartość aktualnego katalogu domowego zostanie przesunięta do nowego "
 "katalogu. Nowy katalog domowy jest tworzony jeśli nie istnieje."
 
-#: usermod.8.xml:118(term) useradd.8.xml:168(term) useradd.8.xml:526(term)
+#: usermod.8.xml:121(term) useradd.8.xml:171(term) useradd.8.xml:542(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -496,7 +567,7 @@
 "<option>-e</option>, <option>--expiredate</option><replaceable>DATA_WAŻN</"
 "replaceable>"
 
-#: usermod.8.xml:123(para) useradd.8.xml:173(para)
+#: usermod.8.xml:126(para) useradd.8.xml:176(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>."
@@ -504,21 +575,33 @@
 "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:130(term) useradd.8.xml:186(term) useradd.8.xml:539(term)
+#: usermod.8.xml:130(para)
 msgid ""
+"An empty <replaceable>EXPIRE_DATE</replaceable> argument will disable the "
+"expiration of the account."
+msgstr ""
+
+#: usermod.8.xml:134(para) usermod.8.xml:156(para)
+msgid ""
+"This option requires a <filename>/etc/shadow</filename> file. A <filename>/"
+"etc/shadow</filename> entry will be created if there were none."
+msgstr ""
+
+#: usermod.8.xml:142(term) useradd.8.xml:189(term) useradd.8.xml:555(term)
+msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 msgstr ""
 "<option>-f</option>, <option>--inactive</option><replaceable>NIEAKTYWNE</"
 "replaceable>"
 
-#: usermod.8.xml:135(para)
+#: usermod.8.xml:147(para)
 msgid ""
 "The number of days after a password expires until the account is permanently "
 "disabled."
 msgstr ""
 
-#: usermod.8.xml:139(para)
+#: usermod.8.xml:151(para)
 #, fuzzy
 #| msgid ""
 #| "The number of days after a password expires until the account is "
@@ -533,13 +616,13 @@
 "wyłącza konto natychmiast po przeterminowaniu hasła, zaś wartość -1 wyłącza "
 "tę cechę. Domyślną wartością jest -1."
 
-#: usermod.8.xml:147(term) useradd.8.xml:206(term) useradd.8.xml:555(term)
+#: usermod.8.xml:164(term) useradd.8.xml:209(term) useradd.8.xml:571(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GRUPA</replaceable>"
 
-#: usermod.8.xml:152(para)
+#: usermod.8.xml:169(para)
 #, fuzzy
 #| msgid ""
 #| "The group name or number of the user's new initial login group. The group "
@@ -553,19 +636,19 @@
 "istnieć. Numer grupy musi odnosić się do już istniejącej grupy. Domyślnym "
 "numerem grupy jest 1."
 
-#: usermod.8.xml:156(para)
+#: usermod.8.xml:173(para)
 msgid ""
 "Any file from the user's home directory owned by the previous primary group "
 "of the user will be owned by this new group."
 msgstr ""
 
-#: usermod.8.xml:160(para)
+#: usermod.8.xml:177(para)
 msgid ""
 "The group ownership of files outside of the user's home directory must be "
 "fixed manually."
 msgstr ""
 
-#: usermod.8.xml:167(term) useradd.8.xml:234(term)
+#: usermod.8.xml:184(term) useradd.8.xml:237(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -575,7 +658,7 @@
 "replaceable>[<emphasis remap=\"I\">,GRUPA2,...</emphasis>[<emphasis remap=\"I"
 "\">,GRUPAN</emphasis>]]]"
 
-#: usermod.8.xml:172(para)
+#: usermod.8.xml:189(para)
 #, fuzzy
 msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
@@ -589,7 +672,7 @@
 "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(para)
+#: usermod.8.xml:196(para)
 #, fuzzy
 msgid ""
 "If the user is currently a member of a group which is not listed, the user "
@@ -603,7 +686,7 @@
 "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:188(term)
+#: usermod.8.xml:205(term)
 msgid ""
 "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
 "replaceable>"
@@ -611,13 +694,13 @@
 "<option>-l</option>, <option>--login</option><replaceable>NOWY_LOGIN</"
 "replaceable>"
 
-#: usermod.8.xml:193(para)
+#: usermod.8.xml:210(para)
 #, fuzzy
 msgid ""
 "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."
+"particular, the user's home directory or mail spool should probably be "
+"renamed 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 "
@@ -625,11 +708,11 @@
 "nazwa katalogu domowego użytkownika, tak by odzwierciedlała nową nazwę "
 "użytkownika."
 
-#: usermod.8.xml:203(term)
+#: usermod.8.xml:220(term)
 msgid "<option>-L</option>, <option>--lock</option>"
 msgstr "<option>-L</option>, <option>--lock</option>"
 
-#: usermod.8.xml:207(para)
+#: usermod.8.xml:224(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>-"
@@ -639,24 +722,24 @@
 "zakodowanego hasła. Opcji tej nie można używać z opcjami <option>-p</option> "
 "or <option>-U</option>."
 
-#: usermod.8.xml:213(para)
+#: usermod.8.xml:230(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:222(term)
+#: usermod.8.xml:239(term)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "<option>-m</option>, <option>--move-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: usermod.8.xml:226(para)
+#: usermod.8.xml:243(para)
 msgid "Move the content of the user's home directory to the new location."
 msgstr ""
 
-#: usermod.8.xml:230(para)
+#: usermod.8.xml:247(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -664,26 +747,26 @@
 "<option>--home</option>) option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: usermod.8.xml:234(para)
+#: usermod.8.xml:251(para)
 msgid ""
 "<command>usermod</command> will try to adapt the ownership of the files and "
 "to copy the modes, ACL and extended attributes, but manual changes might be "
 "needed afterwards."
 msgstr ""
 
-#: usermod.8.xml:242(term) useradd.8.xml:374(term) groupmod.8.xml:116(term)
-#: groupadd.8.xml:134(term)
+#: usermod.8.xml:259(term) useradd.8.xml:377(term) groupmod.8.xml:123(term)
+#: groupadd.8.xml:136(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
-#: usermod.8.xml:246(para)
+#: usermod.8.xml:263(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:253(term) useradd.8.xml:386(term) groupmod.8.xml:127(term)
-#: groupadd.8.xml:144(term)
+#: usermod.8.xml:270(term) useradd.8.xml:389(term) groupmod.8.xml:134(term)
+#: groupadd.8.xml:146(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -691,41 +774,41 @@
 "<option>-p</option>, <option>--password</option><replaceable>HASŁO</"
 "replaceable>"
 
-#: usermod.8.xml:258(para) groupmod.8.xml:132(para)
+#: usermod.8.xml:275(para) groupmod.8.xml:139(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
 msgstr ""
 
-#: usermod.8.xml:263(para) useradd.8.xml:396(para) groupmod.8.xml:137(para)
-#: groupadd.8.xml:154(para)
+#: usermod.8.xml:280(para) useradd.8.xml:399(para) groupmod.8.xml:144(para)
+#: groupadd.8.xml:156(para)
 msgid ""
 "<emphasis role=\"bold\">Note:</emphasis> This option is not recommended "
 "because the password (or encrypted password) will be visible by users "
 "listing the processes."
 msgstr ""
 
-#: usermod.8.xml:268(para)
+#: usermod.8.xml:285(para)
 msgid ""
 "The password will be written in the local <filename>/etc/passwd</filename> "
 "or <filename>/etc/shadow</filename> file. This might differ from the "
 "password database configured in your PAM configuration."
 msgstr ""
 
-#: usermod.8.xml:274(para) useradd.8.xml:401(para) groupmod.8.xml:142(para)
-#: groupadd.8.xml:159(para)
+#: usermod.8.xml:291(para) useradd.8.xml:404(para) groupmod.8.xml:149(para)
+#: groupadd.8.xml:161(para)
 msgid ""
 "You should make sure the password respects the system's password policy."
 msgstr ""
 
-#: usermod.8.xml:281(term) useradd.8.xml:435(term) useradd.8.xml:576(term)
-#: su.1.xml:157(term) chsh.1.xml:85(term)
+#: usermod.8.xml:311(term) useradd.8.xml:451(term) useradd.8.xml:592(term)
+#: su.1.xml:167(term) chsh.1.xml:101(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 
-#: usermod.8.xml:286(para) chsh.1.xml:89(para)
+#: usermod.8.xml:316(para) chsh.1.xml:105(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."
@@ -733,41 +816,41 @@
 "Nazwa nowej powłoki (shell) użytkownika. Ustawienie tego pola na puste "
 "powoduje, że system wybierze domyślną powłokę logowania."
 
-#: usermod.8.xml:293(term) useradd.8.xml:450(term)
+#: usermod.8.xml:323(term) useradd.8.xml:466(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: usermod.8.xml:298(para)
+#: usermod.8.xml:328(para)
 msgid "The new numerical value of the user's ID."
 msgstr ""
 
-#: usermod.8.xml:301(para)
+#: usermod.8.xml:331(para)
 msgid ""
 "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:307(para)
+#: usermod.8.xml:337(para)
 msgid ""
 "The user's mailbox, and any files which the user owns and which are located "
 "in the user's home directory will have the file user ID changed "
 "automatically."
 msgstr ""
 
-#: usermod.8.xml:312(para)
+#: usermod.8.xml:342(para)
 msgid ""
 "The ownership of files outside of the user's home directory must be fixed "
 "manually."
 msgstr ""
 
-#: usermod.8.xml:319(term)
+#: usermod.8.xml:349(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:323(para)
+#: usermod.8.xml:353(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</"
@@ -777,7 +860,7 @@
 "zakodowanego hasła. Opcji tej nie można używać z opcjami <option>-p</option> "
 "lub <option>-L</option>."
 
-#: usermod.8.xml:328(para)
+#: usermod.8.xml:358(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 "
@@ -785,7 +868,7 @@
 "from <filename>/etc/default/useradd</filename>)."
 msgstr ""
 
-#: usermod.8.xml:339(term) useradd.8.xml:482(term)
+#: usermod.8.xml:369(term) useradd.8.xml:498(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
@@ -796,7 +879,7 @@
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 
-#: usermod.8.xml:344(para)
+#: usermod.8.xml:374(para)
 #, fuzzy
 #| msgid ""
 #| "The name of the user's new login shell. Setting this field to blank "
@@ -808,16 +891,16 @@
 "Nazwa nowej powłoki (shell) użytkownika. Ustawienie tego pola na puste "
 "powoduje, że system wybierze domyślną powłokę logowania."
 
-#: usermod.8.xml:355(title) userdel.8.xml:225(title) useradd.8.xml:605(title)
-#: su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
-#: newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title)
-#: groupdel.8.xml:65(title) groupadd.8.xml:223(title) gpasswd.1.xml:214(title)
-#: faillog.8.xml:199(title) chpasswd.8.xml:199(title)
-#: chgpasswd.8.xml:157(title)
+#: usermod.8.xml:385(title) userdel.8.xml:241(title) useradd.8.xml:621(title)
+#: su.1.xml:312(title) shadow.3.xml:199(title) passwd.1.xml:354(title)
+#: newusers.8.xml:330(title) login.1.xml:241(title) lastlog.8.xml:178(title)
+#: groupdel.8.xml:98(title) groupadd.8.xml:238(title) gpasswd.1.xml:232(title)
+#: faillog.8.xml:218(title) chpasswd.8.xml:215(title)
+#: chgpasswd.8.xml:173(title)
 msgid "CAVEATS"
 msgstr "OSTRZEŻENIA"
 
-#: usermod.8.xml:356(para)
+#: usermod.8.xml:386(para)
 msgid ""
 "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, the "
@@ -826,13 +909,13 @@
 "is logged in according to utmp on other architectures."
 msgstr ""
 
-#: usermod.8.xml:364(para)
+#: usermod.8.xml:394(para)
 msgid ""
 "You must change the owner of any <command>crontab</command> files or "
 "<command>at</command> jobs manually."
 msgstr ""
 
-#: usermod.8.xml:368(para)
+#: usermod.8.xml:398(para)
 msgid "You must make any changes involving NIS on the NIS server."
 msgstr ""
 
@@ -976,7 +1059,7 @@
 "algorithm: <placeholder-1/>"
 msgstr ""
 
-#: usermod.8.xml:420(para)
+#: usermod.8.xml:450(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1014,16 +1097,16 @@
 "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: userdel.8.xml:43(refentrytitle) userdel.8.xml:48(refname)
-#: userdel.8.xml:53(command) login.defs.5.xml:458(term)
+#: userdel.8.xml:44(refentrytitle) userdel.8.xml:51(refname)
+#: userdel.8.xml:56(command) login.defs.5.xml:461(term)
 msgid "userdel"
 msgstr "userdel"
 
-#: userdel.8.xml:49(refpurpose)
+#: userdel.8.xml:52(refpurpose)
 msgid "delete a user account and related files"
 msgstr "plik chroniony informacji o użytkownikach"
 
-#: userdel.8.xml:63(para)
+#: userdel.8.xml:66(para)
 #, fuzzy
 msgid ""
 "The <command>userdel</command> command modifies the system account files, "
@@ -1033,15 +1116,15 @@
 "Polecenie <command>usermod</command> zmienia systemowe pliki kont, "
 "odzwierciedlając zmiany podane w wierszu poleceń."
 
-#: userdel.8.xml:72(para)
+#: userdel.8.xml:75(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:77(term) groupadd.8.xml:79(term)
+#: userdel.8.xml:80(term) groupadd.8.xml:81(term) expiry.1.xml:84(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option>"
 
-#: userdel.8.xml:81(para)
+#: userdel.8.xml:84(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 "
@@ -1053,24 +1136,24 @@
 "it is still the primary group of another user."
 msgstr ""
 
-#: userdel.8.xml:94(para)
+#: userdel.8.xml:97(para)
 msgid ""
 "<emphasis>Note:</emphasis> This option is dangerous and may leave your "
 "system in an inconsistent state."
 msgstr ""
 
-#: userdel.8.xml:107(term)
+#: userdel.8.xml:110(term)
 msgid "<option>-r</option>, <option>--remove</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
-#: userdel.8.xml:111(para)
+#: userdel.8.xml:114(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:117(para)
+#: userdel.8.xml:120(para)
 msgid ""
 "The mail spool is defined by the <option>MAIL_DIR</option> variable in the "
 "<filename>login.defs</filename> file."
@@ -1150,109 +1233,109 @@
 "the user."
 msgstr ""
 
-#: userdel.8.xml:153(filename) useradd.8.xml:694(filename)
-#: su.1.xml:353(filename) pwconv.8.xml:190(filename)
-#: passwd.1.xml:389(filename) newusers.8.xml:384(filename)
-#: login.access.5.xml:99(filename) login.1.xml:367(filename)
-#: groupadd.8.xml:214(filename) chsh.1.xml:148(filename)
-#: chpasswd.8.xml:238(filename) chgpasswd.8.xml:199(filename)
-#: chfn.1.xml:116(filename)
+#: userdel.8.xml:169(filename) useradd.8.xml:710(filename)
+#: su.1.xml:363(filename) pwconv.8.xml:235(filename)
+#: passwd.1.xml:405(filename) newusers.8.xml:402(filename)
+#: login.access.5.xml:105(filename) login.1.xml:370(filename)
+#: groupadd.8.xml:229(filename) chsh.1.xml:164(filename)
+#: chpasswd.8.xml:254(filename) chgpasswd.8.xml:215(filename)
+#: chfn.1.xml:192(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:155(para) useradd.8.xml:696(para) su.1.xml:355(para)
-#: pwconv.8.xml:192(para) passwd.1.xml:391(para) newusers.8.xml:386(para)
-#: login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:216(para)
-#: chsh.1.xml:150(para) chpasswd.8.xml:240(para) chgpasswd.8.xml:201(para)
-#: chfn.1.xml:118(para)
+#: userdel.8.xml:171(para) useradd.8.xml:712(para) su.1.xml:365(para)
+#: pwconv.8.xml:237(para) passwd.1.xml:407(para) newusers.8.xml:404(para)
+#: login.access.5.xml:107(para) login.1.xml:372(para) groupadd.8.xml:231(para)
+#: chsh.1.xml:166(para) chpasswd.8.xml:256(para) chgpasswd.8.xml:217(para)
+#: chfn.1.xml:194(para)
 msgid "Shadow password suite configuration."
 msgstr "Konfiguracja pakietu shadow."
 
-#: userdel.8.xml:174(title) useradd.8.xml:703(title) su.1.xml:362(title)
-#: pwck.8.xml:271(title) passwd.1.xml:404(title) grpck.8.xml:209(title)
-#: groupmod.8.xml:182(title) groupdel.8.xml:107(title)
-#: groupadd.8.xml:245(title) chage.1.xml:244(title)
+#: userdel.8.xml:190(title) useradd.8.xml:719(title) su.1.xml:372(title)
+#: pwck.8.xml:275(title) passwd.1.xml:420(title) grpck.8.xml:227(title)
+#: groupmod.8.xml:208(title) groupdel.8.xml:140(title)
+#: groupadd.8.xml:260(title) chage.1.xml:260(title)
 msgid "EXIT VALUES"
 msgstr "KOD ZAKOŃCZENIA"
 
-#: userdel.8.xml:179(replaceable) useradd.8.xml:708(replaceable)
-#: su.1.xml:381(replaceable) pwck.8.xml:276(replaceable)
-#: passwd.1.xml:409(replaceable) grpck.8.xml:214(replaceable)
-#: groupmod.8.xml:187(replaceable) groupdel.8.xml:112(replaceable)
-#: groupadd.8.xml:250(replaceable) chage.1.xml:249(replaceable)
+#: userdel.8.xml:195(replaceable) useradd.8.xml:724(replaceable)
+#: su.1.xml:391(replaceable) pwck.8.xml:280(replaceable)
+#: passwd.1.xml:425(replaceable) grpck.8.xml:232(replaceable)
+#: groupmod.8.xml:213(replaceable) groupdel.8.xml:145(replaceable)
+#: groupadd.8.xml:265(replaceable) chage.1.xml:265(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:181(para) useradd.8.xml:710(para) pwck.8.xml:278(para)
-#: passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para)
-#: groupdel.8.xml:114(para) groupadd.8.xml:252(para) chage.1.xml:251(para)
+#: userdel.8.xml:197(para) useradd.8.xml:726(para) pwck.8.xml:282(para)
+#: passwd.1.xml:427(para) grpck.8.xml:234(para) groupmod.8.xml:215(para)
+#: groupdel.8.xml:147(para) groupadd.8.xml:267(para) chage.1.xml:267(para)
 msgid "success"
 msgstr "poprawne zakończenie działania programu"
 
-#: userdel.8.xml:185(replaceable) useradd.8.xml:714(replaceable)
-#: su.1.xml:55(manvolnum) su.1.xml:387(replaceable) sg.1.xml:39(manvolnum)
-#: pwck.8.xml:282(replaceable) passwd.1.xml:45(manvolnum)
-#: passwd.1.xml:415(replaceable) newgrp.1.xml:39(manvolnum)
-#: login.1.xml:71(manvolnum) grpck.8.xml:220(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:39(manvolnum)
-#: chage.1.xml:255(replaceable)
+#: userdel.8.xml:201(replaceable) useradd.8.xml:730(replaceable)
+#: su.1.xml:56(manvolnum) su.1.xml:397(replaceable) sg.1.xml:40(manvolnum)
+#: pwck.8.xml:286(replaceable) passwd.1.xml:46(manvolnum)
+#: passwd.1.xml:431(replaceable) newgrp.1.xml:40(manvolnum)
+#: login.1.xml:72(manvolnum) grpck.8.xml:238(replaceable)
+#: groups.1.xml:39(manvolnum) gpasswd.1.xml:44(manvolnum)
+#: expiry.1.xml:43(manvolnum) chsh.1.xml:42(manvolnum)
+#: chfn.1.xml:42(manvolnum) chage.1.xml:40(manvolnum)
+#: chage.1.xml:271(replaceable)
 msgid "1"
 msgstr "1"
 
-#: userdel.8.xml:187(para) useradd.8.xml:716(para)
+#: userdel.8.xml:203(para) useradd.8.xml:732(para)
 msgid "can't update password file"
 msgstr "nie można zaktualizować pliku z hasłami"
 
-#: userdel.8.xml:191(replaceable) useradd.8.xml:720(replaceable)
-#: pwck.8.xml:288(replaceable) passwd.1.xml:421(replaceable)
-#: grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable)
-#: groupdel.8.xml:118(replaceable) groupadd.8.xml:256(replaceable)
-#: chage.1.xml:261(replaceable)
+#: userdel.8.xml:207(replaceable) useradd.8.xml:736(replaceable)
+#: pwck.8.xml:292(replaceable) passwd.1.xml:437(replaceable)
+#: grpck.8.xml:244(replaceable) groupmod.8.xml:219(replaceable)
+#: groupdel.8.xml:151(replaceable) groupadd.8.xml:271(replaceable)
+#: chage.1.xml:277(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:193(para) useradd.8.xml:722(para) pwck.8.xml:284(para)
-#: grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
-#: groupadd.8.xml:258(para) chage.1.xml:263(para)
+#: userdel.8.xml:209(para) useradd.8.xml:738(para) pwck.8.xml:288(para)
+#: grpck.8.xml:240(para) groupmod.8.xml:221(para) groupdel.8.xml:153(para)
+#: groupadd.8.xml:273(para) chage.1.xml:279(para)
 msgid "invalid command syntax"
 msgstr "niepoprawna składnia polecenia"
 
-#: userdel.8.xml:197(replaceable) useradd.8.xml:738(replaceable)
-#: pwck.8.xml:312(replaceable) passwd.1.xml:445(replaceable)
-#: groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
+#: userdel.8.xml:213(replaceable) useradd.8.xml:754(replaceable)
+#: pwck.8.xml:316(replaceable) passwd.1.xml:461(replaceable)
+#: groupmod.8.xml:237(replaceable) groupdel.8.xml:157(replaceable)
 msgid "6"
 msgstr "6"
 
-#: userdel.8.xml:199(para)
+#: userdel.8.xml:215(para)
 msgid "specified user doesn't exist"
 msgstr ""
 
-#: userdel.8.xml:205(para)
+#: userdel.8.xml:221(para)
 msgid "user currently logged in"
 msgstr ""
 
-#: userdel.8.xml:209(replaceable) useradd.8.xml:750(replaceable)
-#: groupmod.8.xml:223(replaceable) groupdel.8.xml:136(replaceable)
-#: groupadd.8.xml:280(replaceable)
+#: userdel.8.xml:225(replaceable) useradd.8.xml:766(replaceable)
+#: groupmod.8.xml:249(replaceable) groupdel.8.xml:169(replaceable)
+#: groupadd.8.xml:295(replaceable)
 msgid "10"
 msgstr "10"
 
-#: userdel.8.xml:211(para) useradd.8.xml:752(para) groupmod.8.xml:225(para)
-#: groupdel.8.xml:138(para) groupadd.8.xml:282(para)
+#: userdel.8.xml:227(para) useradd.8.xml:768(para) groupmod.8.xml:251(para)
+#: groupdel.8.xml:171(para) groupadd.8.xml:297(para)
 msgid "can't update group file"
 msgstr "nie można zaktualizować pliku z grupami"
 
-#: userdel.8.xml:215(replaceable) useradd.8.xml:756(replaceable)
+#: userdel.8.xml:231(replaceable) useradd.8.xml:772(replaceable)
 msgid "12"
 msgstr "12"
 
-#: userdel.8.xml:217(para)
+#: userdel.8.xml:233(para)
 msgid "can't remove home directory"
 msgstr ""
 
-#: userdel.8.xml:175(para)
+#: userdel.8.xml:191(para)
 msgid ""
 "The <command>userdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1260,7 +1343,7 @@
 "Polecenie <command>userdel</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: userdel.8.xml:226(para)
+#: userdel.8.xml:242(para)
 msgid ""
 "<command>userdel</command> will not allow you to remove an account if there "
 "are running processes which belong to this account. In that case, you may "
@@ -1269,19 +1352,19 @@
 "deletion of this account."
 msgstr ""
 
-#: userdel.8.xml:233(para)
+#: userdel.8.xml:249(para)
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this user."
 msgstr ""
 
-#: userdel.8.xml:237(para)
+#: userdel.8.xml:253(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:240(para)
+#: userdel.8.xml:256(para)
 msgid ""
 "If <option>USERGROUPS_ENAB</option> is defined to <emphasis remap=\"I\">yes</"
 "emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -1292,7 +1375,7 @@
 "<option>-f</option> option can force the deletion of this group."
 msgstr ""
 
-#: userdel.8.xml:253(para)
+#: userdel.8.xml:269(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1326,21 +1409,21 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: useradd.8.xml:52(refentrytitle) useradd.8.xml:57(refname)
-#: useradd.8.xml:62(command) useradd.8.xml:69(command)
-#: useradd.8.xml:73(command) login.defs.5.xml:444(term)
+#: useradd.8.xml:53(refentrytitle) useradd.8.xml:60(refname)
+#: useradd.8.xml:65(command) useradd.8.xml:72(command)
+#: useradd.8.xml:76(command) login.defs.5.xml:447(term)
 msgid "useradd"
 msgstr "useradd"
 
-#: useradd.8.xml:58(refpurpose)
+#: useradd.8.xml:61(refpurpose)
 msgid "create a new user or update default new user information"
 msgstr ""
 
-#: useradd.8.xml:70(arg) useradd.8.xml:74(arg)
+#: useradd.8.xml:73(arg) useradd.8.xml:77(arg)
 msgid "-D"
 msgstr "-D"
 
-#: useradd.8.xml:83(para)
+#: useradd.8.xml:86(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 "
@@ -1350,18 +1433,18 @@
 "initial files."
 msgstr ""
 
-#: useradd.8.xml:92(para)
+#: useradd.8.xml:95(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:101(para)
+#: useradd.8.xml:104(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:105(term) useradd.8.xml:507(term)
+#: useradd.8.xml:108(term) useradd.8.xml:523(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
@@ -1369,7 +1452,7 @@
 "<option>-b</option>, <option>--base-dir</option><replaceable>KAT_BAZOWY</"
 "replaceable>"
 
-#: useradd.8.xml:110(para)
+#: useradd.8.xml:113(para)
 msgid ""
 "The default base directory for the system if <option>-d</"
 "option><replaceable>HOME_DIR</replaceable> is not specified. "
@@ -1378,20 +1461,20 @@
 "<replaceable>BASE_DIR</replaceable> must exist."
 msgstr ""
 
-#: useradd.8.xml:118(para)
+#: useradd.8.xml:121(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:133(para)
+#: useradd.8.xml:136(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:146(para)
+#: useradd.8.xml:149(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 "
@@ -1401,24 +1484,24 @@
 "created if it is missing."
 msgstr ""
 
-#: useradd.8.xml:158(term)
+#: useradd.8.xml:161(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:162(para)
+#: useradd.8.xml:165(para)
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr ""
 
-#: useradd.8.xml:177(para)
+#: useradd.8.xml:180(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:191(para)
+#: useradd.8.xml:194(para)
 #, fuzzy
 #| msgid ""
 #| "The number of days after a password expires until the account is "
@@ -1434,14 +1517,14 @@
 "wyłącza konto natychmiast po przeterminowaniu hasła, zaś wartość -1 wyłącza "
 "tę cechę. Domyślną wartością jest -1."
 
-#: useradd.8.xml:197(para)
+#: useradd.8.xml:200(para)
 msgid ""
 "If not specified, <command>useradd</command> will use the default inactivity "
 "period specified by the <option>INACTIVE</option> variable in <filename>/etc/"
 "default/useradd</filename>, or -1 by default."
 msgstr ""
 
-#: useradd.8.xml:211(para)
+#: useradd.8.xml:214(para)
 #, fuzzy
 #| msgid ""
 #| "The group name or number of the user's new initial login group. The group "
@@ -1455,7 +1538,7 @@
 "istnieć. Numer grupy musi odnosić się do już istniejącej grupy. Domyślnym "
 "numerem grupy jest 1."
 
-#: useradd.8.xml:216(para)
+#: useradd.8.xml:219(para)
 msgid ""
 "If not specified, the behavior of <command>useradd</command> will depend on "
 "the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
@@ -1469,7 +1552,7 @@
 "default."
 msgstr ""
 
-#: useradd.8.xml:239(para)
+#: useradd.8.xml:242(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. "
@@ -1478,7 +1561,7 @@
 "the initial group."
 msgstr ""
 
-#: useradd.8.xml:256(term)
+#: useradd.8.xml:259(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
@@ -1489,14 +1572,14 @@
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 
-#: useradd.8.xml:261(para)
+#: useradd.8.xml:264(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:266(para)
+#: useradd.8.xml:269(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -1504,18 +1587,18 @@
 "home</option>) option is specified."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:270(para)
+#: useradd.8.xml:273(para)
 msgid ""
 "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:276(para)
+#: useradd.8.xml:279(para)
 msgid "If possible, the ACLs and extended attributes are copied."
 msgstr ""
 
-#: useradd.8.xml:282(term) groupadd.8.xml:113(term)
+#: useradd.8.xml:285(term) groupadd.8.xml:115(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -1523,7 +1606,7 @@
 "<option>-K</option>, <option>--key</option><replaceable>KLUCZ</"
 "replaceable>=<replaceable>WARTOŚĆ</replaceable>"
 
-#: useradd.8.xml:287(para)
+#: useradd.8.xml:290(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (<option>UID_MIN</"
 "option>, <option>UID_MAX</option>, <option>UMASK</option>, "
@@ -1537,66 +1620,66 @@
 "replaceable>=<replaceable>499</replaceable>"
 msgstr ""
 
-#: useradd.8.xml:311(term)
+#: useradd.8.xml:314(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:313(para)
+#: useradd.8.xml:316(para)
 msgid "Do not add the user to the lastlog and faillog databases."
 msgstr ""
 
-#: useradd.8.xml:316(para)
+#: useradd.8.xml:319(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:324(term)
+#: useradd.8.xml:327(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:328(para)
+#: useradd.8.xml:331(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:334(para)
+#: useradd.8.xml:337(para)
 msgid ""
 "By default, if this option is not specified and <option>CREATE_HOME</option> "
 "is not enabled, no home directories are created."
 msgstr ""
 
-#: useradd.8.xml:343(option)
+#: useradd.8.xml:346(option)
 #, fuzzy
 #| msgid "-"
 msgid "-M"
 msgstr "-"
 
-#: useradd.8.xml:346(para)
+#: useradd.8.xml:349(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:355(term)
+#: useradd.8.xml:358(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:359(para)
+#: useradd.8.xml:362(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 "
 "<option>GROUP</option> variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:365(para) useradd.8.xml:473(para)
+#: useradd.8.xml:368(para) useradd.8.xml:489(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 "
@@ -1604,18 +1687,18 @@
 "filename>."
 msgstr ""
 
-#: useradd.8.xml:378(para)
+#: useradd.8.xml:381(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr ""
 
-#: useradd.8.xml:379(para)
+#: useradd.8.xml:382(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid in combination with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:391(para) groupadd.8.xml:149(para)
+#: useradd.8.xml:394(para) groupadd.8.xml:151(para)
 #, fuzzy
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
@@ -1626,17 +1709,17 @@
 "jest zmieniana przy pomocy polecenia <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: useradd.8.xml:408(term) newusers.8.xml:263(term) groupadd.8.xml:166(term)
+#: useradd.8.xml:411(term) newusers.8.xml:268(term) groupadd.8.xml:168(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:412(para) newusers.8.xml:267(para)
+#: useradd.8.xml:415(para) newusers.8.xml:272(para)
 msgid "Create a system account."
 msgstr ""
 
-#: useradd.8.xml:415(para)
+#: useradd.8.xml:418(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are chosen in the "
@@ -1646,7 +1729,7 @@
 "the creation of groups)."
 msgstr ""
 
-#: useradd.8.xml:424(para)
+#: useradd.8.xml:427(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."
@@ -1655,7 +1738,7 @@
 "account to be created."
 msgstr ""
 
-#: useradd.8.xml:440(para)
+#: useradd.8.xml:456(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 specified "
@@ -1663,7 +1746,7 @@
 "filename>, or an empty string by default."
 msgstr ""
 
-#: useradd.8.xml:455(para)
+#: useradd.8.xml:471(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 "
@@ -1672,19 +1755,19 @@
 "accounts."
 msgstr ""
 
-#: useradd.8.xml:465(term)
+#: useradd.8.xml:481(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:469(para)
+#: useradd.8.xml:485(para)
 msgid ""
 "Create a group with the same name as the user, and add the user to this "
 "group."
 msgstr ""
 
-#: useradd.8.xml:487(para)
+#: useradd.8.xml:503(para)
 #, fuzzy
 #| msgid ""
 #| "The name of the user's new login shell. Setting this field to blank "
@@ -1696,11 +1779,11 @@
 "Nazwa nowej powłoki (shell) użytkownika. Ustawienie tego pola na puste "
 "powoduje, że system wybierze domyślną powłokę logowania."
 
-#: useradd.8.xml:497(title)
+#: useradd.8.xml:513(title)
 msgid "Changing the default values"
 msgstr ""
 
-#: useradd.8.xml:498(para)
+#: useradd.8.xml:514(para)
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
 "command> will display the current default values. When invoked with <option>-"
@@ -1708,7 +1791,7 @@
 "default values for the specified options. Valid default-changing options are:"
 msgstr ""
 
-#: useradd.8.xml:512(para)
+#: useradd.8.xml:528(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 "
@@ -1716,35 +1799,35 @@
 "when creating a new account."
 msgstr ""
 
-#: useradd.8.xml:519(para)
+#: useradd.8.xml:535(para)
 msgid ""
 "This option sets the <option>HOME</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:531(para)
+#: useradd.8.xml:547(para)
 msgid "The date on which the user account is disabled."
 msgstr ""
 
-#: useradd.8.xml:532(para)
+#: useradd.8.xml:548(para)
 msgid ""
 "This option sets the <option>EXPIRE</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:544(para)
+#: useradd.8.xml:560(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
 msgstr ""
 
-#: useradd.8.xml:548(para)
+#: useradd.8.xml:564(para)
 msgid ""
 "This option sets the <option>INACTIVE</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:560(para)
+#: useradd.8.xml:576(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> "
@@ -1753,27 +1836,27 @@
 "have an existing entry."
 msgstr ""
 
-#: useradd.8.xml:569(para)
+#: useradd.8.xml:585(para)
 msgid ""
 "This option sets the <option>GROUP</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:581(para)
+#: useradd.8.xml:597(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
-#: useradd.8.xml:584(para)
+#: useradd.8.xml:600(para)
 msgid ""
 "This option sets the <option>SHELL</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:596(title)
+#: useradd.8.xml:612(title)
 msgid "NOTES"
 msgstr "UWAGI"
 
-#: useradd.8.xml:597(para)
+#: useradd.8.xml:613(para)
 msgid ""
 "The system administrator is responsible for placing the default user files "
 "in the <filename>/etc/skel/</filename> directory (or any other skeleton "
@@ -1781,27 +1864,27 @@
 "command line)."
 msgstr ""
 
-#: useradd.8.xml:606(para)
+#: useradd.8.xml:622(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:611(para)
+#: useradd.8.xml:627(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:617(para)
+#: useradd.8.xml:633(para)
 msgid ""
 "Usernames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
 "dollar sign. In regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 
-#: useradd.8.xml:623(para)
+#: useradd.8.xml:639(para)
 msgid "Usernames may only be up to 32 characters long."
 msgstr ""
 
@@ -1986,71 +2069,71 @@
 "It is also used by <command>pam_umask</command> as the default umask value."
 msgstr ""
 
-#: useradd.8.xml:682(filename)
+#: useradd.8.xml:698(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
-#: useradd.8.xml:684(para)
+#: useradd.8.xml:700(para)
 msgid "Default values for account creation."
 msgstr ""
 
-#: useradd.8.xml:688(filename)
+#: useradd.8.xml:704(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
-#: useradd.8.xml:690(para)
+#: useradd.8.xml:706(para)
 msgid "Directory containing default files."
 msgstr ""
 
-#: useradd.8.xml:726(replaceable) shadow.3.xml:35(manvolnum)
-#: pwck.8.xml:294(replaceable) passwd.1.xml:427(replaceable)
-#: grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable)
-#: groupadd.8.xml:262(replaceable)
+#: useradd.8.xml:742(replaceable) shadow.3.xml:39(manvolnum)
+#: pwck.8.xml:298(replaceable) passwd.1.xml:443(replaceable)
+#: grpck.8.xml:250(replaceable) groupmod.8.xml:225(replaceable)
+#: groupadd.8.xml:277(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:728(para) passwd.1.xml:447(para) groupmod.8.xml:201(para)
-#: groupadd.8.xml:264(para)
+#: useradd.8.xml:744(para) passwd.1.xml:463(para) groupmod.8.xml:227(para)
+#: groupadd.8.xml:279(para)
 msgid "invalid argument to option"
 msgstr "nieprawidłowy argument opcji"
 
-#: useradd.8.xml:732(replaceable) pwck.8.xml:300(replaceable)
-#: passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable)
-#: groupmod.8.xml:205(replaceable) groupadd.8.xml:268(replaceable)
+#: useradd.8.xml:748(replaceable) pwck.8.xml:304(replaceable)
+#: passwd.1.xml:449(replaceable) grpck.8.xml:256(replaceable)
+#: groupmod.8.xml:231(replaceable) groupadd.8.xml:283(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:734(para)
+#: useradd.8.xml:750(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:740(para) groupmod.8.xml:207(para) groupmod.8.xml:213(para)
-#: groupdel.8.xml:126(para)
+#: useradd.8.xml:756(para) groupmod.8.xml:233(para) groupmod.8.xml:239(para)
+#: groupdel.8.xml:159(para)
 msgid "specified group doesn't exist"
 msgstr ""
 
-#: useradd.8.xml:744(replaceable) groupmod.8.xml:217(replaceable)
-#: groupadd.8.xml:274(replaceable)
+#: useradd.8.xml:760(replaceable) groupmod.8.xml:243(replaceable)
+#: groupadd.8.xml:289(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:746(para)
+#: useradd.8.xml:762(para)
 msgid "username already in use"
 msgstr ""
 
-#: useradd.8.xml:758(para)
+#: useradd.8.xml:774(para)
 msgid "can't create home directory"
 msgstr ""
 
-#: useradd.8.xml:762(replaceable)
+#: useradd.8.xml:778(replaceable)
 msgid "13"
 msgstr "13"
 
-#: useradd.8.xml:764(para)
+#: useradd.8.xml:780(para)
 msgid "can't create mail spool"
 msgstr ""
 
-#: useradd.8.xml:704(para)
+#: useradd.8.xml:720(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -2058,7 +2141,7 @@
 "Polecenie <command>useradd</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: useradd.8.xml:773(para)
+#: useradd.8.xml:789(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -2096,43 +2179,43 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
+#: suauth.5.xml:38(refentrytitle) suauth.5.xml:45(refname)
 msgid "suauth"
 msgstr "suauth"
 
-#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
-#: pwck.8.xml:306(replaceable) porttime.5.xml:35(manvolnum)
-#: passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable)
-#: login.defs.5.xml:101(manvolnum) login.access.5.xml:36(manvolnum)
-#: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
-#: grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
+#: suauth.5.xml:39(manvolnum) shadow.5.xml:39(manvolnum)
+#: pwck.8.xml:310(replaceable) porttime.5.xml:39(manvolnum)
+#: passwd.5.xml:39(manvolnum) passwd.1.xml:455(replaceable)
+#: login.defs.5.xml:102(manvolnum) login.access.5.xml:40(manvolnum)
+#: limits.5.xml:40(manvolnum) gshadow.5.xml:38(manvolnum)
+#: grpck.8.xml:262(replaceable) faillog.5.xml:39(manvolnum)
 msgid "5"
 msgstr "5"
 
-#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo)
-#: porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo)
-#: login.defs.5.xml:102(refmiscinfo) login.access.5.xml:37(refmiscinfo)
-#: limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo)
-#: faillog.5.xml:36(refmiscinfo)
+#: suauth.5.xml:40(refmiscinfo) shadow.5.xml:40(refmiscinfo)
+#: porttime.5.xml:40(refmiscinfo) passwd.5.xml:40(refmiscinfo)
+#: login.defs.5.xml:103(refmiscinfo) login.access.5.xml:41(refmiscinfo)
+#: limits.5.xml:41(refmiscinfo) gshadow.5.xml:39(refmiscinfo)
+#: faillog.5.xml:40(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr ""
 
-#: suauth.5.xml:40(refpurpose)
+#: suauth.5.xml:46(refpurpose)
 msgid "detailed su control file"
 msgstr ""
 
-#: suauth.5.xml:45(command) suauth.5.xml:171(filename)
+#: suauth.5.xml:51(command) suauth.5.xml:177(filename)
 msgid "/etc/suauth"
 msgstr "/etc/suauth"
 
-#: suauth.5.xml:51(para)
+#: suauth.5.xml:57(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:58(literallayout)
+#: suauth.5.xml:64(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2141,18 +2224,18 @@
 msgstr ""
 
 #. .fi
-#: suauth.5.xml:62(para)
+#: suauth.5.xml:68(para)
 msgid ""
 "2) the user executing the su command (or any groups he might be a member of)"
 msgstr ""
 
-#: suauth.5.xml:67(para)
+#: suauth.5.xml:73(para)
 msgid ""
 "The file is formatted like this, with lines starting with a # being treated "
 "as comment lines and ignored;"
 msgstr ""
 
-#: suauth.5.xml:72(literallayout)
+#: suauth.5.xml:78(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2160,14 +2243,14 @@
 "    "
 msgstr ""
 
-#: suauth.5.xml:76(para)
+#: suauth.5.xml:82(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 \",\""
+"a list of usernames delimited by \",\"."
 msgstr ""
 
-#: suauth.5.xml:82(para)
+#: suauth.5.xml:88(para)
 msgid ""
 "from-id is formatted the same as to-id except the extra word "
 "<emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</"
@@ -2178,38 +2261,38 @@
 "manvolnum></citerefentry> is neccessary."
 msgstr ""
 
-#: suauth.5.xml:93(para)
+#: suauth.5.xml:99(para)
 msgid "Action can be one only of the following currently supported options."
 msgstr ""
 
-#: suauth.5.xml:99(emphasis)
+#: suauth.5.xml:105(emphasis)
 msgid "DENY"
 msgstr "DENY"
 
-#: suauth.5.xml:102(para)
+#: suauth.5.xml:108(para)
 msgid "The attempt to su is stopped before a password is even asked for."
 msgstr ""
 
-#: suauth.5.xml:109(emphasis)
+#: suauth.5.xml:115(emphasis)
 msgid "NOPASS"
 msgstr "NOPASS"
 
-#: suauth.5.xml:112(para)
+#: suauth.5.xml:118(para)
 msgid ""
 "The attempt to su is automatically successful; no password is asked for."
 msgstr ""
 
-#: suauth.5.xml:120(emphasis)
+#: suauth.5.xml:126(emphasis)
 msgid "OWNPASS"
 msgstr "OWNPASS"
 
-#: suauth.5.xml:123(para)
+#: suauth.5.xml:129(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:131(para)
+#: suauth.5.xml:137(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 "
@@ -2218,11 +2301,11 @@
 "as fine control as he or she wishes."
 msgstr ""
 
-#: suauth.5.xml:141(title)
+#: suauth.5.xml:147(title)
 msgid "EXAMPLE"
 msgstr "EXAMPLE"
 
-#: suauth.5.xml:142(literallayout)
+#: suauth.5.xml:148(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2249,29 +2332,29 @@
 "    "
 msgstr ""
 
-#: suauth.5.xml:178(title) pwconv.8.xml:153(title) login.defs.5.xml:488(title)
+#: suauth.5.xml:184(title) pwconv.8.xml:198(title) login.defs.5.xml:491(title)
 msgid "BUGS"
 msgstr "BŁĘDY"
 
-#: suauth.5.xml:179(para)
+#: suauth.5.xml:185(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:188(title) shadow.3.xml:183(title)
+#: suauth.5.xml:194(title) shadow.3.xml:189(title)
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSTYKA"
 
-#: suauth.5.xml:189(para)
+#: suauth.5.xml:195(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:198(para)
+#: suauth.5.xml:204(para)
 msgid ""
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -2279,30 +2362,30 @@
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command)
-#: login.defs.5.xml:418(term)
+#: su.1.xml:55(refentrytitle) su.1.xml:62(refname) su.1.xml:67(command)
+#: login.defs.5.xml:421(term)
 msgid "su"
 msgstr "su"
 
-#: 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:40(refmiscinfo)
+#: su.1.xml:57(refmiscinfo) sg.1.xml:41(refmiscinfo)
+#: passwd.1.xml:47(refmiscinfo) newgrp.1.xml:41(refmiscinfo)
+#: login.1.xml:73(refmiscinfo) groups.1.xml:40(refmiscinfo)
+#: gpasswd.1.xml:45(refmiscinfo) expiry.1.xml:44(refmiscinfo)
+#: chsh.1.xml:43(refmiscinfo) chfn.1.xml:43(refmiscinfo)
+#: chage.1.xml:41(refmiscinfo)
 msgid "User Commands"
 msgstr "Polecenia użytkowników"
 
-#: su.1.xml:60(refpurpose)
+#: su.1.xml:63(refpurpose)
 msgid "change user ID or become superuser"
 msgstr ""
 
-#: su.1.xml:70(replaceable) login.1.xml:85(replaceable)
-#: login.1.xml:93(replaceable)
+#: su.1.xml:73(replaceable) login.1.xml:88(replaceable)
+#: login.1.xml:96(replaceable)
 msgid "username"
 msgstr ""
 
-#: su.1.xml:78(para)
+#: su.1.xml:81(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</"
@@ -2311,7 +2394,7 @@
 "would expect had the user logged in directly."
 msgstr ""
 
-#: su.1.xml:87(para)
+#: su.1.xml:90(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 "
@@ -2320,20 +2403,20 @@
 "specified in <filename>/etc/passwd</filename> for the target user."
 msgstr ""
 
-#: su.1.xml:96(para)
+#: su.1.xml:99(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:101(para)
+#: su.1.xml:104(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:106(para)
+#: su.1.xml:109(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 "
@@ -2343,18 +2426,18 @@
 "filename>."
 msgstr ""
 
-#: su.1.xml:115(para) login.1.xml:166(para)
+#: su.1.xml:118(para) login.1.xml:169(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:124(para)
+#: su.1.xml:127(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:128(term)
+#: su.1.xml:131(term)
 msgid ""
 "<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
 "replaceable>"
@@ -2362,61 +2445,67 @@
 "<option>-c</option>, <option>--command</option><replaceable>POLECENIE</"
 "replaceable>"
 
-#: su.1.xml:133(para)
+#: su.1.xml:136(para)
 msgid ""
 "Specify a command that will be invoked by the shell using its <option>-c</"
 "option>."
 msgstr ""
 
-#: su.1.xml:140(term)
+#: su.1.xml:140(para)
+msgid ""
+"The executed command will have no controlling terminal. This option cannot "
+"be used to execute interractive programs which need a controlling TTY."
+msgstr ""
+
+#: su.1.xml:150(term)
 msgid "<option>-</option>, <option>-l</option>, <option>--login</option>"
 msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
 
-#: su.1.xml:144(para)
+#: su.1.xml:154(para)
 msgid ""
 "Provide an environment similar to what the user would expect had the user "
 "logged in directly."
 msgstr ""
 
-#: su.1.xml:148(para)
+#: su.1.xml:158(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:162(para)
+#: su.1.xml:172(para)
 msgid "The shell that will be invoked."
 msgstr ""
 
-#: su.1.xml:170(para)
+#: su.1.xml:180(para)
 msgid "The shell specified with --shell."
 msgstr ""
 
-#: su.1.xml:173(para)
+#: su.1.xml:183(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
 msgstr ""
 
-#: su.1.xml:180(para)
+#: su.1.xml:190(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
 msgstr ""
 
-#: su.1.xml:186(para)
+#: su.1.xml:196(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
 msgstr ""
 
-#: su.1.xml:163(para)
+#: su.1.xml:173(para)
 msgid ""
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:191(para)
+#: su.1.xml:201(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>/"
@@ -2425,7 +2514,7 @@
 "unless <command>su</command> is called by root."
 msgstr ""
 
-#: su.1.xml:202(term)
+#: su.1.xml:212(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2433,57 +2522,57 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:211(envar)
+#: su.1.xml:221(envar)
 msgid "$PATH"
 msgstr ""
 
-#: su.1.xml:213(para)
+#: su.1.xml:223(para)
 msgid ""
 "reset according to the <filename>/etc/login.defs</filename> options "
 "<option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
 msgstr ""
 
-#: su.1.xml:222(envar)
+#: su.1.xml:232(envar)
 msgid "$IFS"
 msgstr ""
 
-#: su.1.xml:224(para)
+#: su.1.xml:234(para)
 msgid ""
 "reset to <quote><space><tab><newline></quote>, if it was "
 "set."
 msgstr ""
 
-#: su.1.xml:207(para)
+#: su.1.xml:217(para)
 msgid "Preserve the current environment, except for: <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:233(para)
+#: su.1.xml:243(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:242(para)
+#: su.1.xml:252(para)
 msgid ""
 "The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, "
 "<envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> "
 "environment variables are reset."
 msgstr ""
 
-#: su.1.xml:251(para)
+#: su.1.xml:261(para)
 msgid ""
 "If <option>--login</option> is not used, the environment is copied, except "
 "for the variables above."
 msgstr ""
 
-#: su.1.xml:258(para)
+#: su.1.xml:268(para)
 msgid ""
 "If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>"
 "$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> "
 "environment variables are copied if they were set."
 msgstr ""
 
-#: su.1.xml:268(para)
+#: su.1.xml:278(para)
 msgid ""
 "If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</"
 "envar>, and <envar>$MAIL</envar> environment variables are set according to "
@@ -2492,23 +2581,23 @@
 "option> (see below)."
 msgstr ""
 
-#: su.1.xml:281(para)
+#: su.1.xml:291(para)
 msgid ""
 "If <option>--login</option> is used, other environment variables might be "
 "set by the <option>ENVIRON_FILE</option> file (see below)."
 msgstr ""
 
-#: su.1.xml:289(para)
+#: su.1.xml:299(para)
 msgid "Other environments might be set by PAM modules."
 msgstr ""
 
-#: su.1.xml:237(para)
+#: su.1.xml:247(para)
 msgid ""
 "Note that the default behavior for the environment is the following: "
 "<placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:303(para)
+#: su.1.xml:313(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -2555,7 +2644,7 @@
 #: 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."
+"is no."
 msgstr ""
 
 #: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
@@ -2659,7 +2748,7 @@
 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."
+"will not be translated."
 msgstr ""
 
 #: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
@@ -2690,7 +2779,9 @@
 msgstr "GID_MAX (numer)"
 
 #: 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."
+msgid ""
+"Enable setting of resource limits from <filename>/etc/limits</filename> and "
+"ulimit, umask, and niceness from the user's passwd gecos field."
 msgstr ""
 
 #: su.1.xml:32(term) login.defs.5.xml:32(term)
@@ -2740,59 +2831,59 @@
 "sulog file logging."
 msgstr ""
 
-#: su.1.xml:363(para)
+#: su.1.xml:373(para)
 msgid ""
 "On success, <command>su</command> returns the exit value of the command it "
 "executed."
 msgstr ""
 
-#: su.1.xml:367(para)
+#: su.1.xml:377(para)
 msgid ""
 "If this command was terminated by a signal, <command>su</command> returns "
 "the number of this signal plus 128."
 msgstr ""
 
-#: su.1.xml:371(para)
+#: su.1.xml:381(para)
 msgid ""
 "If su has to kill the command (because it was asked to terminate, and the "
 "command did not terminate in time), <command>su</command> returns 255."
 msgstr ""
 
-#: su.1.xml:383(para)
+#: su.1.xml:393(para)
 msgid "success (<option>--help</option> only)"
 msgstr ""
 
-#: su.1.xml:389(para)
+#: su.1.xml:399(para)
 msgid "System or authentication failure"
 msgstr ""
 
-#: su.1.xml:393(replaceable)
+#: su.1.xml:403(replaceable)
 #, fuzzy
 #| msgid "12"
 msgid "126"
 msgstr "12"
 
-#: su.1.xml:395(para)
+#: su.1.xml:405(para)
 msgid "The requested command was not found"
 msgstr ""
 
-#: su.1.xml:399(replaceable)
+#: su.1.xml:409(replaceable)
 #, fuzzy
 #| msgid "12"
 msgid "127"
 msgstr "12"
 
-#: su.1.xml:401(para)
+#: su.1.xml:411(para)
 msgid "The requested command could not be executed"
 msgstr ""
 
-#: su.1.xml:376(para)
+#: su.1.xml:386(para)
 msgid ""
 "Some exit values from <command>su</command> are independent from the "
 "executed command: <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:410(para)
+#: su.1.xml:420(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
@@ -2816,27 +2907,27 @@
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>"
 
-#: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command)
+#: sg.1.xml:39(refentrytitle) sg.1.xml:46(refname) sg.1.xml:52(command)
 msgid "sg"
 msgstr "sg"
 
-#: sg.1.xml:44(refpurpose)
+#: sg.1.xml:47(refpurpose)
 msgid "execute command as different group ID"
 msgstr ""
 
-#: sg.1.xml:50(arg) newgrp.1.xml:49(arg)
+#: sg.1.xml:53(arg) newgrp.1.xml:52(arg)
 msgid "-"
 msgstr "-"
 
-#: sg.1.xml:52(arg) expiry.1.xml:53(arg)
+#: sg.1.xml:55(arg)
 msgid "-c"
 msgstr "-c"
 
-#: sg.1.xml:51(arg)
+#: sg.1.xml:54(arg)
 msgid "group <placeholder-1/> command"
 msgstr ""
 
-#: sg.1.xml:60(para)
+#: sg.1.xml:63(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/"
@@ -2858,7 +2949,7 @@
 msgid "Enable \"syslog\" logging of <command>sg</command> activity."
 msgstr ""
 
-#: sg.1.xml:119(para)
+#: sg.1.xml:122(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -2896,56 +2987,55 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
-#: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
-#: pwck.8.xml:63(replaceable) pwck.8.xml:78(replaceable)
-#: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
+#: shadow.5.xml:38(refentrytitle) shadow.5.xml:45(refname)
+#: shadow.3.xml:38(refentrytitle) shadow.3.xml:45(refname)
+#: pwck.8.xml:65(replaceable) grpck.8.xml:57(replaceable)
 msgid "shadow"
 msgstr ""
 
-#: shadow.5.xml:40(refpurpose)
+#: shadow.5.xml:46(refpurpose)
 #, fuzzy
 #| msgid "can't update password file"
 msgid "shadowed password file"
 msgstr "nie można zaktualizować pliku z hasłami"
 
-#: shadow.5.xml:45(para)
+#: shadow.5.xml:51(para)
 msgid ""
 "<filename>shadow</filename> is a file which contains the password "
 "information for the system's accounts and optional aging information."
 msgstr ""
 
-#: shadow.5.xml:51(para) gshadow.5.xml:49(para)
+#: shadow.5.xml:57(para) gshadow.5.xml:55(para)
 msgid ""
 "This file must not be readable by regular users if password security is to "
 "be maintained."
 msgstr ""
 
-#: shadow.5.xml:56(para)
+#: shadow.5.xml:62(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)
+#: shadow.5.xml:69(emphasis) passwd.5.xml:59(para)
 msgid "login name"
 msgstr ""
 
-#: shadow.5.xml:65(para)
+#: shadow.5.xml:71(para)
 msgid "It must be a valid account name, which exist on the system."
 msgstr ""
 
-#: shadow.5.xml:71(emphasis) gshadow.5.xml:68(emphasis)
+#: shadow.5.xml:77(emphasis) gshadow.5.xml:74(emphasis)
 msgid "encrypted password"
 msgstr ""
 
-#: shadow.5.xml:73(para) gshadow.5.xml:70(para)
+#: shadow.5.xml:79(para) gshadow.5.xml:76(para)
 msgid ""
 "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry> for details on how this string is interpreted."
 msgstr ""
 
-#: shadow.5.xml:78(para)
+#: shadow.5.xml:84(para)
 #, fuzzy
 msgid ""
 "If the password field contains some string that is not a valid result of "
@@ -2957,7 +3047,7 @@
 "jest zmieniana przy pomocy polecenia <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: shadow.5.xml:85(para)
+#: shadow.5.xml:91(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 "
@@ -2965,167 +3055,167 @@
 "access at all if the password field is empty."
 msgstr ""
 
-#: shadow.5.xml:92(para) gshadow.5.xml:92(para)
+#: shadow.5.xml:98(para) gshadow.5.xml:98(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)
+#: shadow.5.xml:108(emphasis)
 msgid "date of last password change"
 msgstr ""
 
-#: shadow.5.xml:105(para)
+#: shadow.5.xml:111(para)
 msgid ""
 "The date of the last password change, expressed as the number of days since "
 "Jan 1, 1970."
 msgstr ""
 
-#: shadow.5.xml:109(para)
+#: shadow.5.xml:115(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:114(para)
+#: shadow.5.xml:120(para)
 msgid "An empty field means that password aging features are disabled."
 msgstr ""
 
-#: shadow.5.xml:121(emphasis)
+#: shadow.5.xml:127(emphasis)
 msgid "minimum password age"
 msgstr ""
 
-#: shadow.5.xml:123(para)
+#: shadow.5.xml:129(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)
+#: shadow.5.xml:134(para)
 msgid "An empty field and value 0 mean that there are no minimum password age."
 msgstr ""
 
-#: shadow.5.xml:135(emphasis)
+#: shadow.5.xml:141(emphasis)
 msgid "maximum password age"
 msgstr ""
 
-#: shadow.5.xml:137(para)
+#: shadow.5.xml:143(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)
+#: shadow.5.xml:147(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)
+#: shadow.5.xml:152(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)
+#: shadow.5.xml:157(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)
+#: shadow.5.xml:165(emphasis)
 msgid "password warning period"
 msgstr ""
 
-#: shadow.5.xml:162(para)
+#: shadow.5.xml:168(para)
 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 ""
 
-#: shadow.5.xml:167(para)
+#: shadow.5.xml:173(para)
 msgid ""
 "An empty field and value 0 mean that there are no password warning period."
 msgstr ""
 
-#: shadow.5.xml:175(emphasis)
+#: shadow.5.xml:181(emphasis)
 msgid "password inactivity period"
 msgstr ""
 
-#: shadow.5.xml:178(para)
+#: shadow.5.xml:184(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)
+#: shadow.5.xml:190(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)
+#: shadow.5.xml:195(para)
 msgid ""
 "An empty field means that there are no enforcement of an inactivity period."
 msgstr ""
 
-#: shadow.5.xml:197(emphasis)
+#: shadow.5.xml:203(emphasis)
 #, fuzzy
 #| msgid "User account information."
 msgid "account expiration date"
 msgstr "Informacja o kontach użytkowników."
 
-#: shadow.5.xml:200(para)
+#: shadow.5.xml:206(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)
+#: shadow.5.xml:210(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)
+#: shadow.5.xml:216(para)
 msgid "An empty field means that the account will never expire."
 msgstr ""
 
-#: shadow.5.xml:213(para)
+#: shadow.5.xml:219(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)
+#: shadow.5.xml:227(emphasis)
 msgid "reserved field"
 msgstr ""
 
-#: shadow.5.xml:223(para)
+#: shadow.5.xml:229(para)
 msgid "This field is reserved for future use."
 msgstr ""
 
-#: shadow.5.xml:245(filename)
+#: shadow.5.xml:251(filename)
 #, fuzzy
 #| msgid "/etc/shadow"
 msgid "/etc/shadow-"
 msgstr "/etc/shadow"
 
-#: shadow.5.xml:247(para)
+#: shadow.5.xml:253(para)
 msgid "Backup file for /etc/shadow."
 msgstr ""
 
-#: shadow.5.xml:248(para) passwd.5.xml:134(para)
+#: shadow.5.xml:254(para) passwd.5.xml:140(para)
 msgid ""
 "Note that this file is used by the tools of the shadow toolsuite, but not by "
 "all user and password management tools."
 msgstr ""
 
-#: shadow.5.xml:259(para)
+#: shadow.5.xml:265(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
@@ -3173,95 +3263,95 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>"
 
-#: shadow.3.xml:36(refmiscinfo)
+#: shadow.3.xml:40(refmiscinfo)
 msgid "Library Calls"
 msgstr ""
 
-#: shadow.3.xml:40(refname)
+#: shadow.3.xml:46(refname)
 msgid "getspnam"
 msgstr "getspnam"
 
-#: shadow.3.xml:41(refpurpose)
+#: shadow.3.xml:47(refpurpose)
 msgid "encrypted password file routines"
 msgstr ""
 
-#: shadow.3.xml:45(title)
+#: shadow.3.xml:51(title)
 msgid "SYNTAX"
 msgstr "SKŁADNIA"
 
-#: shadow.3.xml:47(emphasis)
+#: shadow.3.xml:53(emphasis)
 msgid "#include <shadow.h>"
 msgstr "#include <shadow.h>"
 
-#: shadow.3.xml:51(emphasis)
+#: shadow.3.xml:57(emphasis)
 msgid "struct spwd *getspent();"
 msgstr "struct spwd *getspent();"
 
-#: shadow.3.xml:55(emphasis)
+#: shadow.3.xml:61(emphasis)
 msgid "struct spwd *getspnam(char"
 msgstr "struct spwd *getspnam(char"
 
-#: shadow.3.xml:56(emphasis)
+#: shadow.3.xml:62(emphasis)
 msgid "*name"
 msgstr "*name"
 
-#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis)
-#: shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:62(emphasis) shadow.3.xml:75(emphasis)
+#: shadow.3.xml:80(emphasis) shadow.3.xml:86(emphasis)
 msgid ");"
 msgstr ");"
 
-#: shadow.3.xml:60(emphasis)
+#: shadow.3.xml:66(emphasis)
 msgid "void setspent();"
 msgstr "void setspent()"
 
-#: shadow.3.xml:64(emphasis)
+#: shadow.3.xml:70(emphasis)
 msgid "void endspent();"
 msgstr "void endspent();"
 
-#: shadow.3.xml:68(emphasis)
+#: shadow.3.xml:74(emphasis)
 msgid "struct spwd *fgetspent(FILE"
 msgstr "struct spwd *fgetspent(FILE"
 
-#: shadow.3.xml:69(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:75(emphasis) shadow.3.xml:86(emphasis)
 msgid "*fp"
 msgstr "*fp"
 
-#: shadow.3.xml:73(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "struct spwd *sgetspent(char"
 msgstr "struct spwd *sgetspent(char"
 
-#: shadow.3.xml:74(emphasis)
+#: shadow.3.xml:80(emphasis)
 msgid "*cp"
 msgstr "*cp"
 
-#: shadow.3.xml:78(emphasis)
+#: shadow.3.xml:84(emphasis)
 msgid "int putspent(struct spwd"
 msgstr "int putspent(struct spwd"
 
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "*p,"
 msgstr "*p,"
 
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "FILE"
 msgstr "FILE"
 
-#: shadow.3.xml:84(emphasis)
+#: shadow.3.xml:90(emphasis)
 msgid "int lckpwdf();"
 msgstr "int lckpwdf();"
 
-#: shadow.3.xml:88(emphasis)
+#: shadow.3.xml:94(emphasis)
 msgid "int ulckpwdf();"
 msgstr "int ulckpwdf();"
 
-#: shadow.3.xml:94(para)
+#: shadow.3.xml:100(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:99(programlisting)
+#: shadow.3.xml:105(programlisting)
 #, no-wrap
 msgid ""
 "struct spwd {\n"
@@ -3278,51 +3368,51 @@
 "    "
 msgstr ""
 
-#: shadow.3.xml:111(para)
+#: shadow.3.xml:117(para)
 msgid "The meanings of each field are:"
 msgstr ""
 
-#: shadow.3.xml:114(para)
+#: shadow.3.xml:120(para)
 msgid "sp_namp - pointer to null-terminated user name"
 msgstr ""
 
-#: shadow.3.xml:117(para)
+#: shadow.3.xml:123(para)
 msgid "sp_pwdp - pointer to null-terminated password"
 msgstr ""
 
-#: shadow.3.xml:120(para)
+#: shadow.3.xml:126(para)
 msgid "sp_lstchg - days since Jan 1, 1970 password was last changed"
 msgstr ""
 
-#: shadow.3.xml:123(para)
+#: shadow.3.xml:129(para)
 msgid "sp_min - days before which password may not be changed"
 msgstr ""
 
-#: shadow.3.xml:126(para)
+#: shadow.3.xml:132(para)
 msgid "sp_max - days after which password must be changed"
 msgstr ""
 
-#: shadow.3.xml:129(para)
+#: shadow.3.xml:135(para)
 msgid ""
 "sp_warn - days before password is to expire that user is warned of pending "
 "password expiration"
 msgstr ""
 
-#: shadow.3.xml:134(para)
+#: shadow.3.xml:140(para)
 msgid ""
 "sp_inact - days after password expires that account is considered inactive "
 "and disabled"
 msgstr ""
 
-#: shadow.3.xml:139(para)
+#: shadow.3.xml:145(para)
 msgid "sp_expire - days since Jan 1, 1970 when account will be disabled"
 msgstr ""
 
-#: shadow.3.xml:142(para)
+#: shadow.3.xml:148(para)
 msgid "sp_flag - reserved for future use"
 msgstr ""
 
-#: shadow.3.xml:150(para)
+#: shadow.3.xml:156(para)
 msgid ""
 "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, "
 "<emphasis>fgetspent</emphasis>, and <emphasis>sgetspent</emphasis> each "
@@ -3335,13 +3425,13 @@
 "the file for an entry matching <emphasis>name</emphasis>."
 msgstr ""
 
-#: shadow.3.xml:163(para)
+#: shadow.3.xml:169(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:169(para)
+#: shadow.3.xml:175(para)
 msgid ""
 "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines "
 "should be used to insure exclusive access to the <filename>/etc/shadow</"
@@ -3353,20 +3443,20 @@
 "locks are acquired 0 is returned."
 msgstr ""
 
-#: shadow.3.xml:184(para)
+#: shadow.3.xml:190(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:194(para)
+#: shadow.3.xml:200(para)
 msgid ""
 "These routines may only be used by the superuser as access to the shadow "
 "password file is restricted."
 msgstr ""
 
-#: shadow.3.xml:214(para)
+#: shadow.3.xml:220(para)
 msgid ""
 "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -3376,38 +3466,38 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: pwconv.8.xml:43(refentrytitle) pwconv.8.xml:48(refname)
-#: pwconv.8.xml:57(command) login.defs.5.xml:401(term)
+#: pwconv.8.xml:44(refentrytitle) pwconv.8.xml:51(refname)
+#: pwconv.8.xml:60(command) login.defs.5.xml:404(term)
 msgid "pwconv"
 msgstr "pwconv"
 
-#: pwconv.8.xml:49(refname) pwconv.8.xml:60(command)
-#: login.defs.5.xml:410(term)
+#: pwconv.8.xml:52(refname) pwconv.8.xml:66(command)
+#: login.defs.5.xml:413(term)
 msgid "pwunconv"
 msgstr "pwunconv"
 
-#: pwconv.8.xml:50(refname) pwconv.8.xml:63(command)
-#: login.defs.5.xml:314(term)
+#: pwconv.8.xml:53(refname) pwconv.8.xml:72(command)
+#: login.defs.5.xml:317(term)
 msgid "grpconv"
 msgstr "grpconv"
 
-#: pwconv.8.xml:51(refname) pwconv.8.xml:66(command)
-#: login.defs.5.xml:320(term)
+#: pwconv.8.xml:54(refname) pwconv.8.xml:78(command)
+#: login.defs.5.xml:323(term)
 msgid "grpunconv"
 msgstr "grpunconv"
 
-#: pwconv.8.xml:52(refpurpose)
+#: pwconv.8.xml:55(refpurpose)
 msgid "convert to and from shadow passwords and groups"
 msgstr ""
 
-#: pwconv.8.xml:72(para)
+#: pwconv.8.xml:87(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:77(para)
+#: pwconv.8.xml:92(para)
 msgid ""
 "<command>pwconv</command> does not work with <option>USE_TCB</option> "
 "enabled. To convert to tcb passwords, you should first use <command>pwconv</"
@@ -3417,7 +3507,7 @@
 "in <filename>login.defs</filename>.)"
 msgstr ""
 
-#: pwconv.8.xml:87(para)
+#: pwconv.8.xml:102(para)
 msgid ""
 "The <command>pwunconv</command> command creates <emphasis remap=\"I"
 "\">passwd</emphasis> from <emphasis remap=\"I\">passwd</emphasis> and "
@@ -3425,7 +3515,7 @@
 "\">shadow</emphasis>."
 msgstr ""
 
-#: pwconv.8.xml:93(para)
+#: pwconv.8.xml:108(para)
 msgid ""
 "<command>pwunconv</command> does not work with <option>USE_TCB</option> "
 "enabled. You should first switch back from tcb to shadowed passwords using "
@@ -3433,14 +3523,14 @@
 "in <filename>login.defs</filename> before using <command>pwunconv</command>."
 msgstr ""
 
-#: pwconv.8.xml:102(para)
+#: pwconv.8.xml:117(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:108(para)
+#: pwconv.8.xml:123(para)
 msgid ""
 "The <command>grpunconv</command> command creates <emphasis remap=\"I"
 "\">group</emphasis> from <emphasis remap=\"I\">group</emphasis> and "
@@ -3448,14 +3538,14 @@
 "\">gshadow</emphasis>."
 msgstr ""
 
-#: pwconv.8.xml:115(para)
+#: pwconv.8.xml:130(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:122(para)
+#: pwconv.8.xml:137(para)
 msgid ""
 "Each program acquires the necessary locks before conversion. "
 "<command>pwconv</command> and <command>grpconv</command> are similar. First, "
@@ -3467,7 +3557,7 @@
 "hand."
 msgstr ""
 
-#: pwconv.8.xml:133(para)
+#: pwconv.8.xml:148(para)
 msgid ""
 "<command>pwconv</command> will use the values of <emphasis remap=\"I"
 "\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis>, "
@@ -3475,7 +3565,7 @@
 "defs</filename> when adding new entries to <filename>/etc/shadow</filename>."
 msgstr ""
 
-#: pwconv.8.xml:142(para)
+#: pwconv.8.xml:157(para)
 msgid ""
 "Likewise <command>pwunconv</command> and <command>grpunconv</command> are "
 "similar. Passwords in the main file are updated from the shadowed file. "
@@ -3485,28 +3575,42 @@
 "can."
 msgstr ""
 
-#: pwconv.8.xml:154(para)
+#: pwconv.8.xml:169(para)
+#, fuzzy
+#| msgid ""
+#| "The options which apply to the <command>vipw</command> and <command>vigr</"
+#| "command> commands are:"
 msgid ""
+"The options which apply to the <command>pwconv</command>, <command>pwunconv</"
+"command>, <command>grpconv</command>, and <command>grpunconv</command> "
+"commands are:"
+msgstr ""
+"Polecenia <command>vipw</command> i <command>vigr</command> posiadają "
+"następujące opcje:Polecenia <command>vipw</command> i <command>vigr</"
+"command> posiadają następujące opcje:"
+
+#: pwconv.8.xml:199(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. "
 "Please run <command>pwck</command> and <command>grpck</command> to correct "
 "any such errors before converting to or from shadow passwords or groups."
 msgstr ""
 
-#: pwconv.8.xml:165(para)
+#: pwconv.8.xml:210(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:173(para)
+#: pwconv.8.xml:218(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of <command>pwconv</command>:"
 msgstr ""
 
-#: pwconv.8.xml:200(para)
+#: pwconv.8.xml:245(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
@@ -3536,37 +3640,23 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: pwck.8.xml:43(refentrytitle) pwck.8.xml:48(refname) pwck.8.xml:54(command)
-#: pwck.8.xml:69(command) login.defs.5.xml:392(term)
+#: pwck.8.xml:44(refentrytitle) pwck.8.xml:51(refname) pwck.8.xml:57(command)
+#: login.defs.5.xml:395(term)
 msgid "pwck"
 msgstr "pwck"
 
-#: pwck.8.xml:49(refpurpose)
+#: pwck.8.xml:52(refpurpose)
 msgid "verify integrity of password files"
 msgstr ""
 
-#: pwck.8.xml:55(arg) pwck.8.xml:70(arg) pwck.8.xml:177(option)
-msgid "-q"
-msgstr "-q"
-
-#: pwck.8.xml:56(arg) pwck.8.xml:198(option) grpck.8.xml:58(arg)
-#: grpck.8.xml:149(option)
-msgid "-s"
-msgstr "-s"
-
-#: pwck.8.xml:59(replaceable) pwck.8.xml:74(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:381(term)
+#: pwck.8.xml:61(replaceable) passwd.5.xml:38(refentrytitle)
+#: passwd.5.xml:45(refname) passwd.1.xml:45(refentrytitle)
+#: passwd.1.xml:52(refname) passwd.1.xml:58(command)
+#: login.defs.5.xml:384(term)
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:71(arg) pwck.8.xml:188(option) login.1.xml:222(option)
-#: grpck.8.xml:49(arg) grpck.8.xml:139(option)
-msgid "-r"
-msgstr "-r"
-
-#: pwck.8.xml:87(para)
+#: pwck.8.xml:74(para)
 msgid ""
 "The <command>pwck</command> command verifies the integrity of the users and "
 "authentication information. It checks that all entries in <filename>/etc/"
@@ -3577,67 +3667,67 @@
 "which have other uncorrectable errors."
 msgstr ""
 
-#: pwck.8.xml:99(para) grpck.8.xml:80(para)
+#: pwck.8.xml:86(para) grpck.8.xml:75(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr ""
 
-#: pwck.8.xml:102(para) grpck.8.xml:84(para)
+#: pwck.8.xml:89(para) grpck.8.xml:79(para)
 msgid "the correct number of fields"
 msgstr ""
 
-#: pwck.8.xml:105(para)
+#: pwck.8.xml:92(para)
 msgid "a unique and valid user name"
 msgstr ""
 
-#: pwck.8.xml:108(para)
+#: pwck.8.xml:95(para)
 msgid "a valid user and group identifier"
 msgstr ""
 
-#: pwck.8.xml:111(para)
+#: pwck.8.xml:98(para)
 msgid "a valid primary group"
 msgstr ""
 
-#: pwck.8.xml:114(para)
+#: pwck.8.xml:101(para)
 msgid "a valid home directory"
 msgstr ""
 
-#: pwck.8.xml:117(para)
+#: pwck.8.xml:104(para)
 msgid "a valid login shell"
 msgstr ""
 
-#: pwck.8.xml:121(para)
+#: pwck.8.xml:108(para)
 msgid ""
 "<filename>shadow</filename> checks are enabled when a second file parameter "
 "is specified or when <filename>/etc/shadow</filename> exists on the system."
 msgstr ""
 
-#: pwck.8.xml:126(para)
+#: pwck.8.xml:113(para)
 msgid "These checks are the following:"
 msgstr ""
 
-#: pwck.8.xml:131(para)
+#: pwck.8.xml:118(para)
 msgid ""
 "every passwd entry has a matching shadow entry, and every shadow entry has a "
 "matching passwd entry"
 msgstr ""
 
-#: pwck.8.xml:137(para)
+#: pwck.8.xml:124(para)
 msgid "passwords are specified in the shadowed file"
 msgstr ""
 
-#: pwck.8.xml:140(para)
+#: pwck.8.xml:127(para)
 msgid "shadow entries have the correct number of fields"
 msgstr ""
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:130(para)
 msgid "shadow entries are unique in shadow"
 msgstr ""
 
-#: pwck.8.xml:146(para)
+#: pwck.8.xml:133(para)
 msgid "the last password changes are not in the future"
 msgstr ""
 
-#: pwck.8.xml:150(para)
+#: pwck.8.xml:137(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 "
@@ -3648,40 +3738,58 @@
 "<command>usermod</command> command to correct the error."
 msgstr ""
 
-#: pwck.8.xml:161(para)
+#: pwck.8.xml:148(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:171(para)
+#: pwck.8.xml:158(para) grpck.8.xml:129(para)
+#, fuzzy
+msgid ""
+"The <option>-r</option> and <option>-s</option> options cannot be combined."
+msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
+
+#: pwck.8.xml:162(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:180(para)
+#: pwck.8.xml:175(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
 msgstr ""
 
-#: pwck.8.xml:191(para)
+#: pwck.8.xml:182(term) grpck.8.xml:144(term)
+#, fuzzy
+#| msgid "<option>-r</option>, <option>--remove</option>"
+msgid "<option>-r</option>, <option>--read-only</option>"
+msgstr "<option>-r</option>, <option>--remove</option>"
+
+#: pwck.8.xml:184(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr ""
 
-#: pwck.8.xml:201(para)
+#: pwck.8.xml:203(term) grpck.8.xml:167(term)
+#, fuzzy
+#| msgid "<option>-s</option>, <option>--shadow</option>"
+msgid "<option>-s</option>, <option>--sort</option>"
+msgstr "<option>-s</option>, <option>--shadow</option>"
+
+#: pwck.8.xml:205(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
 msgstr ""
 
-#: pwck.8.xml:205(para)
+#: pwck.8.xml:209(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "This option has no effect when <option>USE_TCB</option> is enabled."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: pwck.8.xml:212(para)
+#: pwck.8.xml:216(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename><phrase condition=\"tcb"
@@ -3690,36 +3798,36 @@
 "<replaceable>shadow</replaceable> parameters."
 msgstr ""
 
-#: pwck.8.xml:221(para)
+#: pwck.8.xml:225(para)
 msgid ""
 "Note that when <option>USE_TCB</option> is enabled, you cannot specify an "
 "alternative <replaceable>shadow</replaceable> file. In future releases, this "
 "paramater could be replaced by an alternate TCB directory."
 msgstr ""
 
-#: pwck.8.xml:290(para)
+#: pwck.8.xml:294(para)
 msgid "one or more bad password entries"
 msgstr ""
 
-#: pwck.8.xml:296(para)
+#: pwck.8.xml:300(para)
 msgid "can't open password files"
 msgstr ""
 
-#: pwck.8.xml:302(para)
+#: pwck.8.xml:306(para)
 msgid "can't lock password files"
 msgstr ""
 
-#: pwck.8.xml:308(para)
+#: pwck.8.xml:312(para)
 msgid "can't update password files"
 msgstr ""
 
-#: pwck.8.xml:314(para)
+#: pwck.8.xml:318(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:272(para)
+#: pwck.8.xml:276(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -3727,7 +3835,7 @@
 "Polecenie <command>pwck</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: pwck.8.xml:323(para)
+#: pwck.8.xml:327(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
@@ -3757,21 +3865,21 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
+#: porttime.5.xml:38(refentrytitle) porttime.5.xml:45(refname)
 msgid "porttime"
 msgstr ""
 
-#: porttime.5.xml:40(refpurpose)
+#: porttime.5.xml:46(refpurpose)
 msgid "port access time file"
 msgstr ""
 
-#: porttime.5.xml:45(para)
+#: porttime.5.xml:51(para)
 msgid ""
 "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, "
 "user names, and permitted login times."
 msgstr ""
 
-#: porttime.5.xml:50(para)
+#: porttime.5.xml:56(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 "
@@ -3781,7 +3889,7 @@
 "permitted access times."
 msgstr ""
 
-#: porttime.5.xml:59(para)
+#: porttime.5.xml:65(para)
 msgid ""
 "Each access time entry consists of zero or more days of the week, "
 "abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</"
@@ -3792,21 +3900,21 @@
 "indicate every day. If no days are given, <emphasis>Al</emphasis> is assumed."
 msgstr ""
 
-#: porttime.5.xml:73(title)
+#: porttime.5.xml:79(title)
 msgid "EXAMPLES"
 msgstr "PRZYKŁADY"
 
-#: porttime.5.xml:74(para)
+#: porttime.5.xml:80(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:80(para)
+#: porttime.5.xml:86(para)
 msgid "*:jfh:Wk0900-1700"
 msgstr "*:jfh:Wk0900-1700"
 
-#: porttime.5.xml:82(para)
+#: porttime.5.xml:88(para)
 msgid ""
 "The following entries allow access only to the users <emphasis>root</"
 "emphasis> and <emphasis>oper</emphasis> on <filename>/dev/console</filename> "
@@ -3815,7 +3923,7 @@
 "second entry which does not permit access at any time."
 msgstr ""
 
-#: porttime.5.xml:91(programlisting)
+#: porttime.5.xml:97(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3828,25 +3936,25 @@
 "      console:*:\n"
 "    "
 
-#: porttime.5.xml:96(para)
+#: porttime.5.xml:102(para)
 msgid ""
 "The following entry allows access for the user <emphasis>games</emphasis> on "
 "any port during non-working hours."
 msgstr ""
 
-#: porttime.5.xml:101(para)
+#: porttime.5.xml:107(para)
 msgid "*:games:Wk1700-0900,SaSu0000-2400"
 msgstr "*:games:Wk1700-0900,SaSu0000-2400"
 
-#: porttime.5.xml:108(filename) logoutd.8.xml:67(filename)
+#: porttime.5.xml:114(filename) logoutd.8.xml:73(filename)
 msgid "/etc/porttime"
 msgstr "/etc/porttime"
 
-#: porttime.5.xml:110(para) logoutd.8.xml:69(para)
+#: porttime.5.xml:116(para) logoutd.8.xml:75(para)
 msgid "File containing port access."
 msgstr ""
 
-#: porttime.5.xml:118(para) login.access.5.xml:109(para)
+#: porttime.5.xml:124(para) login.access.5.xml:115(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -3854,41 +3962,41 @@
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: passwd.5.xml:40(refpurpose)
+#: passwd.5.xml:46(refpurpose)
 msgid "the password file"
 msgstr ""
 
-#: passwd.5.xml:45(para)
+#: passwd.5.xml:51(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:56(para)
+#: passwd.5.xml:62(para)
 msgid "optional encrypted password"
 msgstr ""
 
-#: passwd.5.xml:59(para)
+#: passwd.5.xml:65(para)
 msgid "numerical user ID"
 msgstr ""
 
-#: passwd.5.xml:62(para)
+#: passwd.5.xml:68(para)
 msgid "numerical group ID"
 msgstr ""
 
-#: passwd.5.xml:65(para)
+#: passwd.5.xml:71(para)
 msgid "user name or comment field"
 msgstr ""
 
-#: passwd.5.xml:68(para)
+#: passwd.5.xml:74(para)
 msgid "user home directory"
 msgstr ""
 
-#: passwd.5.xml:71(para)
+#: passwd.5.xml:77(para)
 msgid "optional user command interpreter"
 msgstr ""
 
-#: passwd.5.xml:75(para)
+#: passwd.5.xml:81(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 "
@@ -3906,21 +4014,21 @@
 "citerefentry>."
 msgstr ""
 
-#: passwd.5.xml:94(para)
+#: passwd.5.xml:100(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:100(para)
+#: passwd.5.xml:106(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:106(para)
+#: passwd.5.xml:112(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 "
@@ -3929,21 +4037,21 @@
 "defaults to the value <filename>/bin/sh</filename>."
 msgstr ""
 
-#: passwd.5.xml:127(para)
+#: passwd.5.xml:133(para)
 msgid "optional encrypted password file"
 msgstr ""
 
-#: passwd.5.xml:131(filename)
+#: passwd.5.xml:137(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/passwd-"
 msgstr "/etc/passwd"
 
-#: passwd.5.xml:133(para)
+#: passwd.5.xml:139(para)
 msgid "Backup file for /etc/passwd."
 msgstr ""
 
-#: passwd.5.xml:145(para)
+#: passwd.5.xml:151(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
@@ -3999,11 +4107,11 @@
 "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: passwd.1.xml:50(refpurpose)
+#: passwd.1.xml:53(refpurpose)
 msgid "change user password"
 msgstr "zmiana hasła użytkownika"
 
-#: passwd.1.xml:67(para)
+#: passwd.1.xml:70(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 "
@@ -4011,11 +4119,11 @@
 "also changes the account or associated password validity period."
 msgstr ""
 
-#: passwd.1.xml:76(title)
+#: passwd.1.xml:79(title)
 msgid "Password Changes"
 msgstr ""
 
-#: passwd.1.xml:77(para)
+#: passwd.1.xml:80(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 "
@@ -4023,51 +4131,51 @@
 "permitted to bypass this step so that forgotten passwords may be changed."
 msgstr ""
 
-#: passwd.1.xml:85(para)
+#: passwd.1.xml:88(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:92(para)
+#: passwd.1.xml:95(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:98(para)
+#: passwd.1.xml:101(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:106(para)
+#: passwd.1.xml:109(para)
 msgid "lower case alphabetics"
 msgstr ""
 
-#: passwd.1.xml:109(para)
+#: passwd.1.xml:112(para)
 msgid "digits 0 thru 9"
 msgstr ""
 
-#: passwd.1.xml:112(para)
+#: passwd.1.xml:115(para)
 msgid "punctuation marks"
 msgstr ""
 
-#: passwd.1.xml:116(para)
+#: passwd.1.xml:119(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:125(title)
+#: passwd.1.xml:128(title)
 msgid "Hints for user passwords"
 msgstr ""
 
-#: passwd.1.xml:126(para)
+#: passwd.1.xml:129(para)
 msgid ""
 "The security of a password depends upon the strength of the encryption "
 "algorithm and the size of the key space. The legacy <emphasis>UNIX</"
@@ -4077,7 +4185,7 @@
 "is selected."
 msgstr ""
 
-#: passwd.1.xml:135(para)
+#: passwd.1.xml:138(para)
 msgid ""
 "Compromises in password security normally result from careless password "
 "selection or handling. For this reason, you should not select a password "
@@ -4086,47 +4194,47 @@
 "address. Any of these may be used as guesses to violate system security."
 msgstr ""
 
-#: passwd.1.xml:144(para)
+#: passwd.1.xml:147(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:153(para)
+#: passwd.1.xml:156(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:158(term) faillog.8.xml:71(term)
+#: passwd.1.xml:161(term) faillog.8.xml:77(term)
 msgid "<option>-a</option>, <option>--all</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
-#: passwd.1.xml:162(para)
+#: passwd.1.xml:165(para)
 msgid ""
 "This option can be used only with <option>-S</option> and causes show status "
 "for all users."
 msgstr ""
 
-#: passwd.1.xml:169(term)
+#: passwd.1.xml:172(term)
 msgid "<option>-d</option>, <option>--delete</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: passwd.1.xml:173(para)
+#: passwd.1.xml:176(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:181(term)
+#: passwd.1.xml:184(term)
 msgid "<option>-e</option>, <option>--expire</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
-#: passwd.1.xml:185(para)
+#: passwd.1.xml:188(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:198(term)
+#: passwd.1.xml:201(term)
 msgid ""
 "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -4134,7 +4242,7 @@
 "<option>-i</option>, <option>--inactive</option><replaceable>NIEAKTYWNE</"
 "replaceable>"
 
-#: passwd.1.xml:202(para)
+#: passwd.1.xml:205(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 "
@@ -4142,29 +4250,29 @@
 "longer sign on to the account."
 msgstr ""
 
-#: passwd.1.xml:211(term)
+#: passwd.1.xml:214(term)
 msgid "<option>-k</option>, <option>--keep-tokens</option>"
 msgstr "<option>-k</option>, <option>--keep-tokens</option>"
 
-#: passwd.1.xml:215(para)
+#: passwd.1.xml:218(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:223(term)
+#: passwd.1.xml:226(term)
 msgid "<option>-l</option>, <option>--lock</option>"
 msgstr "<option>-l</option>, <option>--lock</option>"
 
-#: passwd.1.xml:227(para)
+#: passwd.1.xml:230(para)
 msgid ""
 "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:233(para)
+#: passwd.1.xml:236(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 "
@@ -4172,11 +4280,11 @@
 "(this set the account's expire date to Jan 2, 1970)."
 msgstr ""
 
-#: passwd.1.xml:240(para)
+#: passwd.1.xml:243(para)
 msgid "Users with a locked password are not allowed to change their password."
 msgstr ""
 
-#: passwd.1.xml:247(term)
+#: passwd.1.xml:250(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
@@ -4188,7 +4296,7 @@
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DNI</"
 "replaceable>"
 
-#: passwd.1.xml:251(para) chage.1.xml:146(para)
+#: passwd.1.xml:254(para) chage.1.xml:149(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -4198,7 +4306,7 @@
 "<replaceable>MIN_DAYS</replaceable>. Wartość zerowa oznacza, że użytkownik "
 "może je zmieniać w dowolnym czasie."
 
-#: passwd.1.xml:269(term)
+#: passwd.1.xml:272(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -4206,15 +4314,15 @@
 "<option>-r</option>, <option>--repository</option><replaceable>REPOZYTORIUM</"
 "replaceable>"
 
-#: passwd.1.xml:273(para)
+#: passwd.1.xml:276(para)
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr ""
 
-#: passwd.1.xml:279(term)
+#: passwd.1.xml:295(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
-#: passwd.1.xml:283(para)
+#: passwd.1.xml:299(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 "
@@ -4225,18 +4333,18 @@
 "days."
 msgstr ""
 
-#: passwd.1.xml:297(term)
+#: passwd.1.xml:313(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
-#: passwd.1.xml:301(para)
+#: passwd.1.xml:317(para)
 msgid ""
 "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)."
 msgstr ""
 
-#: passwd.1.xml:310(term)
+#: passwd.1.xml:326(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -4244,7 +4352,7 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>DNI_OSTRZ</"
 "replaceable>"
 
-#: passwd.1.xml:314(para)
+#: passwd.1.xml:330(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 "
@@ -4252,7 +4360,7 @@
 "about to expire."
 msgstr ""
 
-#: passwd.1.xml:323(term)
+#: passwd.1.xml:339(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -4260,25 +4368,25 @@
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DNI</"
 "replaceable>"
 
-#: passwd.1.xml:327(para)
+#: passwd.1.xml:343(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:339(para)
+#: passwd.1.xml:355(para)
 msgid ""
 "Password complexity checking may vary from site to site. The user is urged "
 "to select a password as complex as he or she feels comfortable with."
 msgstr ""
 
-#: passwd.1.xml:344(para)
+#: passwd.1.xml:360(para)
 msgid ""
 "Users may not be able to change their password on a system if NIS is enabled "
 "and they are not logged into the NIS server."
 msgstr ""
 
-#: passwd.1.xml:349(para)
+#: passwd.1.xml:365(para)
 msgid ""
 "<command>passwd</command> uses PAM to authenticate users and to change their "
 "passwords."
@@ -4350,7 +4458,7 @@
 #: 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 "
+"This variable is superseded by the <option>ENCRYPT_METHOD</option> variable "
 "or by any command line option used to configure the encryption algorithm."
 msgstr ""
 
@@ -4439,7 +4547,7 @@
 
 #: 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."
+msgid "The values must be inside the 1000-999,999,999 range."
 msgstr ""
 
 #: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para)
@@ -4457,37 +4565,37 @@
 "option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:395(filename)
+#: passwd.1.xml:411(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/passwd"
 
-#: passwd.1.xml:397(para)
+#: passwd.1.xml:413(para)
 msgid "PAM configuration for <command>passwd</command>."
 msgstr ""
 
-#: passwd.1.xml:417(para) chage.1.xml:257(para)
+#: passwd.1.xml:433(para) chage.1.xml:273(para)
 msgid "permission denied"
 msgstr "brak dostępu"
 
-#: passwd.1.xml:423(para)
+#: passwd.1.xml:439(para)
 msgid "invalid combination of options"
 msgstr "nieprawidłowa kombinacja opcji"
 
-#: passwd.1.xml:429(para)
+#: passwd.1.xml:445(para)
 msgid "unexpected failure, nothing done"
 msgstr ""
 
-#: passwd.1.xml:435(para)
+#: passwd.1.xml:451(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr ""
 
-#: passwd.1.xml:441(para)
+#: passwd.1.xml:457(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 
-#: passwd.1.xml:405(para)
+#: passwd.1.xml:421(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4495,82 +4603,87 @@
 "Polecenie <command>passwd</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: passwd.1.xml:456(para)
+#: passwd.1.xml:472(para)
 #, fuzzy
 #| msgid ""
-#| "<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>."
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
-"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
-"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>chpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <phrase condition=\"no_pam"
+"\"><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, </phrase><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>."
 
-#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname)
-#: nologin.8.xml:45(command)
+#: nologin.8.xml:38(refentrytitle) nologin.8.xml:45(refname)
+#: nologin.8.xml:51(command)
 msgid "nologin"
 msgstr "nologin"
 
-#: nologin.8.xml:40(refpurpose)
+#: nologin.8.xml:46(refpurpose)
 msgid "politely refuse a login"
 msgstr ""
 
-#: nologin.8.xml:51(para)
+#: nologin.8.xml:57(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:56(para)
+#: nologin.8.xml:62(para)
 msgid ""
 "To disable all logins, investigate <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: nologin.8.xml:65(para)
+#: nologin.8.xml:71(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: nologin.8.xml:76(title)
+#: nologin.8.xml:82(title)
 msgid "HISTORY"
 msgstr ""
 
-#: nologin.8.xml:77(para)
+#: nologin.8.xml:83(para)
 msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr ""
 
-#: newusers.8.xml:50(refentrytitle) newusers.8.xml:55(refname)
-#: newusers.8.xml:61(command) login.defs.5.xml:365(term)
+#: newusers.8.xml:51(refentrytitle) newusers.8.xml:58(refname)
+#: newusers.8.xml:64(command) login.defs.5.xml:368(term)
 msgid "newusers"
 msgstr "newusers"
 
-#: newusers.8.xml:56(refpurpose)
+#: newusers.8.xml:59(refpurpose)
 msgid "update and create new users in batch"
 msgstr "wsadowa aktualizacja i tworzenie nowych użytkowników"
 
-#: newusers.8.xml:64(replaceable)
-msgid "new_users"
-msgstr "new_users"
+#: newusers.8.xml:69(replaceable)
+msgid "file"
+msgstr ""
 
-#: newusers.8.xml:71(para)
+#: newusers.8.xml:76(para)
 #, fuzzy
 #| msgid ""
 #| "The <command>newusers</command> command reads a file of user name and "
@@ -4580,12 +4693,12 @@
 #| "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 exceptions "
-"explained below:"
+"The <command>newusers</command> command reads a <replaceable>file</"
+"replaceable> (or the standard input by default) and uses this information to "
+"update a set 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 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 "
@@ -4594,94 +4707,94 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>), z następującymi wyjątkami:"
 
-#: newusers.8.xml:79(para)
+#: newusers.8.xml:84(para)
 msgid "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
 msgstr ""
 
-#: newusers.8.xml:84(emphasis)
+#: newusers.8.xml:89(emphasis)
 #, fuzzy
 #| msgid "*name"
 msgid "pw_name"
 msgstr "*name"
 
-#: newusers.8.xml:87(para)
+#: newusers.8.xml:92(para)
 msgid "This is the name of the user."
 msgstr ""
 
-#: newusers.8.xml:90(para)
+#: newusers.8.xml:95(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:101(emphasis)
+#: newusers.8.xml:106(emphasis)
 msgid "pw_passwd"
 msgstr "pw_passwd"
 
-#: newusers.8.xml:104(para)
+#: newusers.8.xml:109(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:112(emphasis)
+#: newusers.8.xml:117(emphasis)
 #, fuzzy
 #| msgid "pw_gid"
 msgid "pw_uid"
 msgstr "pw_gid"
 
-#: newusers.8.xml:115(para)
+#: newusers.8.xml:120(para)
 msgid "This field is used to define the UID of the user."
 msgstr ""
 
-#: newusers.8.xml:118(para)
+#: newusers.8.xml:123(para)
 msgid ""
 "If the field is empty, an new (unused) UID will be defined automatically by "
 "<command>newusers</command>."
 msgstr ""
 
-#: newusers.8.xml:122(para)
+#: newusers.8.xml:127(para)
 msgid "If this field contains a number, this number will be used as the UID."
 msgstr ""
 
-#: newusers.8.xml:126(para)
+#: newusers.8.xml:131(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:132(para)
+#: newusers.8.xml:137(para)
 msgid ""
 "If the UID of an existing user is changed, the files ownership of the user's "
 "file should be fixed manually."
 msgstr ""
 
-#: newusers.8.xml:140(emphasis)
+#: newusers.8.xml:145(emphasis)
 msgid "pw_gid"
 msgstr "pw_gid"
 
-#: newusers.8.xml:143(para)
+#: newusers.8.xml:148(para)
 msgid "This field is used to define the primary group ID for the user."
 msgstr ""
 
-#: newusers.8.xml:146(para)
+#: newusers.8.xml:151(para)
 msgid ""
 "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:152(para)
+#: newusers.8.xml:157(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:158(para)
+#: newusers.8.xml:163(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> "
@@ -4689,56 +4802,56 @@
 "group."
 msgstr ""
 
-#: newusers.8.xml:164(para)
+#: newusers.8.xml:169(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 "
+"created before 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."
+"and GID for the new group."
 msgstr ""
 
-#: newusers.8.xml:176(emphasis)
+#: newusers.8.xml:181(emphasis)
 msgid "pw_gecos"
 msgstr ""
 
-#: newusers.8.xml:179(para)
+#: newusers.8.xml:184(para)
 msgid "This field is copied in the GECOS field of the user."
 msgstr ""
 
-#: newusers.8.xml:186(emphasis)
+#: newusers.8.xml:191(emphasis)
 msgid "pw_dir"
 msgstr "pw_dir"
 
-#: newusers.8.xml:189(para)
+#: newusers.8.xml:194(para)
 msgid "This field is used to define the home directory of the user."
 msgstr ""
 
-#: newusers.8.xml:192(para)
+#: newusers.8.xml:197(para)
 msgid ""
 "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:197(para)
+#: newusers.8.xml:202(para)
 msgid ""
 "If the home directory of an existing user is changed, <command>newusers</"
 "command> does not move or copy the content of the old directory to the new "
 "location. This should be done manually."
 msgstr ""
 
-#: newusers.8.xml:207(emphasis)
+#: newusers.8.xml:212(emphasis)
 msgid "pw_shell"
 msgstr ""
 
-#: newusers.8.xml:210(para)
+#: newusers.8.xml:215(para)
 msgid ""
 "This field defines the shell of the user. No checks are performed on this "
 "field."
 msgstr ""
 
-#: newusers.8.xml:218(para)
+#: newusers.8.xml:223(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 "
@@ -4746,7 +4859,7 @@
 "no changes are committed to the databases."
 msgstr ""
 
-#: newusers.8.xml:224(para)
+#: newusers.8.xml:229(para)
 msgid ""
 "During this first pass, users are created with a locked password (and "
 "passwords are not changed for the users which are not created). A second "
@@ -4754,35 +4867,35 @@
 "password are reported, but will not stop the other password updates."
 msgstr ""
 
-#: newusers.8.xml:232(para)
+#: newusers.8.xml:237(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:240(para)
+#: newusers.8.xml:245(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:245(term) chgpasswd.8.xml:95(term)
+#: newusers.8.xml:250(term) chgpasswd.8.xml:98(term)
 #, fuzzy
 msgid "<option>-c</option>, <option>--crypt-method</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: newusers.8.xml:247(para) chpasswd.8.xml:120(para) chgpasswd.8.xml:97(para)
+#: newusers.8.xml:252(para) chpasswd.8.xml:123(para) chgpasswd.8.xml:100(para)
 msgid "Use the specified method to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:248(para) chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
+#: newusers.8.xml:253(para) chpasswd.8.xml:127(para) chgpasswd.8.xml:104(para)
 msgid ""
 "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc "
 "support these methods."
 msgstr ""
 
-#: newusers.8.xml:270(para)
+#: newusers.8.xml:275(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are chosen in the "
@@ -4792,58 +4905,58 @@
 "the creation of groups)."
 msgstr ""
 
-#: newusers.8.xml:284(term) chgpasswd.8.xml:129(term)
+#: newusers.8.xml:302(term) chgpasswd.8.xml:145(term)
 #, fuzzy
 msgid "<option>-s</option>, <option>--sha-rounds</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: newusers.8.xml:286(para) chpasswd.8.xml:172(para) chgpasswd.8.xml:131(para)
+#: newusers.8.xml:304(para) chpasswd.8.xml:188(para) chgpasswd.8.xml:147(para)
 msgid "Use the specified number of rounds to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:289(para) chpasswd.8.xml:175(para) chgpasswd.8.xml:134(para)
+#: newusers.8.xml:307(para) chpasswd.8.xml:191(para) chgpasswd.8.xml:150(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:293(para) chpasswd.8.xml:179(para) chgpasswd.8.xml:138(para)
+#: newusers.8.xml:311(para) chpasswd.8.xml:195(para) chgpasswd.8.xml:154(para)
 msgid ""
 "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr ""
 
-#: newusers.8.xml:297(para) chpasswd.8.xml:183(para) chgpasswd.8.xml:142(para)
+#: newusers.8.xml:315(para) chpasswd.8.xml:199(para) chgpasswd.8.xml:158(para)
 msgid "You can only use this option with the SHA256 or SHA512 crypt method."
 msgstr ""
 
-#: newusers.8.xml:301(para) chgpasswd.8.xml:146(para)
+#: newusers.8.xml:319(para) chgpasswd.8.xml:162(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:313(para)
+#: newusers.8.xml:331(para)
 msgid ""
 "The input file must be protected since it contains unencrypted passwords."
 msgstr ""
 
-#: newusers.8.xml:317(para) chgpasswd.8.xml:162(para)
+#: newusers.8.xml:335(para) chgpasswd.8.xml:178(para)
 msgid ""
 "You should make sure the passwords and the encryption method respect the "
 "system's password policy."
 msgstr ""
 
-#: newusers.8.xml:390(filename)
+#: newusers.8.xml:408(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/newusers"
 msgstr "/etc/passwd"
 
-#: newusers.8.xml:392(para)
+#: newusers.8.xml:410(para)
 msgid "PAM configuration for <command>newusers</command>."
 msgstr ""
 
-#: newusers.8.xml:400(para)
+#: newusers.8.xml:418(para)
 msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4857,22 +4970,21 @@
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname)
-#: newgrp.1.xml:49(command)
+#: newgrp.1.xml:39(refentrytitle) newgrp.1.xml:46(refname)
+#: newgrp.1.xml:52(command)
 msgid "newgrp"
 msgstr "newgrp"
 
-#: newgrp.1.xml:44(refpurpose)
+#: newgrp.1.xml:47(refpurpose)
 msgid "log in to a new group"
 msgstr ""
 
-#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
-#: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
-#: groupadd.8.xml:57(replaceable) gpasswd.1.xml:66(replaceable)
+#: newgrp.1.xml:53(replaceable) grpck.8.xml:55(replaceable)
+#: groupadd.8.xml:59(replaceable) gpasswd.1.xml:69(replaceable)
 msgid "group"
 msgstr "group"
 
-#: newgrp.1.xml:56(para)
+#: newgrp.1.xml:59(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, "
@@ -4881,7 +4993,7 @@
 "remains unchanged."
 msgstr ""
 
-#: newgrp.1.xml:64(para)
+#: newgrp.1.xml:67(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 "
@@ -4895,7 +5007,7 @@
 "as a member."
 msgstr ""
 
-#: newgrp.1.xml:78(para)
+#: newgrp.1.xml:81(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 "
@@ -4903,7 +5015,7 @@
 "considered."
 msgstr ""
 
-#: newgrp.1.xml:130(para)
+#: newgrp.1.xml:133(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -4929,16 +5041,16 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname)
-#: logoutd.8.xml:45(command)
+#: logoutd.8.xml:38(refentrytitle) logoutd.8.xml:45(refname)
+#: logoutd.8.xml:51(command)
 msgid "logoutd"
 msgstr "logoutd"
 
-#: logoutd.8.xml:40(refpurpose)
-msgid "Enforce login time restrictions"
+#: logoutd.8.xml:46(refpurpose)
+msgid "enforce login time restrictions"
 msgstr ""
 
-#: logoutd.8.xml:51(para)
+#: logoutd.8.xml:57(para)
 msgid ""
 "<command>logoutd</command> enforces the login time and port restrictions "
 "specified in <filename>/etc/porttime</filename>. <command>logoutd</command> "
@@ -4949,23 +5061,23 @@
 "porttime</filename> is terminated."
 msgstr ""
 
-#: logoutd.8.xml:73(filename) login.1.xml:319(filename)
+#: logoutd.8.xml:79(filename) login.1.xml:322(filename)
 msgid "/var/run/utmp"
 msgstr "/var/run/utmp"
 
-#: logoutd.8.xml:75(para) login.1.xml:321(para)
+#: logoutd.8.xml:81(para) login.1.xml:324(para)
 msgid "List of current login sessions."
 msgstr ""
 
-#: login.defs.5.xml:100(refentrytitle) login.defs.5.xml:105(refname)
+#: login.defs.5.xml:101(refentrytitle) login.defs.5.xml:108(refname)
 msgid "login.defs"
 msgstr "login.defs"
 
-#: login.defs.5.xml:106(refpurpose)
+#: login.defs.5.xml:109(refpurpose)
 msgid "shadow password suite configuration"
 msgstr ""
 
-#: login.defs.5.xml:111(para)
+#: login.defs.5.xml:114(para)
 msgid ""
 "The <filename>/etc/login.defs</filename> file defines the site-specific "
 "configuration for the shadow password suite. This file is required. Absence "
@@ -4973,7 +5085,7 @@
 "undesirable operation."
 msgstr ""
 
-#: login.defs.5.xml:118(para)
+#: login.defs.5.xml:121(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 "
@@ -4982,7 +5094,7 @@
 "the first non-white character of the line."
 msgstr ""
 
-#: login.defs.5.xml:126(para)
+#: login.defs.5.xml:129(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 "
@@ -4995,7 +5107,7 @@
 "and long numeric parameters is machine-dependent."
 msgstr ""
 
-#: login.defs.5.xml:141(para)
+#: login.defs.5.xml:144(para)
 msgid "The following configuration items are provided:"
 msgstr ""
 
@@ -5182,7 +5294,7 @@
 #: login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "This will most likely be overridden by PAM, since the default pam_unix "
-"module has it's own built in of 3 retries. However, this is a safe fallback "
+"module has its 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 ""
@@ -5219,7 +5331,7 @@
 "inhibited."
 msgstr ""
 
-#: login.defs.5.xml:184(para)
+#: login.defs.5.xml:187(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 "
@@ -5232,7 +5344,9 @@
 msgstr "GID_MAX (numer)"
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "Enable checking of time restrictions specified in /etc/porttime."
+msgid ""
+"Enable checking of time restrictions specified in <filename>/etc/porttime</"
+"filename>."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -5292,121 +5406,121 @@
 msgid "Default <command>ulimit</command> value."
 msgstr ""
 
-#: login.defs.5.xml:215(title)
+#: login.defs.5.xml:218(title)
 msgid "CROSS REFERENCES"
 msgstr ""
 
-#: login.defs.5.xml:216(para)
+#: login.defs.5.xml:219(para)
 msgid ""
 "The following cross references show which programs in the shadow password "
 "suite use which parameters."
 msgstr ""
 
-#: login.defs.5.xml:223(term) chage.1.xml:38(refentrytitle)
-#: chage.1.xml:43(refname) chage.1.xml:48(command)
+#: login.defs.5.xml:226(term) chage.1.xml:39(refentrytitle)
+#: chage.1.xml:46(refname) chage.1.xml:51(command)
 msgid "chage"
 msgstr "chage"
 
-#: login.defs.5.xml:225(para) login.defs.5.xml:413(phrase)
-#: login.defs.5.xml:480(phrase)
+#: login.defs.5.xml:228(para) login.defs.5.xml:416(phrase)
+#: login.defs.5.xml:483(phrase)
 msgid "USE_TCB"
 msgstr ""
 
-#: login.defs.5.xml:229(term) chfn.1.xml:41(refentrytitle)
-#: chfn.1.xml:46(refname) chfn.1.xml:52(command)
+#: login.defs.5.xml:232(term) chfn.1.xml:41(refentrytitle)
+#: chfn.1.xml:48(refname) chfn.1.xml:54(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:231(para)
+#: login.defs.5.xml:234(para)
 msgid ""
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:239(term) chgpasswd.8.xml:42(refentrytitle)
-#: chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
+#: login.defs.5.xml:242(term) chgpasswd.8.xml:43(refentrytitle)
+#: chgpasswd.8.xml:50(refname) chgpasswd.8.xml:56(command)
 msgid "chgpasswd"
 msgstr "chgpasswd"
 
-#: login.defs.5.xml:241(para) login.defs.5.xml:272(para)
+#: login.defs.5.xml:244(para) login.defs.5.xml:275(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:249(term) chpasswd.8.xml:41(refentrytitle)
-#: chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
+#: login.defs.5.xml:252(term) chpasswd.8.xml:42(refentrytitle)
+#: chpasswd.8.xml:49(refname) chpasswd.8.xml:55(command)
 msgid "chpasswd"
 msgstr "chpasswd"
 
-#: login.defs.5.xml:252(phrase)
+#: login.defs.5.xml:255(phrase)
 msgid "ENCRYPT_METHOD MD5_CRYPT_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:254(phrase)
+#: login.defs.5.xml:257(phrase)
 msgid "SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS"
 msgstr ""
 
-#: login.defs.5.xml:260(term) chsh.1.xml:40(refentrytitle)
-#: chsh.1.xml:45(refname) chsh.1.xml:51(command)
+#: login.defs.5.xml:263(term) chsh.1.xml:41(refentrytitle)
+#: chsh.1.xml:48(refname) chsh.1.xml:54(command)
 msgid "chsh"
 msgstr "chsh"
 
-#: login.defs.5.xml:262(para)
+#: login.defs.5.xml:265(para)
 #, fuzzy
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
-#: login.defs.5.xml:270(term) gpasswd.1.xml:42(refentrytitle)
-#: gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
+#: login.defs.5.xml:273(term) gpasswd.1.xml:43(refentrytitle)
+#: gpasswd.1.xml:50(refname) gpasswd.1.xml:64(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
-#: login.defs.5.xml:280(term) groupadd.8.xml:41(refentrytitle)
-#: groupadd.8.xml:46(refname) groupadd.8.xml:52(command)
+#: login.defs.5.xml:283(term) groupadd.8.xml:41(refentrytitle)
+#: groupadd.8.xml:48(refname) groupadd.8.xml:54(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:282(para)
+#: login.defs.5.xml:285(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:289(term) groupdel.8.xml:38(refentrytitle)
-#: groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
+#: login.defs.5.xml:292(term) groupdel.8.xml:39(refentrytitle)
+#: groupdel.8.xml:46(refname) groupdel.8.xml:52(command)
 msgid "groupdel"
 msgstr "groupdel"
 
-#: login.defs.5.xml:291(para) login.defs.5.xml:297(para)
-#: login.defs.5.xml:303(para) login.defs.5.xml:310(para)
-#: login.defs.5.xml:316(para) login.defs.5.xml:322(para)
+#: login.defs.5.xml:294(para) login.defs.5.xml:300(para)
+#: login.defs.5.xml:306(para) login.defs.5.xml:313(para)
+#: login.defs.5.xml:319(para) login.defs.5.xml:325(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:295(term) groupmems.8.xml:38(refentrytitle)
-#: groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
+#: login.defs.5.xml:298(term) groupmems.8.xml:39(refentrytitle)
+#: groupmems.8.xml:46(refname) groupmems.8.xml:52(command)
 msgid "groupmems"
 msgstr "groupmems"
 
-#: login.defs.5.xml:301(term) groupmod.8.xml:38(refentrytitle)
-#: groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
+#: login.defs.5.xml:304(term) groupmod.8.xml:39(refentrytitle)
+#: groupmod.8.xml:46(refname) groupmod.8.xml:52(command)
 msgid "groupmod"
 msgstr "groupmod"
 
-#: login.defs.5.xml:308(term) grpck.8.xml:38(refentrytitle)
-#: grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
+#: login.defs.5.xml:311(term) grpck.8.xml:39(refentrytitle)
+#: grpck.8.xml:46(refname) grpck.8.xml:52(command)
 msgid "grpck"
 msgstr "grpck"
 
-#: login.defs.5.xml:328(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)
+#: login.defs.5.xml:331(term) login.1.xml:71(refentrytitle)
+#: login.1.xml:78(refname) login.1.xml:84(command) login.1.xml:92(command)
+#: login.1.xml:99(command)
 msgid "login"
 msgstr "login"
 
-#: login.defs.5.xml:330(para)
+#: login.defs.5.xml:333(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</"
@@ -5421,17 +5535,17 @@
 "phrase> USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:357(term)
+#: login.defs.5.xml:360(term)
 #, fuzzy
 #| msgid "newgrp"
 msgid "newgrp / sg"
 msgstr "newgrp"
 
-#: login.defs.5.xml:359(para)
+#: login.defs.5.xml:362(para)
 msgid "SYSLOG_SG_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:367(para)
+#: login.defs.5.xml:370(para)
 #, fuzzy
 msgid ""
 "ENCRYPT_METHOD GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB "
@@ -5442,20 +5556,20 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:383(para)
+#: login.defs.5.xml:386(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:394(para)
+#: login.defs.5.xml:397(para)
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb"
 "\">TCB_AUTH_GROUP TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:403(para)
+#: login.defs.5.xml:406(para)
 #, fuzzy
 #| msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 msgid ""
@@ -5463,7 +5577,7 @@
 "phrase>"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 
-#: login.defs.5.xml:420(para)
+#: login.defs.5.xml:423(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH "
@@ -5473,16 +5587,16 @@
 "\">USERGROUPS_ENAB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:435(term)
+#: login.defs.5.xml:438(term)
 #, fuzzy
 msgid "sulogin"
 msgstr "login"
 
-#: login.defs.5.xml:437(para)
+#: login.defs.5.xml:440(para)
 msgid "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:446(para)
+#: login.defs.5.xml:449(para)
 #, fuzzy
 msgid ""
 "CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
@@ -5493,19 +5607,19 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:460(para)
+#: login.defs.5.xml:463(para)
 msgid ""
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB <phrase "
 "condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:470(para)
+#: login.defs.5.xml:473(para)
 msgid ""
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP <phrase condition=\"tcb"
 "\">TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:489(para)
+#: login.defs.5.xml:492(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
@@ -5531,7 +5645,7 @@
 "citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: login.defs.5.xml:505(para)
+#: login.defs.5.xml:508(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5553,22 +5667,22 @@
 "citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
+#: login.access.5.xml:39(refentrytitle) login.access.5.xml:46(refname)
 msgid "login.access"
 msgstr "login.access"
 
-#: login.access.5.xml:41(refpurpose)
+#: login.access.5.xml:47(refpurpose)
 msgid "login access control table"
 msgstr ""
 
-#: login.access.5.xml:46(para)
+#: login.access.5.xml:52(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:52(para)
+#: login.access.5.xml:58(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, "
@@ -5577,19 +5691,19 @@
 "whether the login will be accepted or refused."
 msgstr ""
 
-#: login.access.5.xml:60(para)
+#: login.access.5.xml:66(para)
 msgid ""
 "Each line of the login access control table has three fields separated by a "
 "\":\" character:"
 msgstr ""
 
-#: login.access.5.xml:65(para)
+#: login.access.5.xml:71(para)
 msgid ""
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
 "emphasis>:<emphasis remap=\"I\">origins</emphasis>"
 msgstr ""
 
-#: login.access.5.xml:69(para)
+#: login.access.5.xml:75(para)
 msgid ""
 "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or "
 "\"<emphasis>-</emphasis>\" (access denied) character. The second field "
@@ -5603,50 +5717,50 @@
 "@netgroupname in host or user patterns."
 msgstr ""
 
-#: login.access.5.xml:83(para)
+#: login.access.5.xml:89(para)
 msgid ""
 "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
 "compact rules."
 msgstr ""
 
-#: login.access.5.xml:88(para)
+#: login.access.5.xml:94(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:76(refpurpose)
+#: login.1.xml:79(refpurpose)
 msgid "begin session on the system"
 msgstr ""
 
-#: 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)
+#: login.1.xml:85(arg) login.1.xml:93(arg) login.1.xml:100(arg)
+#: login.1.xml:217(option) groupmems.8.xml:57(arg)
 msgid "-p"
 msgstr "-p"
 
-#: login.1.xml:83(replaceable) login.1.xml:91(replaceable)
-#: login.1.xml:98(replaceable)
+#: login.1.xml:86(replaceable) login.1.xml:94(replaceable)
+#: login.1.xml:101(replaceable)
 msgid "host"
 msgstr ""
 
-#: login.1.xml:83(arg) login.1.xml:91(arg) chfn.1.xml:56(arg)
+#: login.1.xml:86(arg) login.1.xml:94(arg)
 msgid "-h <placeholder-1/>"
 msgstr "-h <placeholder-1/>"
 
-#: login.1.xml:86(replaceable)
+#: login.1.xml:89(replaceable)
 msgid "ENV=VAR"
 msgstr "ENV=VAR"
 
-#: login.1.xml:92(arg) login.1.xml:192(option) expiry.1.xml:54(arg)
+#: login.1.xml:95(arg) login.1.xml:195(option)
 msgid "-f"
 msgstr "-f"
 
-#: login.1.xml:98(arg) chfn.1.xml:54(arg)
+#: login.1.xml:101(arg)
 msgid "-r <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
-#: login.1.xml:104(para)
+#: login.1.xml:107(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 "
@@ -5660,7 +5774,7 @@
 "produce an error message."
 msgstr ""
 
-#: login.1.xml:118(para)
+#: login.1.xml:121(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 "
@@ -5668,7 +5782,7 @@
 "communications link is severed."
 msgstr ""
 
-#: login.1.xml:125(para)
+#: login.1.xml:128(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 "
@@ -5677,7 +5791,7 @@
 "citerefentry> for more information."
 msgstr ""
 
-#: login.1.xml:134(para)
+#: login.1.xml:137(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 "
@@ -5688,7 +5802,7 @@
 "the condition of your mailbox."
 msgstr ""
 
-#: login.1.xml:145(para)
+#: login.1.xml:148(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>, "
@@ -5698,21 +5812,21 @@
 "entries in the GECOS field."
 msgstr ""
 
-#: login.1.xml:154(para)
+#: login.1.xml:157(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:160(para)
+#: login.1.xml:163(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:172(para) login.1.xml:248(para)
+#: login.1.xml:175(para) login.1.xml:251(para)
 msgid ""
 "The <command>login</command> program is NOT responsible for removing users "
 "from the utmp file. It is the responsibility of "
@@ -5725,48 +5839,52 @@
 "\"."
 msgstr ""
 
-#: login.1.xml:195(para)
+#: login.1.xml:198(para)
 msgid "Do not perform authentication, user is preauthenticated."
 msgstr ""
 
-#: login.1.xml:198(para)
+#: login.1.xml:201(para)
 msgid "Note: In that case, <replaceable>username</replaceable> is mandatory."
 msgstr ""
 
-#: login.1.xml:206(option)
+#: login.1.xml:209(option)
 msgid "-h"
 msgstr "-h"
 
-#: login.1.xml:209(para)
+#: login.1.xml:212(para)
 msgid "Name of the remote host for this login."
 msgstr ""
 
-#: login.1.xml:217(para)
+#: login.1.xml:220(para)
 msgid "Preserve environment."
 msgstr ""
 
-#: login.1.xml:225(para)
+#: login.1.xml:225(option)
+msgid "-r"
+msgstr "-r"
+
+#: login.1.xml:228(para)
 msgid "Perform autologin protocol for rlogin."
 msgstr ""
 
-#: login.1.xml:230(para)
+#: login.1.xml:233(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:239(para)
+#: login.1.xml:242(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:244(para)
+#: login.1.xml:247(para)
 msgid ""
 "The location of files is subject to differences in system configuration."
 msgstr ""
 
-#: login.1.xml:260(para)
+#: login.1.xml:263(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 "
@@ -5775,47 +5893,47 @@
 "trusted path and prevent this kind of attack."
 msgstr ""
 
-#: login.1.xml:325(filename)
+#: login.1.xml:328(filename)
 msgid "/var/log/wtmp"
 msgstr "/var/log/wtmp"
 
-#: login.1.xml:327(para)
+#: login.1.xml:330(para)
 msgid "List of previous login sessions."
 msgstr ""
 
-#: login.1.xml:343(filename)
+#: login.1.xml:346(filename)
 msgid "/etc/motd"
 msgstr "/etc/motd"
 
-#: login.1.xml:345(para)
+#: login.1.xml:348(para)
 msgid "System message of the day file."
 msgstr ""
 
-#: login.1.xml:349(filename)
+#: login.1.xml:352(filename)
 msgid "/etc/nologin"
 msgstr "/etc/nologin"
 
-#: login.1.xml:351(para)
+#: login.1.xml:354(para)
 msgid "Prevent non-root users from logging in."
 msgstr ""
 
-#: login.1.xml:355(filename)
+#: login.1.xml:358(filename)
 msgid "/etc/ttytype"
 msgstr "/etc/ttytype"
 
-#: login.1.xml:357(para)
+#: login.1.xml:360(para)
 msgid "List of terminal types."
 msgstr ""
 
-#: login.1.xml:361(filename)
+#: login.1.xml:364(filename)
 msgid "$HOME/.hushlogin"
 msgstr "$HOME/.hushlogin"
 
-#: login.1.xml:363(para)
+#: login.1.xml:366(para)
 msgid "Suppress printing of system messages."
 msgstr ""
 
-#: login.1.xml:377(para)
+#: login.1.xml:380(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5845,15 +5963,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getty</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
+#: limits.5.xml:39(refentrytitle) limits.5.xml:46(refname)
 msgid "limits"
 msgstr "limits"
 
-#: limits.5.xml:41(refpurpose)
+#: limits.5.xml:47(refpurpose)
 msgid "resource limits definition"
 msgstr ""
 
-#: limits.5.xml:47(para)
+#: limits.5.xml:53(para)
 msgid ""
 "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</"
 "filename> by default or LIMITS_FILE defined <filename>config.h</filename>) "
@@ -5861,111 +5979,111 @@
 "and readable by root account only."
 msgstr ""
 
-#: limits.5.xml:55(para)
+#: limits.5.xml:61(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:61(para)
+#: limits.5.xml:67(para)
 msgid "Each line describes a limit for a user in the form:"
 msgstr ""
 
-#: limits.5.xml:64(emphasis)
+#: limits.5.xml:70(emphasis)
 msgid "user LIMITS_STRING"
 msgstr ""
 
-#: limits.5.xml:67(para)
+#: limits.5.xml:73(para)
 msgid "or in the form:"
 msgstr ""
 
-#: limits.5.xml:70(emphasis)
+#: limits.5.xml:76(emphasis)
 msgid "@group LIMITS_STRING"
 msgstr ""
 
-#: limits.5.xml:73(para)
+#: limits.5.xml:79(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:79(para)
+#: limits.5.xml:85(para)
 msgid "The valid identifiers are:"
 msgstr ""
 
-#: limits.5.xml:82(para)
+#: limits.5.xml:88(para)
 msgid "A: max address space (KB)"
 msgstr ""
 
-#: limits.5.xml:83(para)
+#: limits.5.xml:89(para)
 msgid "C: max core file size (KB)"
 msgstr ""
 
-#: limits.5.xml:84(para)
+#: limits.5.xml:90(para)
 msgid "D: max data size (KB)"
 msgstr ""
 
-#: limits.5.xml:85(para)
+#: limits.5.xml:91(para)
 msgid "F: maximum filesize (KB)"
 msgstr ""
 
-#: limits.5.xml:86(para)
-msgid "M: max locked-in-memory address space (KB)"
+#: limits.5.xml:92(para)
+msgid ""
+"K: file creation mask, set by <citerefentry><refentrytitle>umask</"
+"refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
-#: limits.5.xml:87(para)
-msgid "N: max number of open files"
+#: limits.5.xml:97(para)
+msgid "I: max nice value (0..39 which translates to 20..-19)"
 msgstr ""
 
-#: limits.5.xml:88(para)
-msgid "R: max resident set size (KB)"
+#: limits.5.xml:99(para)
+msgid "L: max number of logins for this user"
 msgstr ""
 
-#: limits.5.xml:89(para)
-msgid "S: max stack size (KB)"
+#: limits.5.xml:100(para)
+msgid "M: max locked-in-memory address space (KB)"
 msgstr ""
 
-#: limits.5.xml:90(para)
-msgid "T: max CPU time (MIN)"
+#: limits.5.xml:101(para)
+msgid "N: max number of open files"
 msgstr ""
 
-#: limits.5.xml:91(para)
-msgid "U: max number of processes"
+#: limits.5.xml:102(para)
+msgid "O: max real time priority"
 msgstr ""
 
-#: limits.5.xml:92(para)
+#: limits.5.xml:103(para)
 msgid ""
-"K: file creation mask, set by <citerefentry><refentrytitle>umask</"
+"P: process priority, set by <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
-#: limits.5.xml:97(para)
-msgid "L: max number of logins for this user"
+#: limits.5.xml:108(para)
+msgid "R: max resident set size (KB)"
 msgstr ""
 
-#: limits.5.xml:98(para)
-msgid ""
-"P: process priority, set by <citerefentry><refentrytitle>setpriority</"
-"refentrytitle><manvolnum>2</manvolnum></citerefentry>."
+#: limits.5.xml:109(para)
+msgid "S: max stack size (KB)"
 msgstr ""
 
-#: limits.5.xml:103(para)
-msgid "I: max nice value (0..39 which translates to 20..-19)"
+#: limits.5.xml:110(para)
+msgid "T: max CPU time (MIN)"
 msgstr ""
 
-#: limits.5.xml:105(para)
-msgid "O: max real time priority"
+#: limits.5.xml:111(para)
+msgid "U: max number of processes"
 msgstr ""
 
-#: limits.5.xml:108(para)
+#: limits.5.xml:114(para)
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
 "<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
 "entries are equivalent:"
 msgstr ""
 
-#: limits.5.xml:114(programlisting)
+#: limits.5.xml:120(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -5978,7 +6096,7 @@
 "      username L2 D2048 N5\n"
 "    "
 
-#: limits.5.xml:119(para)
+#: limits.5.xml:125(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 "
@@ -5986,7 +6104,7 @@
 "<command>login</command> program."
 msgstr ""
 
-#: limits.5.xml:126(para)
+#: limits.5.xml:132(para)
 msgid ""
 "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
 "have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
@@ -5994,7 +6112,7 @@
 "default entry."
 msgstr ""
 
-#: limits.5.xml:133(para)
+#: limits.5.xml:139(para)
 #, fuzzy
 msgid ""
 "The limits specified in the form \"<replaceable>@group</replaceable>\" apply "
@@ -6003,44 +6121,44 @@
 "Nazwa grupy zostanie zmieniona z <replaceable>GRUPA</replaceable> na nazwę "
 "<replaceable>NOWA_GRUPA</replaceable>."
 
-#: limits.5.xml:139(para)
+#: limits.5.xml:145(para)
 msgid ""
-"If a line with limits for an user exist, only the first line for this user "
-"will be considered."
+"If more than one line with limits for an user exist, only the first line for "
+"this user will be considered."
 msgstr ""
 
-#: limits.5.xml:144(para)
+#: limits.5.xml:150(para)
 msgid ""
 "If no lines are specified for an user, the last <replaceable>@group</"
 "replaceable> line matching a group whose the user is a member of will be "
-"conisdered, or the last line with default limits if no groups contain the "
-"user)."
+"considered, or the last line with default limits if no groups contain the "
+"user."
 msgstr ""
 
-#: limits.5.xml:151(para)
+#: limits.5.xml:157(para)
 msgid ""
 "To completely disable limits for a user, a single dash \"<emphasis>-</"
 "emphasis>\" will do."
 msgstr ""
 
-#: limits.5.xml:156(para)
+#: limits.5.xml:162(para)
 msgid ""
 "To disable a limit for a user, a single dash \"<replaceable>-</replaceable>"
 "\" can be used instead of the numerical value for this limit."
 msgstr ""
 
-#: limits.5.xml:162(para)
+#: limits.5.xml:168(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:173(filename)
+#: limits.5.xml:179(filename)
 msgid "/etc/limits"
 msgstr "/etc/limits"
 
-#: limits.5.xml:181(para)
+#: limits.5.xml:187(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>setpriority</"
@@ -6054,18 +6172,18 @@
 "<citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
-#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname)
-#: lastlog.8.xml:46(command)
+#: lastlog.8.xml:39(refentrytitle) lastlog.8.xml:46(refname)
+#: lastlog.8.xml:52(command)
 msgid "lastlog"
 msgstr "lastlog"
 
-#: lastlog.8.xml:41(refpurpose)
+#: lastlog.8.xml:47(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:55(para)
+#: lastlog.8.xml:61(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</"
@@ -6080,30 +6198,30 @@
 "flag) pozycje wyświetlane są w kolejności w jakiej są w pliku <filename>/etc/"
 "passwd</filename>."
 
-#: lastlog.8.xml:67(para)
+#: lastlog.8.xml:73(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:72(term)
+#: lastlog.8.xml:78(term)
 msgid ""
 "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-b</option>, <option>--before</option><replaceable>DNI</replaceable>"
 
-#: lastlog.8.xml:76(para)
+#: lastlog.8.xml:82(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:90(term) faillog.8.xml:157(term)
+#: lastlog.8.xml:109(term) faillog.8.xml:176(term)
 msgid ""
 "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>DNI</replaceable>"
 
-#: lastlog.8.xml:95(para)
+#: lastlog.8.xml:114(para)
 msgid ""
 "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
 "emphasis>."
@@ -6111,7 +6229,7 @@
 "Wyświetlenie rekordów lastlog nie starszych niż zadana ilość <emphasis remap="
 "\"I\">DNI</emphasis>."
 
-#: lastlog.8.xml:102(term) faillog.8.xml:168(term)
+#: lastlog.8.xml:121(term) faillog.8.xml:187(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
@@ -6123,7 +6241,7 @@
 "<option>-K</option>, <option>--key</option><replaceable>KLUCZ</"
 "replaceable>=<replaceable>WARTOŚĆ</replaceable>"
 
-#: lastlog.8.xml:107(para)
+#: lastlog.8.xml:126(para)
 #, fuzzy
 #| msgid ""
 #| "Print the lastlog record for user with specified <emphasis remap=\"I"
@@ -6133,7 +6251,7 @@
 "Wyświetlenie informacji o ostanim logowaniu dla użytkownika "
 "<replaceable>LOGIN</replaceable>."
 
-#: lastlog.8.xml:110(para) faillog.8.xml:178(para)
+#: lastlog.8.xml:129(para) faillog.8.xml:197(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</"
@@ -6142,7 +6260,7 @@
 "UID_MAX</replaceable>), or a min value (<replaceable>UID_MIN-</replaceable>)."
 msgstr ""
 
-#: lastlog.8.xml:122(para)
+#: lastlog.8.xml:141(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."
@@ -6151,18 +6269,18 @@
 "logowania wyświetlany jest komunikat <emphasis>**Nigdy nie zalogowany**</"
 "emphasis> (użytkownik nigdy się nie logował)."
 
-#: lastlog.8.xml:127(para)
+#: lastlog.8.xml:146(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:197(title)
+#: lastlog.8.xml:154(title) groups.1.xml:71(title) chsh.1.xml:122(title)
+#: chage.1.xml:213(title)
 msgid "NOTE"
 msgstr "UWAGI"
 
-#: lastlog.8.xml:136(para)
+#: lastlog.8.xml:155(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, "
@@ -6180,15 +6298,15 @@
 "wartościami UID). Mozesz wyświetlić rzeczywisty rozmiar tego pliku używając "
 "polecenia \"<command>ls -s</command>\"."
 
-#: lastlog.8.xml:150(filename)
+#: lastlog.8.xml:169(filename)
 msgid "/var/log/lastlog"
 msgstr "/var/log/lastlog"
 
-#: lastlog.8.xml:152(para)
+#: lastlog.8.xml:171(para)
 msgid "Database times of previous user logins."
 msgstr "Baza danych ostatnich logowań użytkowników."
 
-#: lastlog.8.xml:160(para)
+#: lastlog.8.xml:179(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 "
@@ -6200,33 +6318,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:33(refentrytitle) gshadow.5.xml:38(refname)
+#: gshadow.5.xml:37(refentrytitle) gshadow.5.xml:44(refname)
 msgid "gshadow"
 msgstr "gshadow"
 
-#: gshadow.5.xml:39(refpurpose)
+#: gshadow.5.xml:45(refpurpose)
 msgid "shadowed group file"
 msgstr ""
 
-#: gshadow.5.xml:44(para)
+#: gshadow.5.xml:50(para)
 msgid ""
 "<filename>/etc/gshadow</filename> contains the shadowed information for "
 "group accounts."
 msgstr ""
 
-#: gshadow.5.xml:54(para)
+#: gshadow.5.xml:60(para)
 msgid "Each line of this file contains the following colon-separated fields:"
 msgstr ""
 
-#: gshadow.5.xml:60(emphasis)
+#: gshadow.5.xml:66(emphasis)
 msgid "group name"
 msgstr "nazwa grupy"
 
-#: gshadow.5.xml:62(para)
+#: gshadow.5.xml:68(para)
 msgid "It must be a valid group name, which exist on the system."
 msgstr ""
 
-#: gshadow.5.xml:75(para)
+#: gshadow.5.xml:81(para)
 #, fuzzy
 msgid ""
 "If the password field contains some string that is not a valid result of "
@@ -6238,7 +6356,7 @@
 "jest zmieniana przy pomocy polecenia <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: gshadow.5.xml:82(para)
+#: gshadow.5.xml:88(para)
 #, fuzzy
 #| msgid ""
 #| "The new value of the user's password file comment field. It is normally "
@@ -6253,49 +6371,49 @@
 "jest zmieniana przy pomocy polecenia <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: gshadow.5.xml:88(para)
+#: gshadow.5.xml:94(para)
 msgid ""
 "This field may be empty, in which case only the group members can gain the "
 "group permissions."
 msgstr ""
 
-#: gshadow.5.xml:98(para)
+#: gshadow.5.xml:104(para)
 msgid ""
 "This password supersedes any password specified in <filename>/etc/group</"
 "filename>."
 msgstr ""
 
-#: gshadow.5.xml:106(emphasis)
+#: gshadow.5.xml:112(emphasis)
 msgid "administrators"
 msgstr ""
 
-#: gshadow.5.xml:108(para) gshadow.5.xml:124(para)
+#: gshadow.5.xml:114(para) gshadow.5.xml:130(para)
 msgid "It must be a comma-separated list of user names."
 msgstr ""
 
-#: gshadow.5.xml:111(para)
+#: gshadow.5.xml:117(para)
 msgid "Administrators can change the password or the members of the group."
 msgstr ""
 
-#: gshadow.5.xml:115(para)
+#: gshadow.5.xml:121(para)
 msgid ""
 "Administrators also have the same permissions as the members (see below)."
 msgstr ""
 
-#: gshadow.5.xml:122(emphasis)
+#: gshadow.5.xml:128(emphasis)
 msgid "members"
 msgstr ""
 
-#: gshadow.5.xml:127(para)
+#: gshadow.5.xml:133(para)
 msgid "Members can access the group without being prompted for a password."
 msgstr ""
 
-#: gshadow.5.xml:131(para)
+#: gshadow.5.xml:137(para)
 msgid ""
 "You should use the same list of users as in <filename>/etc/group</filename>."
 msgstr ""
 
-#: gshadow.5.xml:160(para)
+#: gshadow.5.xml:166(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
@@ -6325,11 +6443,11 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: grpck.8.xml:44(refpurpose)
+#: grpck.8.xml:47(refpurpose)
 msgid "verify integrity of group files"
 msgstr ""
 
-#: grpck.8.xml:70(para)
+#: grpck.8.xml:65(para)
 msgid ""
 "The <command>grpck</command> command verifies the integrity of the groups "
 "information. It checks that all entries in <filename>/etc/group</"
@@ -6339,30 +6457,30 @@
 "other uncorrectable errors."
 msgstr ""
 
-#: grpck.8.xml:87(para)
+#: grpck.8.xml:82(para)
 msgid "a unique and valid group name"
 msgstr ""
 
-#: grpck.8.xml:90(para)
+#: grpck.8.xml:85(para)
 msgid ""
 "a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/"
 "group</filename> only)</phrase>"
 msgstr ""
 
-#: grpck.8.xml:97(para)
+#: grpck.8.xml:92(para)
 msgid ""
 "a valid list of members <phrase condition=\"gshadow\"> and administrators</"
 "phrase>"
 msgstr ""
 
-#: grpck.8.xml:103(para)
+#: grpck.8.xml:98(para)
 msgid ""
 "a corresponding entry in the <filename>/etc/gshadow</filename> file "
 "(respectively <filename>/etc/group</filename> for the <filename>gshadow</"
 "filename> checks)"
 msgstr ""
 
-#: grpck.8.xml:111(para)
+#: grpck.8.xml:106(para)
 msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
 "an entry has the wrong number of fields, the user will be prompted to delete "
@@ -6373,7 +6491,7 @@
 "command to correct the error."
 msgstr ""
 
-#: grpck.8.xml:122(para)
+#: grpck.8.xml:117(para)
 msgid ""
 "The commands which operate on the <filename>/etc/group</filename><phrase "
 "condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
@@ -6382,26 +6500,26 @@
 "those circumstances to remove the offending entries."
 msgstr ""
 
-#: grpck.8.xml:134(para)
+#: grpck.8.xml:133(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:141(para)
+#: grpck.8.xml:146(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:151(para)
+#: grpck.8.xml:169(para)
 msgid ""
 "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
 "\">and <filename>/etc/gshadow</filename></phrase> by GID."
 msgstr ""
 
-#: grpck.8.xml:160(para)
+#: grpck.8.xml:178(para)
 msgid ""
 "By default, <command>grpck</command> operates on <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</"
@@ -6411,23 +6529,23 @@
 "emphasis> parameters.</phrase>"
 msgstr ""
 
-#: grpck.8.xml:228(para)
+#: grpck.8.xml:246(para)
 msgid "one or more bad group entries"
 msgstr ""
 
-#: grpck.8.xml:234(para)
+#: grpck.8.xml:252(para)
 msgid "can't open group files"
 msgstr ""
 
-#: grpck.8.xml:240(para)
+#: grpck.8.xml:258(para)
 msgid "can't lock group files"
 msgstr ""
 
-#: grpck.8.xml:246(para)
+#: grpck.8.xml:264(para)
 msgid "can't update group files"
 msgstr ""
 
-#: grpck.8.xml:210(para)
+#: grpck.8.xml:228(para)
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6435,7 +6553,7 @@
 "Polecenie <command>grpckl</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: grpck.8.xml:255(para)
+#: grpck.8.xml:273(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -6469,20 +6587,20 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
-#: groups.1.xml:45(command)
+#: groups.1.xml:38(refentrytitle) groups.1.xml:45(refname)
+#: groups.1.xml:51(command)
 msgid "groups"
 msgstr "groups"
 
-#: groups.1.xml:40(refpurpose)
+#: groups.1.xml:46(refpurpose)
 msgid "display current group names"
 msgstr ""
 
-#: groups.1.xml:47(replaceable) chfn.1.xml:58(replaceable)
+#: groups.1.xml:53(replaceable)
 msgid "user"
 msgstr ""
 
-#: groups.1.xml:54(para)
+#: groups.1.xml:60(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/"
@@ -6491,15 +6609,15 @@
 "the groups for the named <emphasis remap=\"I\">user</emphasis>."
 msgstr ""
 
-#: groups.1.xml:66(para)
+#: groups.1.xml:72(para)
 msgid ""
 "Systems which do not support concurrent group sets will have the information "
 "from <filename>/etc/group</filename> reported. The user must use "
-"<command>newgrp</command> or <command>sg</command> to change their current "
+"<command>newgrp</command> or <command>sg</command> to change his current "
 "real and effective group ID."
 msgstr ""
 
-#: groups.1.xml:88(para)
+#: groups.1.xml:94(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getgid</"
@@ -6515,15 +6633,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getuid</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
-#: groupmod.8.xml:44(refpurpose)
+#: groupmod.8.xml:47(refpurpose)
 msgid "modify a group definition on the system"
 msgstr "modyfikuj definicję grupy systemowej"
 
-#: groupmod.8.xml:53(replaceable)
+#: groupmod.8.xml:56(replaceable) groupdel.8.xml:56(replaceable)
 msgid "GROUP"
 msgstr "GRUPA"
 
-#: groupmod.8.xml:59(para)
+#: groupmod.8.xml:62(para)
 msgid ""
 "The <command>groupmod</command> command modifies the definition of the "
 "specified <replaceable>GROUP</replaceable> by modifying the appropriate "
@@ -6533,17 +6651,17 @@
 "<replaceable>GRUPA</replaceable> poprzez modifikację stosownego wpisu w "
 "bazie grup."
 
-#: groupmod.8.xml:68(para)
+#: groupmod.8.xml:71(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:74(term) groupadd.8.xml:93(term)
+#: groupmod.8.xml:77(term) groupadd.8.xml:95(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
-#: groupmod.8.xml:78(para)
+#: groupmod.8.xml:81(para)
 #, fuzzy
 #| msgid ""
 #| "The name of the group will be changed from <replaceable>GROUP</"
@@ -6555,7 +6673,7 @@
 "Nazwa grupy zostanie zmieniona z <replaceable>GRUPA</replaceable> na nazwę "
 "<replaceable>NOWA_GRUPA</replaceable>."
 
-#: groupmod.8.xml:82(para)
+#: groupmod.8.xml:85(para)
 #, fuzzy
 msgid ""
 "The value of <replaceable>GID</replaceable> must be a non-negative decimal "
@@ -6569,13 +6687,19 @@
 "Pliki, dla których stary identyfikator jest identyfikatorem grupy pliku, "
 "wymagają ręcznej zmiany ID grupy."
 
-#: groupmod.8.xml:89(para)
+#: groupmod.8.xml:92(para)
 msgid ""
+"Users who use the group as primary group will be updated to keep the group "
+"as their primary group."
+msgstr ""
+
+#: groupmod.8.xml:96(para)
+msgid ""
 "Any files that have the old group ID and must continue to belong to "
 "<replaceable>GROUP</replaceable>, must have their group ID changed manually."
 msgstr ""
 
-#: groupmod.8.xml:104(term)
+#: groupmod.8.xml:111(term)
 msgid ""
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
@@ -6583,7 +6707,7 @@
 "<option>-a</option>, <option>--append</option><replaceable>NOWA_GRUPA</"
 "replaceable>"
 
-#: groupmod.8.xml:109(para)
+#: groupmod.8.xml:116(para)
 msgid ""
 "The name of the group will be changed from <replaceable>GROUP</replaceable> "
 "to <replaceable>NEW_GROUP</replaceable> name."
@@ -6591,7 +6715,7 @@
 "Nazwa grupy zostanie zmieniona z <replaceable>GRUPA</replaceable> na nazwę "
 "<replaceable>NOWA_GRUPA</replaceable>."
 
-#: groupmod.8.xml:120(para)
+#: groupmod.8.xml:127(para)
 #, fuzzy
 msgid ""
 "When used with the <option>-g</option> option, allow to change the group "
@@ -6600,11 +6724,11 @@
 "Użyte z opcją <option>-g</option> umożliwia zmiane <replaceable>GID</"
 "replaceable> grupy na wartość nieunikalną."
 
-#: groupmod.8.xml:219(para)
+#: groupmod.8.xml:245(para)
 msgid "group name already in use"
 msgstr "nazwa grupy już jest w użyciu"
 
-#: groupmod.8.xml:183(para)
+#: groupmod.8.xml:209(para)
 msgid ""
 "The <command>groupmod</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6612,7 +6736,7 @@
 "Polecenie <command>groupmod</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: groupmod.8.xml:234(para)
+#: groupmod.8.xml:260(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6644,35 +6768,35 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: groupmems.8.xml:44(refpurpose)
+#: groupmems.8.xml:47(refpurpose)
 msgid "administer members of a user's primary group"
 msgstr ""
 
-#: groupmems.8.xml:51(replaceable) groupmems.8.xml:52(replaceable)
+#: groupmems.8.xml:54(replaceable) groupmems.8.xml:55(replaceable)
 msgid "user_name"
 msgstr "user_name"
 
-#: groupmems.8.xml:51(arg)
+#: groupmems.8.xml:54(arg)
 msgid "-a <placeholder-1/>"
 msgstr "-a <placeholder-1/>"
 
-#: groupmems.8.xml:52(arg)
+#: groupmems.8.xml:55(arg)
 msgid "-d <placeholder-1/>"
 msgstr "-d <placeholder-1/>"
 
-#: groupmems.8.xml:53(replaceable)
+#: groupmems.8.xml:56(replaceable)
 msgid "group_name"
 msgstr ""
 
-#: groupmems.8.xml:53(arg)
+#: groupmems.8.xml:56(arg)
 msgid "-g <placeholder-1/>"
 msgstr "-g <placeholder-1/>"
 
-#: groupmems.8.xml:54(arg)
+#: groupmems.8.xml:57(arg)
 msgid "-l"
 msgstr "-l"
 
-#: groupmems.8.xml:61(para)
+#: groupmems.8.xml:64(para)
 msgid ""
 "The <command>groupmems</command> command allows a user to administer his/her "
 "own group membership list without the requirement of superuser privileges. "
@@ -6680,18 +6804,18 @@
 "users to be in their own name sake primary group (i.e., guest / guest)."
 msgstr ""
 
-#: groupmems.8.xml:69(para)
+#: groupmems.8.xml:72(para)
 msgid ""
 "Only the superuser, as administrator, can use <command>groupmems</command> "
 "to alter the memberships of other groups."
 msgstr ""
 
-#: groupmems.8.xml:76(para)
+#: groupmems.8.xml:79(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:82(term)
+#: groupmems.8.xml:85(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
@@ -6701,19 +6825,19 @@
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: groupmems.8.xml:84(para)
+#: groupmems.8.xml:87(para)
 msgid "Add an user to the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:85(para) groupmems.8.xml:101(para)
-#: groupmems.8.xml:132(para)
+#: groupmems.8.xml:88(para) groupmems.8.xml:104(para)
+#: groupmems.8.xml:135(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)
+#: groupmems.8.xml:96(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -6724,17 +6848,17 @@
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>DNI</replaceable>"
 
-#: groupmems.8.xml:95(para)
+#: groupmems.8.xml:98(para)
 msgid "Delete a user from the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:96(para)
+#: groupmems.8.xml:99(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:109(term)
+#: groupmems.8.xml:112(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
@@ -6744,33 +6868,33 @@
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
-#: groupmems.8.xml:111(para)
+#: groupmems.8.xml:114(para)
 msgid "The superuser can specify which group membership list to modify."
 msgstr ""
 
-#: groupmems.8.xml:123(term) chage.1.xml:132(term)
+#: groupmems.8.xml:126(term) chage.1.xml:135(term)
 msgid "<option>-l</option>, <option>--list</option>"
 msgstr "<option>-l</option>, <option>--list</option>"
 
-#: groupmems.8.xml:125(para)
+#: groupmems.8.xml:128(para)
 msgid "List the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:129(term)
+#: groupmems.8.xml:132(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:131(para)
+#: groupmems.8.xml:134(para)
 msgid "Purge all users from the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:143(title)
+#: groupmems.8.xml:159(title)
 msgid "SETUP"
 msgstr ""
 
-#: groupmems.8.xml:144(para)
+#: groupmems.8.xml:160(para)
 msgid ""
 "The <command>groupmems</command> executable should be in mode <literal>2770</"
 "literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</"
@@ -6779,7 +6903,7 @@
 "utility to manage their own group membership list."
 msgstr ""
 
-#: groupmems.8.xml:153(programlisting)
+#: groupmems.8.xml:169(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -6796,11 +6920,11 @@
 "\t$ groupmems -g groups -a gk4\n"
 "    "
 
-#: groupmems.8.xml:185(para)
+#: groupmems.8.xml:201(para)
 msgid "secure group account information"
 msgstr ""
 
-#: groupmems.8.xml:193(para)
+#: groupmems.8.xml:209(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6828,34 +6952,44 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: groupdel.8.xml:44(refpurpose)
+#: groupdel.8.xml:47(refpurpose)
 msgid "delete a group"
 msgstr ""
 
-#: groupdel.8.xml:58(para)
+#: groupdel.8.xml:62(para)
+#, fuzzy
 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."
+"deleting all entries that refer to <replaceable>GROUP</replaceable>. The "
+"named group must exist."
 msgstr ""
+"Polecenie <command>usermod</command> zmienia systemowe pliki kont, "
+"odzwierciedlając zmiany podane w wierszu poleceń."
 
-#: groupdel.8.xml:66(para)
+#: groupdel.8.xml:70(para)
+#, fuzzy
+#| msgid ""
+#| "The options which apply to the <command>groupmod</command> command are:"
+msgid "The options which apply to the <command>groupdel</command> command are:"
+msgstr "Polecenie <command>groupmod</command> posiada następujące opcje:"
+
+#: groupdel.8.xml:99(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:70(para)
+#: groupdel.8.xml:103(para)
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this group."
 msgstr ""
 
-#: groupdel.8.xml:132(para)
+#: groupdel.8.xml:165(para)
 msgid "can't remove user's primary group"
 msgstr ""
 
-#: groupdel.8.xml:108(para)
+#: groupdel.8.xml:141(para)
 msgid ""
 "The <command>groupdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6863,7 +6997,23 @@
 "Polecenie <command>groupdel</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: groupdel.8.xml:147(para)
+#: groupdel.8.xml:180(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>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6878,7 +7028,7 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6895,22 +7045,22 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>"
 
-#: groupadd.8.xml:47(refpurpose)
+#: groupadd.8.xml:49(refpurpose)
 msgid "create a new group"
 msgstr "twółrz nową grupę"
 
-#: groupadd.8.xml:64(para)
+#: groupadd.8.xml:66(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:73(para)
+#: groupadd.8.xml:75(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:83(para)
+#: groupadd.8.xml:85(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 "
@@ -6918,7 +7068,7 @@
 "g</option> is turned off)."
 msgstr ""
 
-#: groupadd.8.xml:97(para)
+#: groupadd.8.xml:99(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 "
@@ -6927,13 +7077,13 @@
 "system accounts."
 msgstr ""
 
-#: groupadd.8.xml:117(para)
+#: groupadd.8.xml:119(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:122(para)
+#: groupadd.8.xml:124(para)
 #, fuzzy
 #| msgid ""
 #| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
@@ -6946,24 +7096,24 @@
 "<option>-K</option>, <option>--key</option><replaceable>KLUCZ</"
 "replaceable>=<replaceable>WARTOŚĆ</replaceable>"
 
-#: groupadd.8.xml:126(para)
+#: groupadd.8.xml:128(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:138(para)
+#: groupadd.8.xml:140(para)
 msgid "This option permits to add a group with a non-unique GID."
 msgstr ""
 
-#: groupadd.8.xml:170(para)
+#: groupadd.8.xml:172(para)
 #, fuzzy
 #| msgid "create a new group"
 msgid "Create a system group."
 msgstr "twółrz nową grupę"
 
-#: groupadd.8.xml:173(para)
+#: groupadd.8.xml:175(para)
 msgid ""
 "The numeric identifiers of new system groups are chosen in the "
 "<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
@@ -6971,38 +7121,38 @@
 "<option>GID_MAX</option>."
 msgstr ""
 
-#: groupadd.8.xml:224(para)
+#: groupadd.8.xml:239(para)
 msgid ""
 "Groupnames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
 "dollar sign. In regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 
-#: groupadd.8.xml:230(para)
+#: groupadd.8.xml:245(para)
 msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr ""
 
-#: groupadd.8.xml:233(para)
+#: groupadd.8.xml:248(para)
 msgid ""
 "You may not add a NIS or LDAP group. This must be performed on the "
 "corresponding server."
 msgstr ""
 
-#: groupadd.8.xml:237(para)
+#: groupadd.8.xml:252(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:270(para)
+#: groupadd.8.xml:285(para)
 msgid "GID not unique (when <option>-o</option> not used)"
 msgstr ""
 
-#: groupadd.8.xml:276(para)
+#: groupadd.8.xml:291(para)
 msgid "group name not unique"
 msgstr ""
 
-#: groupadd.8.xml:246(para)
+#: groupadd.8.xml:261(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -7010,7 +7160,7 @@
 "Polecenie <command>groupadd</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: groupadd.8.xml:291(para)
+#: groupadd.8.xml:306(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7044,23 +7194,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:49(phrase)
+#: gpasswd.1.xml:52(phrase)
 #, fuzzy
 #| msgid "-r <placeholder-1/>"
 msgid "administer <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
-#: gpasswd.1.xml:52(phrase)
+#: gpasswd.1.xml:55(phrase)
 #, fuzzy
 msgid "administer <placeholder-1/> and <placeholder-2/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:63(replaceable)
+#: gpasswd.1.xml:66(replaceable) expiry.1.xml:57(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "opcje"
 
-#: gpasswd.1.xml:73(para)
+#: gpasswd.1.xml:76(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -7068,14 +7218,14 @@
 "\">administrators,</phrase> members and a password."
 msgstr ""
 
-#: gpasswd.1.xml:81(para)
+#: gpasswd.1.xml:84(para)
 msgid ""
 "System administrators can use the <option>-A</option> option to define group "
 "administrator(s) and the <option>-M</option> option to define members. They "
 "have all rights of group administrators and members."
 msgstr ""
 
-#: gpasswd.1.xml:86(para)
+#: gpasswd.1.xml:89(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -7083,7 +7233,7 @@
 "of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:93(para)
+#: gpasswd.1.xml:96(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still use "
@@ -7094,34 +7244,34 @@
 "jest zmieniana przy pomocy polecenia <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:101(title)
+#: gpasswd.1.xml:104(title)
 msgid "Notes about group passwords"
 msgstr ""
 
-#: gpasswd.1.xml:102(para)
+#: gpasswd.1.xml:105(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:113(para)
+#: gpasswd.1.xml:116(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:117(para)
+#: gpasswd.1.xml:120(para)
 msgid "The options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:120(para)
+#: gpasswd.1.xml:123(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:125(term)
+#: gpasswd.1.xml:128(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
@@ -7130,7 +7280,7 @@
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:129(para)
+#: gpasswd.1.xml:132(para)
 #, fuzzy
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
@@ -7139,7 +7289,7 @@
 "Nazwa grupy zostanie zmieniona z <replaceable>GRUPA</replaceable> na nazwę "
 "<replaceable>NOWA_GRUPA</replaceable>."
 
-#: gpasswd.1.xml:138(term)
+#: gpasswd.1.xml:141(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -7149,7 +7299,7 @@
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>DNI</replaceable>"
 
-#: gpasswd.1.xml:142(para)
+#: gpasswd.1.xml:145(para)
 #, fuzzy
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
@@ -7158,33 +7308,45 @@
 "Nazwa grupy zostanie zmieniona z <replaceable>GRUPA</replaceable> na nazwę "
 "<replaceable>NOWA_GRUPA</replaceable>."
 
-#: gpasswd.1.xml:159(term)
+#: gpasswd.1.xml:162(term)
 #, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-Q</option>, <option>--root</option><replaceable>CHROOT_DIR</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>KAT_DOMOWY</"
+"replaceable>"
+
+#: gpasswd.1.xml:177(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:163(para)
+#: gpasswd.1.xml:181(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:174(term)
+#: gpasswd.1.xml:192(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:178(para)
+#: gpasswd.1.xml:196(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:189(term)
+#: gpasswd.1.xml:207(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
@@ -7196,11 +7358,11 @@
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DNI</"
 "replaceable>"
 
-#: gpasswd.1.xml:193(para)
+#: gpasswd.1.xml:211(para)
 msgid "Set the list of administrative users."
 msgstr ""
 
-#: gpasswd.1.xml:201(term)
+#: gpasswd.1.xml:219(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
@@ -7211,11 +7373,11 @@
 msgstr ""
 "<option>-b</option>, <option>--before</option><replaceable>DNI</replaceable>"
 
-#: gpasswd.1.xml:205(para)
+#: gpasswd.1.xml:223(para)
 msgid "Set the list of group members."
 msgstr ""
 
-#: gpasswd.1.xml:215(para)
+#: gpasswd.1.xml:233(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -7224,7 +7386,7 @@
 "server."
 msgstr ""
 
-#: gpasswd.1.xml:260(para)
+#: gpasswd.1.xml:278(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -7251,17 +7413,17 @@
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: 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:86(refentrytitle)
+#: faillog.8.xml:38(refentrytitle) faillog.8.xml:45(refname)
+#: faillog.8.xml:51(command) faillog.5.xml:38(refentrytitle)
+#: faillog.5.xml:45(refname) faillog.5.xml:92(refentrytitle)
 msgid "faillog"
 msgstr "faillog"
 
-#: faillog.8.xml:40(refpurpose)
+#: faillog.8.xml:46(refpurpose)
 msgid "display faillog records or set login failure limits"
 msgstr ""
 
-#: faillog.8.xml:54(para)
+#: faillog.8.xml:60(para)
 msgid ""
 "<command>faillog</command> displays the contents of the failure log database "
 "(<filename>/var/log/faillog</filename>). It can also set the failure "
@@ -7270,30 +7432,30 @@
 "failure."
 msgstr ""
 
-#: faillog.8.xml:65(para)
+#: faillog.8.xml:71(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:73(para)
+#: faillog.8.xml:79(para)
 msgid ""
 "Display (or act on) faillog records for all users having an entry in the "
 "<filename>faillog</filename> database."
 msgstr ""
 
-#: faillog.8.xml:77(para)
+#: faillog.8.xml:83(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "The range of users can be restricted with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: faillog.8.xml:81(para)
+#: faillog.8.xml:87(para)
 msgid ""
 "In display mode, this is still restricted to existing users but forces the "
 "display of the faillog entries even if they are empty."
 msgstr ""
 
-#: faillog.8.xml:86(para)
+#: faillog.8.xml:92(para)
 msgid ""
 "With the <option>-l</option>, <option>-m</option>, <option>-r</option>, "
 "<option>-t</option> options, the users' records are changed, even if the "
@@ -7301,7 +7463,7 @@
 "that have been deleted or to set a policy in advance for a range of users."
 msgstr ""
 
-#: faillog.8.xml:103(term)
+#: faillog.8.xml:109(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
@@ -7313,49 +7475,49 @@
 "<option>-l</option>, <option>--lock-time</option><replaceable>SEK</"
 "replaceable>"
 
-#: faillog.8.xml:108(para)
+#: faillog.8.xml:114(para)
 msgid ""
 "Lock account for <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
 
-#: faillog.8.xml:112(para) faillog.8.xml:138(para) faillog.8.xml:150(para)
+#: faillog.8.xml:118(para) faillog.8.xml:144(para) faillog.8.xml:156(para)
 msgid ""
 "Write access to <filename>/var/log/faillog</filename> is required for this "
 "option."
 msgstr ""
 
-#: faillog.8.xml:119(term)
+#: faillog.8.xml:125(term)
 msgid ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 
-#: faillog.8.xml:124(para)
+#: faillog.8.xml:130(para)
 msgid ""
 "Set the maximum number of login failures after the account is disabled to "
 "<replaceable>MAX</replaceable>."
 msgstr ""
 
-#: faillog.8.xml:128(para)
+#: faillog.8.xml:134(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:133(para)
+#: faillog.8.xml:139(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:145(term)
+#: faillog.8.xml:151(term)
 msgid "<option>-r</option>, <option>--reset</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: faillog.8.xml:147(para)
+#: faillog.8.xml:153(para)
 msgid "Reset the counters of login failures."
 msgstr ""
 
-#: faillog.8.xml:161(para)
+#: faillog.8.xml:180(para)
 #, fuzzy
 #| msgid ""
 #| "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
@@ -7366,21 +7528,21 @@
 "Wyświetlenie rekordów lastlog nie starszych niż zadana ilość <emphasis remap="
 "\"I\">DNI</emphasis>."
 
-#: faillog.8.xml:173(para)
+#: faillog.8.xml:192(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 the specified user(s)."
 msgstr ""
 
-#: faillog.8.xml:191(para)
+#: faillog.8.xml:210(para)
 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 ""
 
-#: faillog.8.xml:200(para)
+#: faillog.8.xml:219(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 "
@@ -7389,15 +7551,15 @@
 "option> flag."
 msgstr ""
 
-#: faillog.8.xml:213(filename) faillog.5.xml:74(filename)
+#: faillog.8.xml:232(filename) faillog.5.xml:80(filename)
 msgid "/var/log/faillog"
 msgstr "/var/log/faillog"
 
-#: faillog.8.xml:215(para) faillog.5.xml:76(para)
+#: faillog.8.xml:234(para) faillog.5.xml:82(para)
 msgid "Failure logging file."
 msgstr ""
 
-#: faillog.8.xml:223(para)
+#: faillog.8.xml:242(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
@@ -7407,31 +7569,31 @@
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: faillog.5.xml:40(refpurpose)
+#: faillog.5.xml:46(refpurpose)
 msgid "login failure logging file"
 msgstr ""
 
-#: faillog.5.xml:45(para)
+#: faillog.5.xml:51(para)
 msgid ""
 "<filename>/var/log/faillog</filename> maintains a count of login failures "
 "and the limits for each account."
 msgstr ""
 
-#: faillog.5.xml:49(para)
+#: faillog.5.xml:55(para)
 msgid ""
 "The file contains fixed length records, indexed by numerical UID. Each "
 "record contains the count of login failures since the last successful login; "
 "the maximum number of failures before the account is disabled; the line on "
-"whiche the last login failure occurred; the date of the last login failure; "
+"which the last login failure occurred; the date of the last login failure; "
 "and the duration (in seconds) during which the account will be locked after "
 "a failure."
 msgstr ""
 
-#: faillog.5.xml:59(para)
+#: faillog.5.xml:65(para)
 msgid "The structure of the file is:"
 msgstr "Struktura tego pliku to:"
 
-#: faillog.5.xml:60(programlisting)
+#: faillog.5.xml:66(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -7452,16 +7614,16 @@
 "\tlong    fail_locktime;\n"
 "};"
 
-#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
-#: expiry.1.xml:52(command)
+#: expiry.1.xml:42(refentrytitle) expiry.1.xml:49(refname)
+#: expiry.1.xml:55(command)
 msgid "expiry"
 msgstr "expiry"
 
-#: expiry.1.xml:47(refpurpose)
+#: expiry.1.xml:50(refpurpose)
 msgid "check and enforce password expiration policy"
 msgstr "sprawdzenie ważności i wymuszenie zmiany hasła"
 
-#: expiry.1.xml:60(para)
+#: expiry.1.xml:64(para)
 msgid ""
 "The <command>expiry</command> command checks (<option>-c</option>) the "
 "current password expiration and forces (<option>-f</option>) changes when "
@@ -7471,7 +7633,29 @@
 "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:87(para) chage.1.xml:278(para)
+#: expiry.1.xml:73(para)
+#, fuzzy
+#| msgid "The options which apply to the <command>pwck</command> command are:"
+msgid "The options which apply to the <command>expiry</command> command are:"
+msgstr "Polecenie <command>pwck</command> posiada następujące opcje:"
+
+#: expiry.1.xml:78(term)
+#, fuzzy
+#| msgid "<option>-L</option>, <option>--lock</option>"
+msgid "<option>-c</option>, <option>--check</option>"
+msgstr "<option>-L</option>, <option>--lock</option>"
+
+#: expiry.1.xml:80(para)
+#, fuzzy
+#| msgid "check and enforce password expiration policy"
+msgid "Check the password expiration of the current user."
+msgstr "sprawdzenie ważności i wymuszenie zmiany hasła"
+
+#: expiry.1.xml:86(para)
+msgid "Force a password change if the current user has an expired password."
+msgstr ""
+
+#: expiry.1.xml:121(para) chage.1.xml:294(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -7481,11 +7665,11 @@
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: chsh.1.xml:46(refpurpose)
+#: chsh.1.xml:49(refpurpose)
 msgid "change login shell"
 msgstr "zmiana powłoki zgłoszeniowej"
 
-#: chsh.1.xml:63(para)
+#: chsh.1.xml:66(para)
 #, fuzzy
 #| msgid ""
 #| "The <command>chsh</command> command changes the user login shell. This "
@@ -7503,11 +7687,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:74(para)
+#: chsh.1.xml:77(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:96(para)
+#: chsh.1.xml:112(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 "
@@ -7521,7 +7705,7 @@
 "podanie wartości pustej  pozostawia bieżącą powłokę. Bieżąca powłoka "
 "wyświetlana jest w nawiasach <emphasis>[ ]</emphasis>"
 
-#: chsh.1.xml:107(para)
+#: chsh.1.xml:123(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 "
@@ -7540,15 +7724,15 @@
 "zmiana na powłokę ograniczoną uniemożliwi użytkownikowi jakąkolwiek zmianę "
 "powłoki logowania, nawet z powrotem na dotychczasową."
 
-#: chsh.1.xml:142(filename)
+#: chsh.1.xml:158(filename)
 msgid "/etc/shells"
 msgstr "/etc/shells"
 
-#: chsh.1.xml:144(para)
+#: chsh.1.xml:160(para)
 msgid "List of valid login shells."
 msgstr "Lista dozwolonych powłok zgłoszeniowych."
 
-#: chsh.1.xml:158(para)
+#: chsh.1.xml:174(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -7562,11 +7746,11 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chpasswd.8.xml:47(refpurpose)
+#: chpasswd.8.xml:50(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "wsadowa aktualizacja haseł użytkowników"
 
-#: chpasswd.8.xml:61(para)
+#: chpasswd.8.xml:64(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 "
@@ -7577,7 +7761,7 @@
 "aktualizacji danych o grupie istniejących użytkowników. Każdy wiersz "
 "przekazywanych danych ma postać:"
 
-#: chpasswd.8.xml:66(para)
+#: chpasswd.8.xml:69(para)
 msgid ""
 "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -7585,7 +7769,7 @@
 "<emphasis remap=\"I\">nazwa_użytkownika</emphasis>:<emphasis remap=\"I"
 "\">hasło</emphasis>"
 
-#: chpasswd.8.xml:70(para)
+#: chpasswd.8.xml:73(para)
 #, fuzzy
 msgid ""
 "By default the passwords must be supplied in clear-text, and are encrypted "
@@ -7596,7 +7780,7 @@
 "haseł używany jest domyślnie algorytm DES. W trakcie zmiany hasła "
 "aktualizowany jest także wiek hasła."
 
-#: chpasswd.8.xml:75(para)
+#: chpasswd.8.xml:78(para)
 msgid ""
 "The default encryption algorithm can be defined for the system with the "
 "<option>ENCRYPT_METHOD</option> or <option>MD5_CRYPT_ENAB</option> variables "
@@ -7604,14 +7788,14 @@
 "<option>-e</option>, <option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
-#: chpasswd.8.xml:83(para)
+#: chpasswd.8.xml:86(para)
 msgid ""
 "By default, passwords are encrypted by PAM, but (even if not recommended) "
 "you can select a different encryption method with the <option>-e</option>, "
 "<option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
-#: chpasswd.8.xml:89(para)
+#: chpasswd.8.xml:92(para)
 msgid ""
 "<phrase condition=\"pam\">Except when PAM is used to encrypt the passwords,</"
 "phrase><command>chpasswd</command> first updates all the passwords in "
@@ -7619,7 +7803,7 @@
 "any user."
 msgstr ""
 
-#: chpasswd.8.xml:95(para)
+#: chpasswd.8.xml:98(para)
 msgid ""
 "When PAM is used to encrypt the passwords (and update the passwords in the "
 "system database) then if a password cannot be updated <command>chpasswd</"
@@ -7627,7 +7811,7 @@
 "an error code on exit."
 msgstr ""
 
-#: chpasswd.8.xml:101(para) chgpasswd.8.xml:81(para)
+#: chpasswd.8.xml:104(para) chgpasswd.8.xml:84(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
@@ -7635,11 +7819,11 @@
 "Polecenie to przeznaczone jest do użytku w dużych systemach, gdzie "
 "aktualizuje się wiele kont naraz."
 
-#: chpasswd.8.xml:109(para)
+#: chpasswd.8.xml:112(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:115(term)
+#: chpasswd.8.xml:118(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
@@ -7651,15 +7835,15 @@
 "<option>-c</option>, <option>--comment</option><replaceable>KOMENTARZ</"
 "replaceable>"
 
-#: chpasswd.8.xml:121(para) chgpasswd.8.xml:98(para)
+#: chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
 msgid "The available methods are DES, MD5, and NONE."
 msgstr ""
 
-#: chpasswd.8.xml:128(para)
+#: chpasswd.8.xml:131(para)
 msgid "By default, PAM is used to encrypt the passwords."
 msgstr ""
 
-#: chpasswd.8.xml:131(para)
+#: chpasswd.8.xml:134(para)
 msgid ""
 "By default (if none of the <option>-c</option>, <option>-m</option>, or "
 "<option>-e</option> options are specified), the encryption method is defined "
@@ -7667,20 +7851,20 @@
 "variables of <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: chpasswd.8.xml:142(term) chgpasswd.8.xml:108(term)
+#: chpasswd.8.xml:145(term) chgpasswd.8.xml:111(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: chpasswd.8.xml:144(para) chgpasswd.8.xml:110(para)
+#: chpasswd.8.xml:147(para) chgpasswd.8.xml:113(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr ""
 "Dostarczone na standardowe wejście hasła są traktowane jako już zakodowane."
 
-#: chpasswd.8.xml:158(term) chgpasswd.8.xml:120(term)
+#: chpasswd.8.xml:161(term) chgpasswd.8.xml:123(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
-#: chpasswd.8.xml:160(para) chgpasswd.8.xml:122(para)
+#: chpasswd.8.xml:163(para) chgpasswd.8.xml:125(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -7688,7 +7872,7 @@
 "Jeżeli dpostarczane hasła są w postaci jawnej użyj kodowania MD5 zamiast "
 "domyślnego DES."
 
-#: chpasswd.8.xml:167(term)
+#: chpasswd.8.xml:183(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
@@ -7700,14 +7884,14 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>DNI_OSTRZ</"
 "replaceable>"
 
-#: chpasswd.8.xml:187(para)
+#: chpasswd.8.xml:203(para)
 msgid ""
 "By default, the number of rounds is defined by the "
 "<option>SHA_CRYPT_MIN_ROUNDS</option> and <option>SHA_CRYPT_MAX_ROUNDS</"
 "option> variables in <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: chpasswd.8.xml:200(para) chgpasswd.8.xml:158(para)
+#: chpasswd.8.xml:216(para) chgpasswd.8.xml:174(para)
 msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
@@ -7715,17 +7899,17 @@
 "Pamiętaj żeby zabezpieczyć przed odczytem plik przekazywany na standardowe "
 "wejście polecenia."
 
-#: chpasswd.8.xml:244(filename)
+#: chpasswd.8.xml:260(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/chpasswd"
 msgstr "/etc/passwd"
 
-#: chpasswd.8.xml:246(para)
+#: chpasswd.8.xml:262(para)
 msgid "PAM configuration for <command>chpasswd</command>."
 msgstr ""
 
-#: chpasswd.8.xml:254(para)
+#: chpasswd.8.xml:270(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
@@ -7742,11 +7926,11 @@
 "citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: chgpasswd.8.xml:48(refpurpose)
+#: chgpasswd.8.xml:51(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "wsadowa aktualizacja haseł grup"
 
-#: chgpasswd.8.xml:62(para)
+#: chgpasswd.8.xml:65(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 "
@@ -7757,7 +7941,7 @@
 "aktualizacji danych o grupach istniejących użytkowników. Każdy wiersz "
 "przekazywanych danych ma postać:"
 
-#: chgpasswd.8.xml:67(para)
+#: chgpasswd.8.xml:70(para)
 msgid ""
 "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -7765,7 +7949,7 @@
 "<emphasis remap=\"I\">nazwa_grupy</emphasis>:<emphasis remap=\"I\">hasło</"
 "emphasis>"
 
-#: chgpasswd.8.xml:71(para)
+#: chgpasswd.8.xml:74(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -7774,20 +7958,20 @@
 "Domyślnie dostarczane hasła muszą być w postaci jawnej. Podczas kodowania "
 "haseł używany jest domyślnie algorytm DES."
 
-#: chgpasswd.8.xml:75(para)
+#: chgpasswd.8.xml:78(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 "
-"overwiten with the <option>-e</option>, <option>-m</option>, or <option>-c</"
-"option> options."
+"<option>ENCRYPT_METHOD</option> variable of <filename>/etc/login.defs</"
+"filename>, and can be overwiten with the <option>-e</option>, <option>-m</"
+"option>, or <option>-c</option> options."
 msgstr ""
 
-#: chgpasswd.8.xml:89(para)
+#: chgpasswd.8.xml:92(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:209(para)
+#: chgpasswd.8.xml:225(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
@@ -7802,47 +7986,15 @@
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chfn.1.xml:47(refpurpose)
+#: chfn.1.xml:49(refpurpose)
 msgid "change real user name and information"
 msgstr ""
 
-#: chfn.1.xml:53(replaceable)
-msgid "full_name"
-msgstr "full_name"
-
-#: 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:55(replaceable)
-msgid "work_ph"
-msgstr "work_ph"
-
-#: chfn.1.xml:55(arg)
-msgid "-w <placeholder-1/>"
-msgstr "-w <placeholder-1/>"
-
-#: chfn.1.xml:56(replaceable)
-msgid "home_ph"
-msgstr "home_ph"
-
-#: chfn.1.xml:57(replaceable)
-msgid "other"
-msgstr "other"
-
-#: chfn.1.xml:57(arg)
-msgid "-o <placeholder-1/>"
-msgstr "-o <placeholder-1/>"
-
-#: chfn.1.xml:64(para)
+#: chfn.1.xml:66(para)
 msgid ""
-"The <command>chfn</command> command changes user fullname, office number, "
-"office extension, and home phone number information for a user's account. "
-"This information is typically printed by "
+"The <command>chfn</command> command changes user fullname, office room "
+"number, office phone number, and home phone number information for a user's "
+"account. This information is typically printed by "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and similar programs. A normal user may only change the fields "
 "for her own account, subject to the restrictions in <filename>/etc/login."
@@ -7852,7 +8004,7 @@
 "option to change the undefined portions of the GECOS field."
 msgstr ""
 
-#: chfn.1.xml:78(para)
+#: chfn.1.xml:80(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. "
@@ -7861,8 +8013,101 @@
 "field is used to store accounting information used by other applications."
 msgstr ""
 
-#: chfn.1.xml:87(para)
+#: chfn.1.xml:93(para)
+#, fuzzy
+#| msgid "The options which apply to the <command>chsh</command> command are:"
+msgid "The options which apply to the <command>chfn</command> command are:"
+msgstr "Polecenie <command>chsh</command> posiada następujące opcje:"
+
+#: chfn.1.xml:98(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
+#| "replaceable>"
 msgid ""
+"<option>-f</option>, <option>--full-name</option><replaceable>FULL_NAME</"
+"replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>"
+
+#: chfn.1.xml:102(para)
+msgid "Change the user's full name."
+msgstr ""
+
+#: chfn.1.xml:106(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-h</option>, <option>--home-phone</option><replaceable>HOME_PHONE</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>KAT_DOMOWY</"
+"replaceable>"
+
+#: chfn.1.xml:110(para)
+msgid "Change the user's home phone number."
+msgstr ""
+
+#: chfn.1.xml:114(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-o</option>, <option>--other</option><replaceable>OTHER</replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>KAT_DOMOWY</"
+"replaceable>"
+
+#: chfn.1.xml:118(para)
+msgid ""
+"Change the user's other GECOS information. This field is used to store "
+"accounting information used by other applications, and can be changed only "
+"by a superuser."
+msgstr ""
+
+#: chfn.1.xml:126(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-r</option>, <option>--room</option><replaceable>ROOM_NUMBER</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>KAT_DOMOWY</"
+"replaceable>"
+
+#: chfn.1.xml:130(para)
+msgid "Change the user's room number."
+msgstr ""
+
+#: chfn.1.xml:147(term)
+#, fuzzy
+#| msgid "<option>-h</option>, <option>--help</option>"
+msgid "<option>-u</option>, <option>--help</option>"
+msgstr "<option>-h</option>, <option>--help</option>"
+
+#: chfn.1.xml:155(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-w</option>, <option>--work-phone</option><replaceable>WORK_PHONE</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>KAT_DOMOWY</"
+"replaceable>"
+
+#: chfn.1.xml:159(para)
+msgid "Change the user's office phone number."
+msgstr ""
+
+#: chfn.1.xml:163(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 "
 "the fields. Enter the new value to change the field, or leave the line blank "
@@ -7871,7 +8116,7 @@
 "command> prompts for the current user account."
 msgstr ""
 
-#: chfn.1.xml:132(para)
+#: chfn.1.xml:208(para)
 msgid ""
 "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -7885,11 +8130,11 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chage.1.xml:44(refpurpose)
+#: chage.1.xml:47(refpurpose)
 msgid "change user password expiry information"
 msgstr "zmiana informacji o terminie ważności hasła użytkownika"
 
-#: chage.1.xml:60(para)
+#: chage.1.xml:63(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 "
@@ -7899,11 +8144,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:70(para)
+#: chage.1.xml:73(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:75(term)
+#: chage.1.xml:78(term)
 msgid ""
 "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
 "replaceable>"
@@ -7911,7 +8156,7 @@
 "<option>-d</option>, <option>--lastday</option><replaceable>OSTATNI</"
 "replaceable>"
 
-#: chage.1.xml:79(para)
+#: chage.1.xml:82(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 "
@@ -7921,7 +8166,7 @@
 "Data ważności może być takze prezekazana w formacie RRRR-MM-DD (lub formacie "
 "używanym lokalnie)."
 
-#: chage.1.xml:87(term)
+#: chage.1.xml:90(term)
 msgid ""
 "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -7929,7 +8174,7 @@
 "<option>-E</option>, <option>--expiredate</option><replaceable>DATA_WAŻN</"
 "replaceable>"
 
-#: chage.1.xml:91(para)
+#: chage.1.xml:94(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 "
@@ -7944,7 +8189,7 @@
 "konto jest zablokowane musi skontaktować się z administratorem systemu zanim "
 "będzie mógł z niego ponownie skorzystać."
 
-#: chage.1.xml:99(para)
+#: chage.1.xml:102(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>EXPIRE_DATE</replaceable> will remove an account expiration "
@@ -7953,7 +8198,7 @@
 "Przekazanie <emphasis remap=\"I\">-1</emphasis> jako <replaceable>DATA_WAŻN</"
 "replaceable> usuwa ograniczenie ważności konta użytkownika."
 
-#: chage.1.xml:113(term)
+#: chage.1.xml:116(term)
 msgid ""
 "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -7961,7 +8206,7 @@
 "<option>-I</option>, <option>--inactive</option><replaceable>NIEAKTYWNE</"
 "replaceable>"
 
-#: chage.1.xml:117(para)
+#: chage.1.xml:120(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 "
@@ -7974,7 +8219,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:124(para)
+#: chage.1.xml:127(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>INACTIVE</replaceable> will remove an account's inactivity."
@@ -7983,11 +8228,11 @@
 "<replaceable>NIEAKTYWNE</replaceable> usuwa ograniczenie nieaktywniści konta "
 "użytkownika."
 
-#: chage.1.xml:136(para)
+#: chage.1.xml:139(para)
 msgid "Show account aging information."
 msgstr "Wyświetlenie informacji o terminach ważności konta i hasła."
 
-#: chage.1.xml:142(term)
+#: chage.1.xml:145(term)
 msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -7995,7 +8240,7 @@
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DNI</"
 "replaceable>"
 
-#: chage.1.xml:154(term)
+#: chage.1.xml:157(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -8003,7 +8248,7 @@
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DNI</"
 "replaceable>"
 
-#: chage.1.xml:158(para)
+#: chage.1.xml:161(para)
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
@@ -8019,7 +8264,7 @@
 "wyprzedzeniem przez wykorzystanie opcji <option>-W</option>, ostrzegającej "
 "zawczasu użytkownika o zbliżającym się terminie zmiany."
 
-#: chage.1.xml:167(para)
+#: chage.1.xml:170(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as "
 "<replaceable>MAX_DAYS</replaceable> will remove checking a password's "
@@ -8028,7 +8273,7 @@
 "Przekazanie <emphasis remap=\"I\">-1</emphasis> jako <replaceable>MAX_DAYS</"
 "replaceable> usuwa sprawdzanie wazności hasła."
 
-#: chage.1.xml:175(term)
+#: chage.1.xml:191(term)
 msgid ""
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -8036,7 +8281,7 @@
 "<option>-W</option>, <option>--warndays</option><replaceable>DNI_OSTRZ</"
 "replaceable>"
 
-#: chage.1.xml:179(para)
+#: chage.1.xml:195(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 "
@@ -8047,7 +8292,7 @@
 "ważności hasła. Od tego dnia użytkownik będzie ostrzegany o nadchodzącym "
 "terminie zmiany hasła."
 
-#: chage.1.xml:188(para)
+#: chage.1.xml:204(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 "
@@ -8061,7 +8306,7 @@
 "wartości pustej pozostawia wartość bieżącą. Bieżąca wartość pola wyświetlana "
 "jest w nawiasach <emphasis>[ ]</emphasis>."
 
-#: chage.1.xml:198(para)
+#: chage.1.xml:214(para)
 msgid ""
 "The <command>chage</command> program requires a shadow password file to be "
 "available."
@@ -8069,7 +8314,7 @@
 "Program <command>chage</command> wymaga do działania chronionego pliku haseł "
 "użytkowników (shadow)."
 
-#: chage.1.xml:202(para)
+#: chage.1.xml:218(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 "
@@ -8079,15 +8324,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:267(replaceable)
+#: chage.1.xml:283(replaceable)
 msgid "15"
 msgstr "15"
 
-#: chage.1.xml:269(para)
+#: chage.1.xml:285(para)
 msgid "can't find the shadow password file"
 msgstr "nie można znaleźć pliku shadow"
 
-#: chage.1.xml:245(para)
+#: chage.1.xml:261(para)
 msgid ""
 "The <command>chage</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -8100,8 +8345,65 @@
 msgid "translator-credits"
 msgstr "Tomasz Kłoczko <kloczek at pld.org.pl>, 2006"
 
+#~ msgid "-q"
+#~ msgstr "-q"
+
+#~ msgid "-s"
+#~ msgstr "-s"
+
 #, 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>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+#~ "\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+#~ "phrase><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><refentrytitle>usermod</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid "new_users"
+#~ msgstr "new_users"
+
+#~ msgid "full_name"
+#~ msgstr "full_name"
+
+#~ msgid "-f <placeholder-1/>"
+#~ msgstr "-f <placeholder-1/>"
+
+#~ msgid "room_no"
+#~ msgstr "room_no"
+
+#~ msgid "work_ph"
+#~ msgstr "work_ph"
+
+#~ msgid "-w <placeholder-1/>"
+#~ msgstr "-w <placeholder-1/>"
+
+#~ msgid "home_ph"
+#~ msgstr "home_ph"
+
+#~ msgid "other"
+#~ msgstr "other"
+
+#~ msgid "-o <placeholder-1/>"
+#~ msgstr "-o <placeholder-1/>"
+
+#, fuzzy
+#~| msgid ""
 #~| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
 #~| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
 #~| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
@@ -8338,13 +8640,6 @@
 #~ 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"
 

Modified: upstream/trunk/man/po/ru.po
===================================================================
--- upstream/trunk/man/po/ru.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/man/po/ru.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1:4.0.18.2-1\n"
-"POT-Creation-Date: 2010-08-29 17:54+0200\n"
+"POT-Creation-Date: 2011-11-13 18:43+0100\n"
 "PO-Revision-Date: 2011-06-25 11:12+0200\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -16,83 +16,113 @@
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: vipw.8.xml:39(refentrytitle) vipw.8.xml:44(refname) vipw.8.xml:53(command)
-#: login.defs.5.xml:477(term)
+#: vipw.8.xml:40(refentrytitle) vipw.8.xml:47(refname) vipw.8.xml:56(command)
+#: login.defs.5.xml:480(term)
 msgid "vipw"
 msgstr "vipw"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><manvolnum>
-#: vipw.8.xml:40(manvolnum) usermod.8.xml:42(manvolnum)
-#: userdel.8.xml:44(manvolnum) userdel.8.xml:203(replaceable)
-#: useradd.8.xml:53(manvolnum) pwconv.8.xml:44(manvolnum)
-#: pwck.8.xml:44(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:130(replaceable)
-#: groupadd.8.xml:42(manvolnum) faillog.8.xml:35(manvolnum)
-#: faillog.5.xml:86(manvolnum) chpasswd.8.xml:42(manvolnum)
-#: chgpasswd.8.xml:43(manvolnum)
+#: vipw.8.xml:41(manvolnum) usermod.8.xml:43(manvolnum)
+#: userdel.8.xml:45(manvolnum) userdel.8.xml:219(replaceable)
+#: useradd.8.xml:54(manvolnum) pwconv.8.xml:45(manvolnum)
+#: pwck.8.xml:45(manvolnum) nologin.8.xml:39(manvolnum)
+#: newusers.8.xml:52(manvolnum) logoutd.8.xml:39(manvolnum)
+#: lastlog.8.xml:40(manvolnum) grpck.8.xml:40(manvolnum)
+#: groupmod.8.xml:40(manvolnum) groupmems.8.xml:40(manvolnum)
+#: groupdel.8.xml:40(manvolnum) groupdel.8.xml:163(replaceable)
+#: groupadd.8.xml:42(manvolnum) faillog.8.xml:39(manvolnum)
+#: faillog.5.xml:92(manvolnum) chpasswd.8.xml:43(manvolnum)
+#: chgpasswd.8.xml:44(manvolnum)
 msgid "8"
 msgstr "8"
 
 # type: Content of: <refentry><refmeta><refmiscinfo>
-#: vipw.8.xml:41(refmiscinfo) usermod.8.xml:43(refmiscinfo)
-#: userdel.8.xml:45(refmiscinfo) useradd.8.xml:54(refmiscinfo)
-#: pwconv.8.xml:45(refmiscinfo) pwck.8.xml:45(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:43(refmiscinfo) faillog.8.xml:36(refmiscinfo)
-#: chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
+#: vipw.8.xml:42(refmiscinfo) usermod.8.xml:44(refmiscinfo)
+#: userdel.8.xml:46(refmiscinfo) useradd.8.xml:55(refmiscinfo)
+#: pwconv.8.xml:46(refmiscinfo) pwck.8.xml:46(refmiscinfo)
+#: nologin.8.xml:40(refmiscinfo) newusers.8.xml:53(refmiscinfo)
+#: logoutd.8.xml:40(refmiscinfo) lastlog.8.xml:41(refmiscinfo)
+#: grpck.8.xml:41(refmiscinfo) groupmod.8.xml:41(refmiscinfo)
+#: groupmems.8.xml:41(refmiscinfo) groupdel.8.xml:41(refmiscinfo)
+#: groupadd.8.xml:43(refmiscinfo) faillog.8.xml:40(refmiscinfo)
+#: chpasswd.8.xml:44(refmiscinfo) chgpasswd.8.xml:45(refmiscinfo)
 msgid "System Management Commands"
 msgstr "Команды управления системой"
 
+# type: Content of: <refentry><refsect1><para><emphasis>
+#: vipw.8.xml:43(refmiscinfo) usermod.8.xml:45(refmiscinfo)
+#: userdel.8.xml:47(refmiscinfo) useradd.8.xml:56(refmiscinfo)
+#: suauth.5.xml:41(refmiscinfo) su.1.xml:58(refmiscinfo)
+#: sg.1.xml:42(refmiscinfo) shadow.5.xml:41(refmiscinfo)
+#: shadow.3.xml:41(refmiscinfo) pwconv.8.xml:47(refmiscinfo)
+#: pwck.8.xml:47(refmiscinfo) porttime.5.xml:41(refmiscinfo)
+#: passwd.5.xml:41(refmiscinfo) passwd.1.xml:48(refmiscinfo)
+#: nologin.8.xml:41(refmiscinfo) newusers.8.xml:54(refmiscinfo)
+#: newgrp.1.xml:42(refmiscinfo) logoutd.8.xml:41(refmiscinfo)
+#: login.defs.5.xml:104(refmiscinfo) login.access.5.xml:42(refmiscinfo)
+#: login.1.xml:74(refmiscinfo) limits.5.xml:42(refmiscinfo)
+#: lastlog.8.xml:42(refmiscinfo) gshadow.5.xml:40(refmiscinfo)
+#: grpck.8.xml:42(refmiscinfo) groups.1.xml:41(refmiscinfo)
+#: groupmod.8.xml:42(refmiscinfo) groupmems.8.xml:42(refmiscinfo)
+#: groupdel.8.xml:42(refmiscinfo) groupadd.8.xml:44(refmiscinfo)
+#: gpasswd.1.xml:46(refmiscinfo) faillog.8.xml:41(refmiscinfo)
+#: faillog.5.xml:41(refmiscinfo) expiry.1.xml:45(refmiscinfo)
+#: chsh.1.xml:44(refmiscinfo) chpasswd.8.xml:45(refmiscinfo)
+#: chgpasswd.8.xml:46(refmiscinfo) chfn.1.xml:44(refmiscinfo)
+#: chage.1.xml:42(refmiscinfo)
+#, fuzzy
+#| msgid "shadow"
+msgid "shadow-utils"
+msgstr "shadow"
+
 # type: Content of: <refentry><refsect1><para><command>
-#: vipw.8.xml:45(refname) vipw.8.xml:59(command)
+#: vipw.8.xml:48(refname) vipw.8.xml:62(command)
 msgid "vigr"
 msgstr "vigr"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: vipw.8.xml:46(refpurpose)
+#: vipw.8.xml:49(refpurpose)
 msgid "edit the password, group, shadow-password or shadow-group file"
 msgstr ""
 "служат для редактирования файлов паролей, групп, теневых паролей "
 "пользователей или групп."
 
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: vipw.8.xml:55(replaceable) vipw.8.xml:61(replaceable)
-#: usermod.8.xml:54(replaceable) userdel.8.xml:54(arg)
-#: useradd.8.xml:64(replaceable) useradd.8.xml:76(replaceable)
-#: su.1.xml:66(replaceable) passwd.1.xml:57(replaceable)
-#: newusers.8.xml:63(replaceable) lastlog.8.xml:48(replaceable)
-#: groupmod.8.xml:51(replaceable) groupadd.8.xml:54(replaceable)
-#: faillog.8.xml:47(replaceable) chsh.1.xml:53(replaceable)
-#: chpasswd.8.xml:54(replaceable) chgpasswd.8.xml:55(replaceable)
-#: chage.1.xml:50(replaceable)
+#: vipw.8.xml:58(replaceable) vipw.8.xml:64(replaceable)
+#: usermod.8.xml:57(replaceable) userdel.8.xml:57(arg)
+#: useradd.8.xml:67(replaceable) useradd.8.xml:79(replaceable)
+#: su.1.xml:69(replaceable) pwconv.8.xml:62(replaceable)
+#: pwconv.8.xml:68(replaceable) pwconv.8.xml:74(replaceable)
+#: pwconv.8.xml:80(replaceable) pwck.8.xml:58(arg)
+#: passwd.1.xml:60(replaceable) newusers.8.xml:66(replaceable)
+#: lastlog.8.xml:54(replaceable) grpck.8.xml:53(arg)
+#: groupmod.8.xml:54(replaceable) groupdel.8.xml:54(replaceable)
+#: groupadd.8.xml:56(replaceable) faillog.8.xml:53(replaceable)
+#: chsh.1.xml:56(replaceable) chpasswd.8.xml:57(replaceable)
+#: chgpasswd.8.xml:58(replaceable) chfn.1.xml:56(replaceable)
+#: chage.1.xml:53(replaceable)
 msgid "options"
 msgstr "параметры"
 
 # type: Content of: <refentry><refsect1><title>
-#: vipw.8.xml:67(title) usermod.8.xml:61(title) userdel.8.xml:62(title)
-#: useradd.8.xml:82(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:71(title) pwck.8.xml:86(title)
-#: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
-#: nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title)
-#: logoutd.8.xml:50(title) login.defs.5.xml:110(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:63(title) gpasswd.1.xml:72(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:59(title)
+#: vipw.8.xml:70(title) usermod.8.xml:64(title) userdel.8.xml:65(title)
+#: useradd.8.xml:85(title) suauth.5.xml:56(title) su.1.xml:80(title)
+#: sg.1.xml:62(title) shadow.5.xml:50(title) shadow.3.xml:99(title)
+#: shadow.3.xml:155(title) pwconv.8.xml:86(title) pwck.8.xml:73(title)
+#: porttime.5.xml:50(title) passwd.5.xml:50(title) passwd.1.xml:69(title)
+#: nologin.8.xml:56(title) newusers.8.xml:75(title) newgrp.1.xml:58(title)
+#: logoutd.8.xml:56(title) login.defs.5.xml:113(title)
+#: login.access.5.xml:51(title) login.1.xml:106(title) limits.5.xml:52(title)
+#: lastlog.8.xml:60(title) gshadow.5.xml:49(title) grpck.8.xml:64(title)
+#: groups.1.xml:59(title) groupmod.8.xml:61(title) groupmems.8.xml:63(title)
+#: groupdel.8.xml:61(title) groupadd.8.xml:65(title) gpasswd.1.xml:75(title)
+#: faillog.8.xml:59(title) faillog.5.xml:50(title) expiry.1.xml:63(title)
+#: chsh.1.xml:65(title) chpasswd.8.xml:63(title) chgpasswd.8.xml:64(title)
+#: chfn.1.xml:65(title) chage.1.xml:62(title)
 msgid "DESCRIPTION"
 msgstr "ОПИСАНИЕ"
 
-#: vipw.8.xml:68(para)
+#: vipw.8.xml:71(para)
 msgid ""
 "The <command>vipw</command> and <command>vigr</command> commands edits the "
 "files <filename>/etc/passwd</filename> and <filename>/etc/group</filename>, "
@@ -117,104 +147,143 @@
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><title>
-#: vipw.8.xml:85(title) usermod.8.xml:69(title) userdel.8.xml:71(title)
-#: useradd.8.xml:100(title) su.1.xml:123(title) pwck.8.xml:170(title)
-#: passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title)
-#: lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title)
-#: groupmems.8.xml:75(title) groupadd.8.xml:72(title) gpasswd.1.xml:112(title)
-#: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:108(title)
-#: chgpasswd.8.xml:88(title) chage.1.xml:69(title)
+#: vipw.8.xml:88(title) usermod.8.xml:72(title) userdel.8.xml:74(title)
+#: useradd.8.xml:103(title) su.1.xml:126(title) pwconv.8.xml:168(title)
+#: pwck.8.xml:157(title) passwd.1.xml:155(title) newusers.8.xml:244(title)
+#: login.1.xml:191(title) lastlog.8.xml:72(title) grpck.8.xml:128(title)
+#: groupmod.8.xml:70(title) groupmems.8.xml:78(title) groupdel.8.xml:69(title)
+#: groupadd.8.xml:74(title) gpasswd.1.xml:115(title) faillog.8.xml:70(title)
+#: expiry.1.xml:72(title) chsh.1.xml:76(title) chpasswd.8.xml:111(title)
+#: chgpasswd.8.xml:91(title) chfn.1.xml:92(title) chage.1.xml:72(title)
 msgid "OPTIONS"
 msgstr "ПАРАМЕТРЫ"
 
-#: vipw.8.xml:86(para)
+#: vipw.8.xml:89(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:92(term)
+#: vipw.8.xml:95(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:94(para)
+#: vipw.8.xml:97(para)
 msgid "Edit group database."
 msgstr "Редактирует базу данных групп."
 
-#: vipw.8.xml:98(term) userdel.8.xml:101(term) useradd.8.xml:250(term)
-#: passwd.1.xml:192(term) newusers.8.xml:257(term) lastlog.8.xml:82(term)
-#: groupmod.8.xml:98(term) groupmems.8.xml:117(term) groupadd.8.xml:107(term)
-#: gpasswd.1.xml:151(term) faillog.8.xml:97(term) chsh.1.xml:79(term)
-#: chpasswd.8.xml:150(term) chgpasswd.8.xml:114(term) chage.1.xml:107(term)
+#: vipw.8.xml:101(term) userdel.8.xml:104(term) useradd.8.xml:253(term)
+#: pwconv.8.xml:176(term) pwck.8.xml:167(term) passwd.1.xml:195(term)
+#: newusers.8.xml:262(term) lastlog.8.xml:88(term) grpck.8.xml:138(term)
+#: groupmod.8.xml:105(term) groupmems.8.xml:120(term) groupdel.8.xml:76(term)
+#: groupadd.8.xml:109(term) gpasswd.1.xml:154(term) faillog.8.xml:103(term)
+#: expiry.1.xml:93(term) chsh.1.xml:82(term) chpasswd.8.xml:153(term)
+#: chgpasswd.8.xml:117(term) chage.1.xml:110(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:100(para) userdel.8.xml:103(para) useradd.8.xml:252(para)
-#: passwd.1.xml:194(para) newusers.8.xml:259(para) lastlog.8.xml:86(para)
-#: groupmod.8.xml:100(para) groupmems.8.xml:119(para) groupadd.8.xml:109(para)
-#: gpasswd.1.xml:153(para) faillog.8.xml:99(para) chsh.1.xml:81(para)
-#: chpasswd.8.xml:152(para) chgpasswd.8.xml:116(para) chage.1.xml:109(para)
+#: vipw.8.xml:103(para) userdel.8.xml:106(para) useradd.8.xml:255(para)
+#: pwconv.8.xml:178(para) pwck.8.xml:169(para) passwd.1.xml:197(para)
+#: newusers.8.xml:264(para) lastlog.8.xml:92(para) grpck.8.xml:140(para)
+#: groupmod.8.xml:107(para) groupmems.8.xml:122(para) groupdel.8.xml:78(para)
+#: groupadd.8.xml:111(para) gpasswd.1.xml:156(para) faillog.8.xml:105(para)
+#: expiry.1.xml:95(para) chsh.1.xml:84(para) chpasswd.8.xml:155(para)
+#: chgpasswd.8.xml:119(para) chfn.1.xml:151(para) chage.1.xml:112(para)
 msgid "Display help message and exit."
 msgstr "Показать краткую справку и закончить работу."
 
-#: vipw.8.xml:104(term)
+#: vipw.8.xml:107(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:106(para)
+#: vipw.8.xml:109(para)
 msgid "Edit passwd database."
 msgstr "Редактировать базу данных passwd."
 
-#: vipw.8.xml:110(term) passwd.1.xml:259(term)
+#: vipw.8.xml:113(term) pwck.8.xml:173(term) passwd.1.xml:262(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:112(para) passwd.1.xml:263(para)
+#: vipw.8.xml:115(para) passwd.1.xml:266(para)
 msgid "Quiet mode."
 msgstr "Не выводить сообщений при работе."
 
-#: vipw.8.xml:116(term)
+#: vipw.8.xml:119(term) usermod.8.xml:298(term) userdel.8.xml:127(term)
+#: useradd.8.xml:438(term) pwconv.8.xml:182(term) pwck.8.xml:190(term)
+#: passwd.1.xml:282(term) newusers.8.xml:287(term) lastlog.8.xml:96(term)
+#: grpck.8.xml:154(term) groupmod.8.xml:156(term) groupmems.8.xml:143(term)
+#: groupdel.8.xml:82(term) groupadd.8.xml:184(term) faillog.8.xml:163(term)
+#: chsh.1.xml:88(term) chpasswd.8.xml:170(term) chgpasswd.8.xml:132(term)
+#: chfn.1.xml:134(term) chage.1.xml:178(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-R</option>, <option>--root</option><replaceable>CHROOT_DIR</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option> <replaceable>ДОМАШНИЙ_КАТАЛОГ</"
+"replaceable>"
+
+#: vipw.8.xml:124(para) usermod.8.xml:303(para) userdel.8.xml:132(para)
+#: useradd.8.xml:443(para) pwconv.8.xml:187(para) pwck.8.xml:195(para)
+#: passwd.1.xml:287(para) newusers.8.xml:292(para) lastlog.8.xml:101(para)
+#: grpck.8.xml:159(para) groupmod.8.xml:161(para) groupmems.8.xml:148(para)
+#: groupdel.8.xml:87(para) groupadd.8.xml:189(para) gpasswd.1.xml:167(para)
+#: faillog.8.xml:168(para) chsh.1.xml:93(para) chpasswd.8.xml:175(para)
+#: chgpasswd.8.xml:137(para) chfn.1.xml:139(para) chage.1.xml:183(para)
+#, fuzzy
+msgid ""
+"Apply changes in the <replaceable>CHROOT_DIR</replaceable> directory and use "
+"the configuration files from the <replaceable>CHROOT_DIR</replaceable> "
+"directory."
+msgstr ""
+"Имя группы будет изменено с <emphasis remap=\"I\">ГРУППА</emphasis> на "
+"<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
+
+#: vipw.8.xml:132(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:118(para)
+#: vipw.8.xml:134(para)
 msgid "Edit shadow or gshadow database."
 msgstr "Редактировать базу данных shadow или gshadow."
 
-#: vipw.8.xml:122(term)
+#: vipw.8.xml:138(term)
 #, fuzzy
 #| msgid "<option>-q</option>, <option>--quiet</option>"
 msgid "<option>-u</option>, <option>--user</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:124(para)
+#: vipw.8.xml:140(para)
 msgid "Indicates which user's tcb shadow file to edit."
 msgstr ""
 
-#: vipw.8.xml:131(title) usermod.8.xml:374(title) userdel.8.xml:127(title)
-#: useradd.8.xml:629(title) su.1.xml:310(title) sg.1.xml:76(title)
-#: pwconv.8.xml:164(title) pwck.8.xml:230(title) passwd.1.xml:356(title)
-#: newusers.8.xml:324(title) newgrp.1.xml:87(title) login.1.xml:272(title)
-#: grpck.8.xml:173(title) groupmod.8.xml:152(title) groupmems.8.xml:162(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:185(title) gpasswd.1.xml:226(title)
-#: chsh.1.xml:120(title) chpasswd.8.xml:207(title) chgpasswd.8.xml:169(title)
-#: chfn.1.xml:99(title) chage.1.xml:210(title)
+#: vipw.8.xml:147(title) usermod.8.xml:404(title) userdel.8.xml:143(title)
+#: useradd.8.xml:645(title) su.1.xml:320(title) sg.1.xml:79(title)
+#: pwconv.8.xml:209(title) pwck.8.xml:234(title) passwd.1.xml:372(title)
+#: newusers.8.xml:342(title) newgrp.1.xml:90(title) login.1.xml:275(title)
+#: grpck.8.xml:191(title) groupmod.8.xml:172(title) groupmems.8.xml:178(title)
+#: groupdel.8.xml:110(title) groupadd.8.xml:200(title)
+#: gpasswd.1.xml:244(title) chsh.1.xml:136(title) chpasswd.8.xml:223(title)
+#: chgpasswd.8.xml:185(title) chfn.1.xml:175(title) chage.1.xml:226(title)
 msgid "CONFIGURATION"
 msgstr ""
 
-#: vipw.8.xml:132(para) usermod.8.xml:375(para) userdel.8.xml:128(para)
-#: useradd.8.xml:630(para) su.1.xml:311(para) sg.1.xml:77(para)
-#: pwck.8.xml:231(para) passwd.1.xml:357(para) newusers.8.xml:325(para)
-#: newgrp.1.xml:88(para) login.1.xml:273(para) grpck.8.xml:174(para)
-#: groupmod.8.xml:153(para) groupmems.8.xml:163(para) groupdel.8.xml:78(para)
-#: groupadd.8.xml:186(para) gpasswd.1.xml:227(para) chsh.1.xml:121(para)
-#: chpasswd.8.xml:208(para) chgpasswd.8.xml:170(para) chfn.1.xml:100(para)
-#: chage.1.xml:211(para)
+#: vipw.8.xml:148(para) usermod.8.xml:405(para) userdel.8.xml:144(para)
+#: useradd.8.xml:646(para) su.1.xml:321(para) sg.1.xml:80(para)
+#: pwck.8.xml:235(para) passwd.1.xml:373(para) newusers.8.xml:343(para)
+#: newgrp.1.xml:91(para) login.1.xml:276(para) grpck.8.xml:192(para)
+#: groupmod.8.xml:173(para) groupmems.8.xml:179(para) groupdel.8.xml:111(para)
+#: groupadd.8.xml:201(para) gpasswd.1.xml:245(para) chsh.1.xml:137(para)
+#: chpasswd.8.xml:224(para) chgpasswd.8.xml:186(para) chfn.1.xml:176(para)
+#: chage.1.xml:227(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of this tool:"
@@ -244,156 +313,158 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>."
 
-#: vipw.8.xml:143(title)
+#: vipw.8.xml:159(title)
 msgid "ENVIRONMENT"
 msgstr ""
 
-#: vipw.8.xml:146(option)
+#: vipw.8.xml:162(option)
 msgid "VISUAL"
 msgstr ""
 
-#: vipw.8.xml:148(para)
+#: vipw.8.xml:164(para)
 msgid "Editor to be used."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
-#: vipw.8.xml:152(option)
+#: vipw.8.xml:168(option)
 #, fuzzy
 #| msgid "HYSTORY"
 msgid "EDITOR"
 msgstr "ИСТОРИЯ"
 
-#: vipw.8.xml:154(para)
+#: vipw.8.xml:170(para)
 msgid "Editor to be used if <option>VISUAL</option> is not set."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
-#: vipw.8.xml:161(title) usermod.8.xml:389(title) userdel.8.xml:144(title)
-#: useradd.8.xml:655(title) suauth.5.xml:168(title) su.1.xml:338(title)
-#: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
-#: pwconv.8.xml:187(title) pwck.8.xml:247(title) porttime.5.xml:105(title)
-#: passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(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:170(title) lastlog.8.xml:147(title)
-#: gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title)
-#: groupmod.8.xml:164(title) groupmems.8.xml:174(title)
-#: groupdel.8.xml:89(title) groupadd.8.xml:199(title) gpasswd.1.xml:241(title)
-#: faillog.8.xml:210(title) faillog.5.xml:71(title) expiry.1.xml:68(title)
-#: chsh.1.xml:133(title) chpasswd.8.xml:223(title) chgpasswd.8.xml:184(title)
-#: chfn.1.xml:113(title) chage.1.xml:222(title)
+#: vipw.8.xml:177(title) usermod.8.xml:419(title) userdel.8.xml:160(title)
+#: useradd.8.xml:671(title) suauth.5.xml:174(title) su.1.xml:348(title)
+#: sg.1.xml:91(title) shadow.5.xml:236(title) shadow.3.xml:207(title)
+#: pwconv.8.xml:232(title) pwck.8.xml:251(title) porttime.5.xml:111(title)
+#: passwd.5.xml:122(title) passwd.1.xml:390(title) newusers.8.xml:375(title)
+#: newgrp.1.xml:102(title) logoutd.8.xml:70(title)
+#: login.access.5.xml:102(title) login.1.xml:319(title)
+#: limits.5.xml:176(title) lastlog.8.xml:166(title) gshadow.5.xml:147(title)
+#: grpck.8.xml:203(title) groups.1.xml:81(title) groupmod.8.xml:184(title)
+#: groupmems.8.xml:190(title) groupdel.8.xml:122(title)
+#: groupadd.8.xml:214(title) gpasswd.1.xml:259(title) faillog.8.xml:229(title)
+#: faillog.5.xml:77(title) expiry.1.xml:102(title) chsh.1.xml:149(title)
+#: chpasswd.8.xml:239(title) chgpasswd.8.xml:200(title) chfn.1.xml:189(title)
+#: chage.1.xml:238(title)
 msgid "FILES"
 msgstr "ФАЙЛЫ"
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: vipw.8.xml:164(filename) usermod.8.xml:392(filename)
-#: userdel.8.xml:147(filename) useradd.8.xml:670(filename)
-#: sg.1.xml:103(filename) pwck.8.xml:250(filename)
-#: newusers.8.xml:372(filename) newgrp.1.xml:114(filename)
-#: gshadow.5.xml:144(filename) grpck.8.xml:188(filename)
-#: groups.1.xml:78(filename) groupmod.8.xml:167(filename)
-#: groupmems.8.xml:177(filename) groupdel.8.xml:92(filename)
-#: groupadd.8.xml:202(filename) gpasswd.1.xml:50(filename)
-#: gpasswd.1.xml:53(filename) gpasswd.1.xml:244(filename)
-#: chgpasswd.8.xml:187(filename)
+#: vipw.8.xml:180(filename) usermod.8.xml:422(filename)
+#: userdel.8.xml:163(filename) useradd.8.xml:686(filename)
+#: sg.1.xml:106(filename) pwck.8.xml:254(filename)
+#: newusers.8.xml:390(filename) newgrp.1.xml:117(filename)
+#: gshadow.5.xml:150(filename) grpck.8.xml:206(filename)
+#: groups.1.xml:84(filename) groupmod.8.xml:187(filename)
+#: groupmems.8.xml:193(filename) groupdel.8.xml:125(filename)
+#: groupadd.8.xml:217(filename) gpasswd.1.xml:53(filename)
+#: gpasswd.1.xml:56(filename) gpasswd.1.xml:262(filename)
+#: chgpasswd.8.xml:203(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:166(para) usermod.8.xml:394(para) userdel.8.xml:149(para)
-#: useradd.8.xml:672(para) sg.1.xml:105(para) pwck.8.xml:252(para)
-#: newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para)
-#: grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
-#: groupmems.8.xml:179(para) groupdel.8.xml:94(para) groupadd.8.xml:204(para)
-#: gpasswd.1.xml:246(para) chgpasswd.8.xml:189(para)
+#: vipw.8.xml:182(para) usermod.8.xml:424(para) userdel.8.xml:165(para)
+#: useradd.8.xml:688(para) sg.1.xml:108(para) pwck.8.xml:256(para)
+#: newusers.8.xml:392(para) newgrp.1.xml:119(para) gshadow.5.xml:152(para)
+#: grpck.8.xml:208(para) groups.1.xml:86(para) groupmod.8.xml:189(para)
+#: groupmems.8.xml:195(para) groupdel.8.xml:127(para) groupadd.8.xml:219(para)
+#: gpasswd.1.xml:264(para) chgpasswd.8.xml:205(para)
 msgid "Group account information."
 msgstr "содержит информацию о группах"
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: vipw.8.xml:170(filename) usermod.8.xml:398(filename)
-#: useradd.8.xml:676(filename) sg.1.xml:109(filename)
-#: newusers.8.xml:378(filename) newgrp.1.xml:120(filename)
-#: gshadow.5.xml:150(filename) grpck.8.xml:194(filename)
-#: groupmod.8.xml:173(filename) groupmems.8.xml:183(filename)
-#: groupdel.8.xml:98(filename) groupadd.8.xml:208(filename)
-#: gpasswd.1.xml:54(filename) gpasswd.1.xml:250(filename)
-#: chgpasswd.8.xml:193(filename)
+#: vipw.8.xml:186(filename) usermod.8.xml:428(filename)
+#: useradd.8.xml:692(filename) sg.1.xml:112(filename)
+#: newusers.8.xml:396(filename) newgrp.1.xml:123(filename)
+#: gshadow.5.xml:156(filename) grpck.8.xml:212(filename)
+#: groupmod.8.xml:193(filename) groupmems.8.xml:199(filename)
+#: groupdel.8.xml:131(filename) groupadd.8.xml:223(filename)
+#: gpasswd.1.xml:57(filename) gpasswd.1.xml:268(filename)
+#: chgpasswd.8.xml:209(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:172(para) usermod.8.xml:400(para) useradd.8.xml:678(para)
-#: sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para)
-#: gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para)
-#: groupdel.8.xml:100(para) groupadd.8.xml:210(para) gpasswd.1.xml:252(para)
-#: chgpasswd.8.xml:195(para)
+#: vipw.8.xml:188(para) usermod.8.xml:430(para) useradd.8.xml:694(para)
+#: sg.1.xml:114(para) newusers.8.xml:398(para) newgrp.1.xml:125(para)
+#: gshadow.5.xml:158(para) grpck.8.xml:214(para) groupmod.8.xml:195(para)
+#: groupdel.8.xml:133(para) groupadd.8.xml:225(para) gpasswd.1.xml:270(para)
+#: chgpasswd.8.xml:211(para)
 msgid "Secure group account information."
 msgstr "содержит защищаемую информацию о группах"
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: vipw.8.xml:176(filename) usermod.8.xml:404(filename)
-#: userdel.8.xml:159(filename) useradd.8.xml:658(filename)
-#: su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
-#: pwck.8.xml:256(filename) passwd.5.xml:119(filename)
-#: passwd.1.xml:377(filename) newusers.8.xml:360(filename)
-#: newgrp.1.xml:102(filename) login.1.xml:331(filename)
-#: grpck.8.xml:200(filename) expiry.1.xml:71(filename)
-#: chsh.1.xml:136(filename) chpasswd.8.xml:226(filename)
-#: chfn.1.xml:122(filename) chage.1.xml:226(filename)
+#: vipw.8.xml:192(filename) usermod.8.xml:434(filename)
+#: userdel.8.xml:175(filename) useradd.8.xml:674(filename)
+#: su.1.xml:351(filename) sg.1.xml:94(filename) shadow.5.xml:239(filename)
+#: pwck.8.xml:260(filename) passwd.5.xml:125(filename)
+#: passwd.1.xml:393(filename) newusers.8.xml:378(filename)
+#: newgrp.1.xml:105(filename) login.1.xml:334(filename)
+#: grpck.8.xml:218(filename) groupmod.8.xml:199(filename)
+#: expiry.1.xml:105(filename) chsh.1.xml:152(filename)
+#: chpasswd.8.xml:242(filename) chfn.1.xml:198(filename)
+#: chage.1.xml:242(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:178(para) usermod.8.xml:406(para) userdel.8.xml:161(para)
-#: useradd.8.xml:660(para) su.1.xml:343(para) sg.1.xml:93(para)
-#: shadow.5.xml:235(para) pwck.8.xml:258(para) passwd.5.xml:121(para)
-#: passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
-#: login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para)
-#: chsh.1.xml:138(para) chpasswd.8.xml:228(para) chfn.1.xml:124(para)
-#: chage.1.xml:229(para)
+#: vipw.8.xml:194(para) usermod.8.xml:436(para) userdel.8.xml:177(para)
+#: useradd.8.xml:676(para) su.1.xml:353(para) sg.1.xml:96(para)
+#: shadow.5.xml:241(para) pwck.8.xml:262(para) passwd.5.xml:127(para)
+#: passwd.1.xml:395(para) newusers.8.xml:380(para) newgrp.1.xml:107(para)
+#: login.1.xml:336(para) grpck.8.xml:220(para) groupmod.8.xml:201(para)
+#: expiry.1.xml:107(para) chsh.1.xml:154(para) chpasswd.8.xml:244(para)
+#: chfn.1.xml:200(para) chage.1.xml:245(para)
 msgid "User account information."
 msgstr "содержит информацию о пользователях"
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: vipw.8.xml:182(filename) usermod.8.xml:410(filename)
-#: userdel.8.xml:165(filename) useradd.8.xml:664(filename)
-#: su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
-#: shadow.3.xml:204(filename) pwck.8.xml:262(filename)
-#: passwd.5.xml:125(filename) passwd.1.xml:383(filename)
-#: newusers.8.xml:366(filename) newgrp.1.xml:108(filename)
-#: login.1.xml:337(filename) expiry.1.xml:77(filename)
-#: chpasswd.8.xml:232(filename) chage.1.xml:234(filename)
+#: vipw.8.xml:198(filename) usermod.8.xml:440(filename)
+#: userdel.8.xml:181(filename) useradd.8.xml:680(filename)
+#: su.1.xml:357(filename) sg.1.xml:100(filename) shadow.5.xml:245(filename)
+#: shadow.3.xml:210(filename) pwck.8.xml:266(filename)
+#: passwd.5.xml:131(filename) passwd.1.xml:399(filename)
+#: newusers.8.xml:384(filename) newgrp.1.xml:111(filename)
+#: login.1.xml:340(filename) expiry.1.xml:111(filename)
+#: chpasswd.8.xml:248(filename) chage.1.xml:250(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:184(para) usermod.8.xml:412(para) userdel.8.xml:167(para)
-#: useradd.8.xml:666(para) su.1.xml:349(para) sg.1.xml:99(para)
-#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:264(para)
-#: passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
-#: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:234(para)
-#: chage.1.xml:237(para)
+#: vipw.8.xml:200(para) usermod.8.xml:442(para) userdel.8.xml:183(para)
+#: useradd.8.xml:682(para) su.1.xml:359(para) sg.1.xml:102(para)
+#: shadow.5.xml:247(para) shadow.3.xml:212(para) pwck.8.xml:268(para)
+#: passwd.1.xml:401(para) newusers.8.xml:386(para) newgrp.1.xml:113(para)
+#: login.1.xml:342(para) expiry.1.xml:113(para) chpasswd.8.xml:250(para)
+#: chage.1.xml:253(para)
 msgid "Secure user account information."
 msgstr "содержит защищаемую информацию о пользователях"
 
 # type: Content of: <refentry><refsect1><title>
-#: vipw.8.xml:191(title) usermod.8.xml:419(title) userdel.8.xml:252(title)
-#: useradd.8.xml:772(title) suauth.5.xml:197(title) su.1.xml:409(title)
-#: sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title)
-#: pwconv.8.xml:199(title) pwck.8.xml:322(title) porttime.5.xml:117(title)
-#: passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title)
-#: newusers.8.xml:399(title) newgrp.1.xml:129(title)
-#: login.defs.5.xml:504(title) login.access.5.xml:108(title)
-#: login.1.xml:376(title) limits.5.xml:180(title) gshadow.5.xml:159(title)
-#: grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
-#: groupmems.8.xml:192(title) groupdel.8.xml:146(title)
-#: groupadd.8.xml:290(title) gpasswd.1.xml:259(title) faillog.8.xml:222(title)
-#: faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
-#: chpasswd.8.xml:253(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title)
-#: chage.1.xml:277(title)
+#: vipw.8.xml:207(title) usermod.8.xml:449(title) userdel.8.xml:268(title)
+#: useradd.8.xml:788(title) suauth.5.xml:203(title) su.1.xml:419(title)
+#: sg.1.xml:121(title) shadow.5.xml:264(title) shadow.3.xml:219(title)
+#: pwconv.8.xml:244(title) pwck.8.xml:326(title) porttime.5.xml:123(title)
+#: passwd.5.xml:150(title) passwd.1.xml:471(title) nologin.8.xml:70(title)
+#: newusers.8.xml:417(title) newgrp.1.xml:132(title)
+#: login.defs.5.xml:507(title) login.access.5.xml:114(title)
+#: login.1.xml:379(title) limits.5.xml:186(title) gshadow.5.xml:165(title)
+#: grpck.8.xml:272(title) groups.1.xml:93(title) groupmod.8.xml:259(title)
+#: groupmems.8.xml:208(title) groupdel.8.xml:179(title)
+#: groupadd.8.xml:305(title) gpasswd.1.xml:277(title) faillog.8.xml:241(title)
+#: faillog.5.xml:89(title) expiry.1.xml:120(title) chsh.1.xml:173(title)
+#: chpasswd.8.xml:269(title) chgpasswd.8.xml:224(title) chfn.1.xml:207(title)
+#: chage.1.xml:293(title)
 msgid "SEE ALSO"
 msgstr "СМОТРИТЕ ТАКЖЕ"
 
-#: vipw.8.xml:192(para)
+#: vipw.8.xml:208(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -432,25 +503,26 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: usermod.8.xml:41(refentrytitle) usermod.8.xml:46(refname)
-#: usermod.8.xml:52(command) login.defs.5.xml:468(term)
+#: usermod.8.xml:42(refentrytitle) usermod.8.xml:49(refname)
+#: usermod.8.xml:55(command) login.defs.5.xml:471(term)
 msgid "usermod"
 msgstr "usermod"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: usermod.8.xml:47(refpurpose)
+#: usermod.8.xml:50(refpurpose)
 msgid "modify a user account"
 msgstr "изменяет учётную запись пользователя"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><emphasis>
-#: usermod.8.xml:56(replaceable) userdel.8.xml:56(replaceable)
-#: useradd.8.xml:66(replaceable) passwd.1.xml:60(replaceable)
-#: chsh.1.xml:56(replaceable) chage.1.xml:53(replaceable)
+#: usermod.8.xml:59(replaceable) userdel.8.xml:59(replaceable)
+#: useradd.8.xml:69(replaceable) passwd.1.xml:63(replaceable)
+#: chsh.1.xml:59(replaceable) chfn.1.xml:59(replaceable)
+#: chage.1.xml:56(replaceable)
 msgid "LOGIN"
 msgstr "LOGIN"
 
 # type: Content of: <refentry><refsect1><para>
-#: usermod.8.xml:62(para)
+#: usermod.8.xml:65(para)
 msgid ""
 "The <command>usermod</command> command modifies the system account files to "
 "reflect the changes that are specified on the command line."
@@ -459,16 +531,16 @@
 "согласно переданным в командной строке параметрам."
 
 # type: Content of: <refentry><refsect1><para>
-#: usermod.8.xml:70(para)
+#: usermod.8.xml:73(para)
 msgid "The options which apply to the <command>usermod</command> command are:"
 msgstr "Параметры команды <command>usermod</command>:"
 
-#: usermod.8.xml:76(term)
+#: usermod.8.xml:79(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:80(para)
+#: usermod.8.xml:83(para)
 #, fuzzy
 #| msgid ""
 #| "Add the user to the supplemental group(s). Use only with <option>-G</"
@@ -480,7 +552,7 @@
 "Добавить пользователя в дополнительную группу(ы). Использовать только вместе "
 "с параметром <option>-G</option>."
 
-#: usermod.8.xml:87(term) useradd.8.xml:128(term)
+#: usermod.8.xml:90(term) useradd.8.xml:131(term)
 msgid ""
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
@@ -489,7 +561,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:92(para)
+#: usermod.8.xml:95(para)
 msgid ""
 "The new value of the user's password file comment field. It is normally "
 "modified using the <citerefentry><refentrytitle>chfn</"
@@ -499,7 +571,7 @@
 "изменяют с помощью программы <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: usermod.8.xml:101(term) useradd.8.xml:141(term)
+#: usermod.8.xml:104(term) useradd.8.xml:144(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -508,14 +580,14 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: usermod.8.xml:106(para)
+#: usermod.8.xml:109(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:109(para)
+#: usermod.8.xml:112(para)
 #, fuzzy
 #| msgid ""
 #| "The user's new login directory. If the <option>-m</option> option is "
@@ -530,16 +602,16 @@
 "option>, то содержимое текущего домашнего каталога будет перемещено в новый "
 "домашний каталог, который будет создан, если он ещё не существует."
 
-#: usermod.8.xml:118(term) useradd.8.xml:168(term) useradd.8.xml:526(term)
+#: usermod.8.xml:121(term) useradd.8.xml:171(term) useradd.8.xml:542(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
 msgstr ""
-"<option>-e</option>, <option>--expiredate</"
-"option> <replaceable>ДАТА_УСТАРЕВАНИЯ</replaceable>"
+"<option>-e</option>, <option>--expiredate</option> "
+"<replaceable>ДАТА_УСТАРЕВАНИЯ</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:123(para) useradd.8.xml:173(para)
+#: usermod.8.xml:126(para) useradd.8.xml:176(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>."
@@ -547,8 +619,26 @@
 "Дата, когда учётная запись пользователя будет заблокирована. Дата задаётся в "
 "формате <emphasis remap=\"I\">ГГГГ-ММ-ДД</emphasis>."
 
-#: usermod.8.xml:130(term) useradd.8.xml:186(term) useradd.8.xml:539(term)
+#: usermod.8.xml:130(para)
 msgid ""
+"An empty <replaceable>EXPIRE_DATE</replaceable> argument will disable the "
+"expiration of the account."
+msgstr ""
+
+#: usermod.8.xml:134(para) usermod.8.xml:156(para)
+#, fuzzy
+#| msgid ""
+#| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
+#| "shadow</filename> by UID."
+msgid ""
+"This option requires a <filename>/etc/shadow</filename> file. A <filename>/"
+"etc/shadow</filename> entry will be created if there were none."
+msgstr ""
+"Отсортировать все записи в файлах <filename>/etc/passwd</filename> и "
+"<filename>/etc/shadow</filename> по числовому идентификатору пользователя."
+
+#: usermod.8.xml:142(term) useradd.8.xml:189(term) useradd.8.xml:555(term)
+msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 msgstr ""
@@ -556,7 +646,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:135(para)
+#: usermod.8.xml:147(para)
 #, fuzzy
 #| msgid ""
 #| "The number of days after a password has expired before the account will "
@@ -569,7 +659,7 @@
 "учётная запись будет заблокирована."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:139(para)
+#: usermod.8.xml:151(para)
 #, fuzzy
 #| msgid ""
 #| "The number of days after a password expires until the account is "
@@ -585,14 +675,14 @@
 "блокируется сразу после устаревания пароля, а при значении -1 данная "
 "возможность не используется. По умолчанию используется значение -1."
 
-#: usermod.8.xml:147(term) useradd.8.xml:206(term) useradd.8.xml:555(term)
+#: usermod.8.xml:164(term) useradd.8.xml:209(term) useradd.8.xml:571(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:152(para)
+#: usermod.8.xml:169(para)
 #, fuzzy
 #| msgid ""
 #| "The group name or number of the user's new initial login group. The group "
@@ -606,19 +696,19 @@
 "таким именем должна существовать. Идентификатор группы должен указывать на "
 "уже существующую группу. По умолчанию идентификатор группы установлен в 1."
 
-#: usermod.8.xml:156(para)
+#: usermod.8.xml:173(para)
 msgid ""
 "Any file from the user's home directory owned by the previous primary group "
 "of the user will be owned by this new group."
 msgstr ""
 
-#: usermod.8.xml:160(para)
+#: usermod.8.xml:177(para)
 msgid ""
 "The group ownership of files outside of the user's home directory must be "
 "fixed manually."
 msgstr ""
 
-#: usermod.8.xml:167(term) useradd.8.xml:234(term)
+#: usermod.8.xml:184(term) useradd.8.xml:237(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -629,7 +719,7 @@
 "\"I\">,ГРУППАN</emphasis>]]]"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:172(para)
+#: usermod.8.xml:189(para)
 #, fuzzy
 #| msgid ""
 #| "A list of supplementary groups which the user is also a member of. Each "
@@ -650,7 +740,7 @@
 "группу."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:179(para)
+#: usermod.8.xml:196(para)
 #, fuzzy
 msgid ""
 "If the user is currently a member of a group which is not listed, the user "
@@ -667,7 +757,7 @@
 "уже имеющемуся списку групп пользователя добавляется список указанных "
 "дополнительных групп."
 
-#: usermod.8.xml:188(term)
+#: usermod.8.xml:205(term)
 msgid ""
 "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
 "replaceable>"
@@ -676,25 +766,25 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:193(para)
+#: usermod.8.xml:210(para)
 #, fuzzy
 msgid ""
 "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."
+"particular, the user's home directory or mail spool should probably be "
+"renamed manually to reflect the new login name."
 msgstr ""
 "Имя пользователя будет изменено с emphasis remap=\"I\">ИМЯ</emphasis> на "
 "<emphasis remap=\"I\">НОВОЕ_ИМЯ</emphasis>. Больше ничего не меняется. В "
 "частности, вероятно, должно быть изменено имя домашнего каталога "
 "пользователя, чтобы отразить изменение имени пользователя."
 
-#: usermod.8.xml:203(term)
+#: usermod.8.xml:220(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:207(para)
+#: usermod.8.xml:224(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>-"
@@ -705,24 +795,24 @@
 "используйте этот параметр вместе с <option>-p</option> или <option>-U</"
 "option>."
 
-#: usermod.8.xml:213(para)
+#: usermod.8.xml:230(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:222(term)
+#: usermod.8.xml:239(term)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "<option>-m</option>, <option>--move-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: usermod.8.xml:226(para)
+#: usermod.8.xml:243(para)
 msgid "Move the content of the user's home directory to the new location."
 msgstr ""
 
-#: usermod.8.xml:230(para)
+#: usermod.8.xml:247(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -730,20 +820,20 @@
 "<option>--home</option>) option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: usermod.8.xml:234(para)
+#: usermod.8.xml:251(para)
 msgid ""
 "<command>usermod</command> will try to adapt the ownership of the files and "
 "to copy the modes, ACL and extended attributes, but manual changes might be "
 "needed afterwards."
 msgstr ""
 
-#: usermod.8.xml:242(term) useradd.8.xml:374(term) groupmod.8.xml:116(term)
-#: groupadd.8.xml:134(term)
+#: usermod.8.xml:259(term) useradd.8.xml:377(term) groupmod.8.xml:123(term)
+#: groupadd.8.xml:136(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:246(para)
+#: usermod.8.xml:263(para)
 msgid ""
 "When used with the <option>-u</option> option, this option allows to change "
 "the user ID to a non-unique value."
@@ -751,8 +841,8 @@
 "При использовании с параметром <option>-u</option>, этот параметр позволяет "
 "указывать не уникальный числовой идентификатор пользователя."
 
-#: usermod.8.xml:253(term) useradd.8.xml:386(term) groupmod.8.xml:127(term)
-#: groupadd.8.xml:144(term)
+#: usermod.8.xml:270(term) useradd.8.xml:389(term) groupmod.8.xml:134(term)
+#: groupadd.8.xml:146(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -760,7 +850,7 @@
 "<option>-p</option>, <option>--password</option> <replaceable>ПАРОЛЬ</"
 "replaceable>"
 
-#: usermod.8.xml:258(para) groupmod.8.xml:132(para)
+#: usermod.8.xml:275(para) groupmod.8.xml:139(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
@@ -769,29 +859,29 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>."
 
-#: usermod.8.xml:263(para) useradd.8.xml:396(para) groupmod.8.xml:137(para)
-#: groupadd.8.xml:154(para)
+#: usermod.8.xml:280(para) useradd.8.xml:399(para) groupmod.8.xml:144(para)
+#: groupadd.8.xml:156(para)
 msgid ""
 "<emphasis role=\"bold\">Note:</emphasis> This option is not recommended "
 "because the password (or encrypted password) will be visible by users "
 "listing the processes."
 msgstr ""
 
-#: usermod.8.xml:268(para)
+#: usermod.8.xml:285(para)
 msgid ""
 "The password will be written in the local <filename>/etc/passwd</filename> "
 "or <filename>/etc/shadow</filename> file. This might differ from the "
 "password database configured in your PAM configuration."
 msgstr ""
 
-#: usermod.8.xml:274(para) useradd.8.xml:401(para) groupmod.8.xml:142(para)
-#: groupadd.8.xml:159(para)
+#: usermod.8.xml:291(para) useradd.8.xml:404(para) groupmod.8.xml:149(para)
+#: groupadd.8.xml:161(para)
 msgid ""
 "You should make sure the password respects the system's password policy."
 msgstr ""
 
-#: usermod.8.xml:281(term) useradd.8.xml:435(term) useradd.8.xml:576(term)
-#: su.1.xml:157(term) chsh.1.xml:85(term)
+#: usermod.8.xml:311(term) useradd.8.xml:451(term) useradd.8.xml:592(term)
+#: su.1.xml:167(term) chsh.1.xml:101(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
@@ -799,7 +889,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:286(para) chsh.1.xml:89(para)
+#: usermod.8.xml:316(para) chsh.1.xml:105(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."
@@ -807,18 +897,18 @@
 "Имя новой регистрационной оболочки пользователя. Если задать пустое "
 "значение, то будет использована регистрационная оболочка по умолчанию."
 
-#: usermod.8.xml:293(term) useradd.8.xml:450(term)
+#: usermod.8.xml:323(term) useradd.8.xml:466(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option> <replaceable>UID</replaceable>"
 
-#: usermod.8.xml:298(para)
+#: usermod.8.xml:328(para)
 msgid "The new numerical value of the user's ID."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:301(para)
+#: usermod.8.xml:331(para)
 #, fuzzy
 #| msgid ""
 #| "The numerical value of the user's ID. This value must be unique, unless "
@@ -838,7 +928,7 @@
 "до 999 обычно зарезервированы для системных учётных записей."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:307(para)
+#: usermod.8.xml:337(para)
 #, fuzzy
 #| msgid ""
 #| "The numerical value of the user's ID. This value must be unique, unless "
@@ -861,18 +951,18 @@
 "изменён автоматически. Для файлов, расположенных вне домашнего каталога "
 "идентификатор нужно изменять вручную."
 
-#: usermod.8.xml:312(para)
+#: usermod.8.xml:342(para)
 msgid ""
 "The ownership of files outside of the user's home directory must be fixed "
 "manually."
 msgstr ""
 
-#: usermod.8.xml:319(term)
+#: usermod.8.xml:349(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:323(para)
+#: usermod.8.xml:353(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</"
@@ -882,7 +972,7 @@
 "начала шифрованного пароля. Не используйте этот параметр вместе с <option>-"
 "p</option> или <option>-L</option>."
 
-#: usermod.8.xml:328(para)
+#: usermod.8.xml:358(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 "
@@ -890,7 +980,7 @@
 "from <filename>/etc/default/useradd</filename>)."
 msgstr ""
 
-#: usermod.8.xml:339(term) useradd.8.xml:482(term)
+#: usermod.8.xml:369(term) useradd.8.xml:498(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
@@ -903,7 +993,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:344(para)
+#: usermod.8.xml:374(para)
 #, fuzzy
 #| msgid ""
 #| "The name of the user's new login shell. Setting this field to blank "
@@ -916,16 +1006,16 @@
 "значение, то будет использована регистрационная оболочка по умолчанию."
 
 # type: Content of: <refentry><refsect1><title>
-#: usermod.8.xml:355(title) userdel.8.xml:225(title) useradd.8.xml:605(title)
-#: su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
-#: newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title)
-#: groupdel.8.xml:65(title) groupadd.8.xml:223(title) gpasswd.1.xml:214(title)
-#: faillog.8.xml:199(title) chpasswd.8.xml:199(title)
-#: chgpasswd.8.xml:157(title)
+#: usermod.8.xml:385(title) userdel.8.xml:241(title) useradd.8.xml:621(title)
+#: su.1.xml:312(title) shadow.3.xml:199(title) passwd.1.xml:354(title)
+#: newusers.8.xml:330(title) login.1.xml:241(title) lastlog.8.xml:178(title)
+#: groupdel.8.xml:98(title) groupadd.8.xml:238(title) gpasswd.1.xml:232(title)
+#: faillog.8.xml:218(title) chpasswd.8.xml:215(title)
+#: chgpasswd.8.xml:173(title)
 msgid "CAVEATS"
 msgstr "ПРЕДОСТЕРЕЖЕНИЯ"
 
-#: usermod.8.xml:356(para)
+#: usermod.8.xml:386(para)
 msgid ""
 "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, the "
@@ -934,13 +1024,13 @@
 "is logged in according to utmp on other architectures."
 msgstr ""
 
-#: usermod.8.xml:364(para)
+#: usermod.8.xml:394(para)
 msgid ""
 "You must change the owner of any <command>crontab</command> files or "
 "<command>at</command> jobs manually."
 msgstr ""
 
-#: usermod.8.xml:368(para)
+#: usermod.8.xml:398(para)
 msgid "You must make any changes involving NIS on the NIS server."
 msgstr ""
 
@@ -1094,7 +1184,7 @@
 "algorithm: <placeholder-1/>"
 msgstr ""
 
-#: usermod.8.xml:420(para)
+#: usermod.8.xml:450(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1133,17 +1223,17 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><command>
-#: userdel.8.xml:43(refentrytitle) userdel.8.xml:48(refname)
-#: userdel.8.xml:53(command) login.defs.5.xml:458(term)
+#: userdel.8.xml:44(refentrytitle) userdel.8.xml:51(refname)
+#: userdel.8.xml:56(command) login.defs.5.xml:461(term)
 msgid "userdel"
 msgstr "userdel"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: userdel.8.xml:49(refpurpose)
+#: userdel.8.xml:52(refpurpose)
 msgid "delete a user account and related files"
 msgstr "удаляет учётную запись и файлы пользователя"
 
-#: userdel.8.xml:63(para)
+#: userdel.8.xml:66(para)
 #, fuzzy
 msgid ""
 "The <command>userdel</command> command modifies the system account files, "
@@ -1156,15 +1246,15 @@
 "существовать."
 
 # type: Content of: <refentry><refsect1><para>
-#: userdel.8.xml:72(para)
+#: userdel.8.xml:75(para)
 msgid "The options which apply to the <command>userdel</command> command are:"
 msgstr "Параметры команды <command>userdel</command>:"
 
-#: userdel.8.xml:77(term) groupadd.8.xml:79(term)
+#: userdel.8.xml:80(term) groupadd.8.xml:81(term) expiry.1.xml:84(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option>"
 
-#: userdel.8.xml:81(para)
+#: userdel.8.xml:84(para)
 #, fuzzy
 msgid ""
 "This option forces the removal of the user account, even if the user is "
@@ -1187,7 +1277,7 @@
 "если она всё ещё является первичной группой другого пользователя."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:94(para)
+#: userdel.8.xml:97(para)
 msgid ""
 "<emphasis>Note:</emphasis> This option is dangerous and may leave your "
 "system in an inconsistent state."
@@ -1195,12 +1285,12 @@
 "<emphasis>Примечание:</emphasis> Этот параметр опасно использовать; он может "
 "привести систему в нерабочее состояние."
 
-#: userdel.8.xml:107(term)
+#: userdel.8.xml:110(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:111(para)
+#: userdel.8.xml:114(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 "
@@ -1210,7 +1300,7 @@
 "каталогом и почтовым ящиком. Пользовательские файлы, расположенные в других "
 "файловых системах, нужно искать и удалять вручную."
 
-#: userdel.8.xml:117(para)
+#: userdel.8.xml:120(para)
 #, fuzzy
 #| msgid ""
 #| "The mail spool is defined by the <emphasis>MAIL_DIR</emphasis> variable "
@@ -1303,125 +1393,125 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: userdel.8.xml:153(filename) useradd.8.xml:694(filename)
-#: su.1.xml:353(filename) pwconv.8.xml:190(filename)
-#: passwd.1.xml:389(filename) newusers.8.xml:384(filename)
-#: login.access.5.xml:99(filename) login.1.xml:367(filename)
-#: groupadd.8.xml:214(filename) chsh.1.xml:148(filename)
-#: chpasswd.8.xml:238(filename) chgpasswd.8.xml:199(filename)
-#: chfn.1.xml:116(filename)
+#: userdel.8.xml:169(filename) useradd.8.xml:710(filename)
+#: su.1.xml:363(filename) pwconv.8.xml:235(filename)
+#: passwd.1.xml:405(filename) newusers.8.xml:402(filename)
+#: login.access.5.xml:105(filename) login.1.xml:370(filename)
+#: groupadd.8.xml:229(filename) chsh.1.xml:164(filename)
+#: chpasswd.8.xml:254(filename) chgpasswd.8.xml:215(filename)
+#: chfn.1.xml:192(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:155(para) useradd.8.xml:696(para) su.1.xml:355(para)
-#: pwconv.8.xml:192(para) passwd.1.xml:391(para) newusers.8.xml:386(para)
-#: login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:216(para)
-#: chsh.1.xml:150(para) chpasswd.8.xml:240(para) chgpasswd.8.xml:201(para)
-#: chfn.1.xml:118(para)
+#: userdel.8.xml:171(para) useradd.8.xml:712(para) su.1.xml:365(para)
+#: pwconv.8.xml:237(para) passwd.1.xml:407(para) newusers.8.xml:404(para)
+#: login.access.5.xml:107(para) login.1.xml:372(para) groupadd.8.xml:231(para)
+#: chsh.1.xml:166(para) chpasswd.8.xml:256(para) chgpasswd.8.xml:217(para)
+#: chfn.1.xml:194(para)
 msgid "Shadow password suite configuration."
 msgstr "содержит конфигурацию подсистемы теневых паролей"
 
 # type: Content of: <refentry><refsect1><title>
-#: userdel.8.xml:174(title) useradd.8.xml:703(title) su.1.xml:362(title)
-#: pwck.8.xml:271(title) passwd.1.xml:404(title) grpck.8.xml:209(title)
-#: groupmod.8.xml:182(title) groupdel.8.xml:107(title)
-#: groupadd.8.xml:245(title) chage.1.xml:244(title)
+#: userdel.8.xml:190(title) useradd.8.xml:719(title) su.1.xml:372(title)
+#: pwck.8.xml:275(title) passwd.1.xml:420(title) grpck.8.xml:227(title)
+#: groupmod.8.xml:208(title) groupdel.8.xml:140(title)
+#: groupadd.8.xml:260(title) chage.1.xml:260(title)
 msgid "EXIT VALUES"
 msgstr "ВОЗВРАЩАЕМЫЕ ЗНАЧЕНИЯ"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:179(replaceable) useradd.8.xml:708(replaceable)
-#: su.1.xml:381(replaceable) pwck.8.xml:276(replaceable)
-#: passwd.1.xml:409(replaceable) grpck.8.xml:214(replaceable)
-#: groupmod.8.xml:187(replaceable) groupdel.8.xml:112(replaceable)
-#: groupadd.8.xml:250(replaceable) chage.1.xml:249(replaceable)
+#: userdel.8.xml:195(replaceable) useradd.8.xml:724(replaceable)
+#: su.1.xml:391(replaceable) pwck.8.xml:280(replaceable)
+#: passwd.1.xml:425(replaceable) grpck.8.xml:232(replaceable)
+#: groupmod.8.xml:213(replaceable) groupdel.8.xml:145(replaceable)
+#: groupadd.8.xml:265(replaceable) chage.1.xml:265(replaceable)
 msgid "0"
 msgstr "0"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:181(para) useradd.8.xml:710(para) pwck.8.xml:278(para)
-#: passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para)
-#: groupdel.8.xml:114(para) groupadd.8.xml:252(para) chage.1.xml:251(para)
+#: userdel.8.xml:197(para) useradd.8.xml:726(para) pwck.8.xml:282(para)
+#: passwd.1.xml:427(para) grpck.8.xml:234(para) groupmod.8.xml:215(para)
+#: groupdel.8.xml:147(para) groupadd.8.xml:267(para) chage.1.xml:267(para)
 msgid "success"
 msgstr "успешное выполнение"
 
 # type: Content of: <refentry><refmeta><manvolnum>
-#: userdel.8.xml:185(replaceable) useradd.8.xml:714(replaceable)
-#: su.1.xml:55(manvolnum) su.1.xml:387(replaceable) sg.1.xml:39(manvolnum)
-#: pwck.8.xml:282(replaceable) passwd.1.xml:45(manvolnum)
-#: passwd.1.xml:415(replaceable) newgrp.1.xml:39(manvolnum)
-#: login.1.xml:71(manvolnum) grpck.8.xml:220(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:39(manvolnum)
-#: chage.1.xml:255(replaceable)
+#: userdel.8.xml:201(replaceable) useradd.8.xml:730(replaceable)
+#: su.1.xml:56(manvolnum) su.1.xml:397(replaceable) sg.1.xml:40(manvolnum)
+#: pwck.8.xml:286(replaceable) passwd.1.xml:46(manvolnum)
+#: passwd.1.xml:431(replaceable) newgrp.1.xml:40(manvolnum)
+#: login.1.xml:72(manvolnum) grpck.8.xml:238(replaceable)
+#: groups.1.xml:39(manvolnum) gpasswd.1.xml:44(manvolnum)
+#: expiry.1.xml:43(manvolnum) chsh.1.xml:42(manvolnum)
+#: chfn.1.xml:42(manvolnum) chage.1.xml:40(manvolnum)
+#: chage.1.xml:271(replaceable)
 msgid "1"
 msgstr "1"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:187(para) useradd.8.xml:716(para)
+#: userdel.8.xml:203(para) useradd.8.xml:732(para)
 msgid "can't update password file"
 msgstr "не удалось изменить файл паролей"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:191(replaceable) useradd.8.xml:720(replaceable)
-#: pwck.8.xml:288(replaceable) passwd.1.xml:421(replaceable)
-#: grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable)
-#: groupdel.8.xml:118(replaceable) groupadd.8.xml:256(replaceable)
-#: chage.1.xml:261(replaceable)
+#: userdel.8.xml:207(replaceable) useradd.8.xml:736(replaceable)
+#: pwck.8.xml:292(replaceable) passwd.1.xml:437(replaceable)
+#: grpck.8.xml:244(replaceable) groupmod.8.xml:219(replaceable)
+#: groupdel.8.xml:151(replaceable) groupadd.8.xml:271(replaceable)
+#: chage.1.xml:277(replaceable)
 msgid "2"
 msgstr "2"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:193(para) useradd.8.xml:722(para) pwck.8.xml:284(para)
-#: grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
-#: groupadd.8.xml:258(para) chage.1.xml:263(para)
+#: userdel.8.xml:209(para) useradd.8.xml:738(para) pwck.8.xml:288(para)
+#: grpck.8.xml:240(para) groupmod.8.xml:221(para) groupdel.8.xml:153(para)
+#: groupadd.8.xml:273(para) chage.1.xml:279(para)
 msgid "invalid command syntax"
 msgstr "ошибка в параметрах команды"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:197(replaceable) useradd.8.xml:738(replaceable)
-#: pwck.8.xml:312(replaceable) passwd.1.xml:445(replaceable)
-#: groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
+#: userdel.8.xml:213(replaceable) useradd.8.xml:754(replaceable)
+#: pwck.8.xml:316(replaceable) passwd.1.xml:461(replaceable)
+#: groupmod.8.xml:237(replaceable) groupdel.8.xml:157(replaceable)
 msgid "6"
 msgstr "6"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:199(para)
+#: userdel.8.xml:215(para)
 msgid "specified user doesn't exist"
 msgstr "указанный пользователь не существует"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:205(para)
+#: userdel.8.xml:221(para)
 msgid "user currently logged in"
 msgstr "пользователь сейчас работает в системе"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:209(replaceable) useradd.8.xml:750(replaceable)
-#: groupmod.8.xml:223(replaceable) groupdel.8.xml:136(replaceable)
-#: groupadd.8.xml:280(replaceable)
+#: userdel.8.xml:225(replaceable) useradd.8.xml:766(replaceable)
+#: groupmod.8.xml:249(replaceable) groupdel.8.xml:169(replaceable)
+#: groupadd.8.xml:295(replaceable)
 msgid "10"
 msgstr "10"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:211(para) useradd.8.xml:752(para) groupmod.8.xml:225(para)
-#: groupdel.8.xml:138(para) groupadd.8.xml:282(para)
+#: userdel.8.xml:227(para) useradd.8.xml:768(para) groupmod.8.xml:251(para)
+#: groupdel.8.xml:171(para) groupadd.8.xml:297(para)
 msgid "can't update group file"
 msgstr "не удалось изменить файл групп"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:215(replaceable) useradd.8.xml:756(replaceable)
+#: userdel.8.xml:231(replaceable) useradd.8.xml:772(replaceable)
 msgid "12"
 msgstr "12"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:217(para)
+#: userdel.8.xml:233(para)
 msgid "can't remove home directory"
 msgstr "не удалось удалить домашний каталог"
 
 # type: Content of: <refentry><refsect1><para>
-#: userdel.8.xml:175(para)
+#: userdel.8.xml:191(para)
 msgid ""
 "The <command>userdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1429,7 +1519,7 @@
 "Команда <command>userdel</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: userdel.8.xml:226(para)
+#: userdel.8.xml:242(para)
 msgid ""
 "<command>userdel</command> will not allow you to remove an account if there "
 "are running processes which belong to this account. In that case, you may "
@@ -1439,7 +1529,7 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: userdel.8.xml:233(para)
+#: userdel.8.xml:249(para)
 #, fuzzy
 #| msgid ""
 #| "You must manually check all file systems to insure that no files remain "
@@ -1452,7 +1542,7 @@
 "осталось файлов, принадлежащих удалённой группе."
 
 # type: Content of: <refentry><refsect1><para>
-#: userdel.8.xml:237(para)
+#: userdel.8.xml:253(para)
 msgid ""
 "You may not remove any NIS attributes on a NIS client. This must be "
 "performed on the NIS server."
@@ -1460,7 +1550,7 @@
 "Нельзя удалить NIS атрибуты клиента NIS. Это необходимо сделать на NIS "
 "сервере."
 
-#: userdel.8.xml:240(para)
+#: userdel.8.xml:256(para)
 #, fuzzy
 #| msgid ""
 #| "If <emphasis>USERGROUPS_ENAB</emphasis> is defined to <emphasis remap=\"I"
@@ -1489,7 +1579,7 @@
 "предупреждение без удаления, если такое случится. Параметр <option>-f</"
 "option> поможет удалить группу в любом случае."
 
-#: userdel.8.xml:253(para)
+#: userdel.8.xml:269(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1524,26 +1614,26 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: useradd.8.xml:52(refentrytitle) useradd.8.xml:57(refname)
-#: useradd.8.xml:62(command) useradd.8.xml:69(command)
-#: useradd.8.xml:73(command) login.defs.5.xml:444(term)
+#: useradd.8.xml:53(refentrytitle) useradd.8.xml:60(refname)
+#: useradd.8.xml:65(command) useradd.8.xml:72(command)
+#: useradd.8.xml:76(command) login.defs.5.xml:447(term)
 msgid "useradd"
 msgstr "useradd"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: useradd.8.xml:58(refpurpose)
+#: useradd.8.xml:61(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:70(arg) useradd.8.xml:74(arg)
+#: useradd.8.xml:73(arg) useradd.8.xml:77(arg)
 msgid "-D"
 msgstr "-D"
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:83(para)
+#: useradd.8.xml:86(para)
 #, fuzzy
 msgid ""
 "When invoked without the <option>-D</option> option, the <command>useradd</"
@@ -1560,7 +1650,7 @@
 "также может создать домашний каталог нового пользователя и скопировать файлы "
 "настроек."
 
-#: useradd.8.xml:92(para)
+#: useradd.8.xml:95(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 "
@@ -1568,19 +1658,19 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:101(para)
+#: useradd.8.xml:104(para)
 msgid "The options which apply to the <command>useradd</command> command are:"
 msgstr "Параметры команды <command>useradd</command>:"
 
-#: useradd.8.xml:105(term) useradd.8.xml:507(term)
+#: useradd.8.xml:108(term) useradd.8.xml:523(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
 msgstr ""
-"<option>-b</option>, <option>--base-dir</"
-"option> <replaceable>БАЗОВЫЙ_КАТАЛОГ</replaceable>"
+"<option>-b</option>, <option>--base-dir</option> "
+"<replaceable>БАЗОВЫЙ_КАТАЛОГ</replaceable>"
 
-#: useradd.8.xml:110(para)
+#: useradd.8.xml:113(para)
 #, fuzzy
 msgid ""
 "The default base directory for the system if <option>-d</"
@@ -1595,7 +1685,7 @@
 "каталога. Если не используется параметр <option>-m</option>, то "
 "<replaceable>БАЗОВЫЙ_КАТАЛОГ</replaceable> должен существовать."
 
-#: useradd.8.xml:118(para)
+#: useradd.8.xml:121(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>/"
@@ -1603,7 +1693,7 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:133(para)
+#: useradd.8.xml:136(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."
@@ -1611,7 +1701,7 @@
 "Любая текстовая строка. Обычно, здесь коротко описывается учётная запись, и "
 "в настоящее время используется как поле для имени и фамилии пользователя."
 
-#: useradd.8.xml:146(para)
+#: useradd.8.xml:149(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 "
@@ -1628,19 +1718,19 @@
 "<replaceable>БАЗОВЫЙ_КАТАЛОГ</replaceable> необязательно должен существовать "
 "и не будет создан, если его нет."
 
-#: useradd.8.xml:158(term)
+#: useradd.8.xml:161(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:162(para)
+#: useradd.8.xml:165(para)
 #, fuzzy
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr "Изменение значений по умолчанию"
 
-#: useradd.8.xml:177(para)
+#: useradd.8.xml:180(para)
 msgid ""
 "If not specified, <command>useradd</command> will use the default expiry "
 "date specified by the <option>EXPIRE</option> variable in <filename>/etc/"
@@ -1648,7 +1738,7 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:191(para)
+#: useradd.8.xml:194(para)
 #, fuzzy
 #| msgid ""
 #| "The number of days after a password expires until the account is "
@@ -1666,7 +1756,7 @@
 "возможность не используется. По умолчанию используется значение -1."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:197(para)
+#: useradd.8.xml:200(para)
 #, fuzzy
 #| msgid ""
 #| "The name of the user's login shell. The default is to leave this field "
@@ -1680,7 +1770,7 @@
 "будет использована регистрационная оболочка по умолчанию."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:211(para)
+#: useradd.8.xml:214(para)
 #, fuzzy
 #| msgid ""
 #| "The group name or number of the user's new initial login group. The group "
@@ -1694,7 +1784,7 @@
 "таким именем должна существовать. Идентификатор группы должен указывать на "
 "уже существующую группу. По умолчанию идентификатор группы установлен в 1."
 
-#: useradd.8.xml:216(para)
+#: useradd.8.xml:219(para)
 msgid ""
 "If not specified, the behavior of <command>useradd</command> will depend on "
 "the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
@@ -1709,7 +1799,7 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:239(para)
+#: useradd.8.xml:242(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. "
@@ -1723,7 +1813,7 @@
 "<option>-g</option>. По умолчанию пользователь входит только в начальную "
 "группу."
 
-#: useradd.8.xml:256(term)
+#: useradd.8.xml:259(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
@@ -1735,14 +1825,14 @@
 "<option>-s</option>, <option>--shell</option> <replaceable>ОБОЛОЧКА</"
 "replaceable>"
 
-#: useradd.8.xml:261(para)
+#: useradd.8.xml:264(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:266(para)
+#: useradd.8.xml:269(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -1750,18 +1840,18 @@
 "home</option>) option is specified."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:270(para)
+#: useradd.8.xml:273(para)
 msgid ""
 "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:276(para)
+#: useradd.8.xml:279(para)
 msgid "If possible, the ACLs and extended attributes are copied."
 msgstr ""
 
-#: useradd.8.xml:282(term) groupadd.8.xml:113(term)
+#: useradd.8.xml:285(term) groupadd.8.xml:115(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -1769,7 +1859,7 @@
 "<option>-K</option>, <option>--key</option> <replaceable>КЛЮЧ</"
 "replaceable>=<replaceable>ЗНАЧЕНИЕ</replaceable>"
 
-#: useradd.8.xml:287(para)
+#: useradd.8.xml:290(para)
 #, fuzzy
 #| msgid ""
 #| "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, "
@@ -1804,67 +1894,67 @@
 "replaceable><option> -K </option><replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable>"
 
-#: useradd.8.xml:311(term)
+#: useradd.8.xml:314(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:313(para)
+#: useradd.8.xml:316(para)
 msgid "Do not add the user to the lastlog and faillog databases."
 msgstr ""
 
-#: useradd.8.xml:316(para)
+#: useradd.8.xml:319(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:324(term)
+#: useradd.8.xml:327(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:328(para)
+#: useradd.8.xml:331(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:334(para)
+#: useradd.8.xml:337(para)
 msgid ""
 "By default, if this option is not specified and <option>CREATE_HOME</option> "
 "is not enabled, no home directories are created."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><option>
-#: useradd.8.xml:343(option)
+#: useradd.8.xml:346(option)
 #, fuzzy
 #| msgid "-"
 msgid "-M"
 msgstr "-"
 
-#: useradd.8.xml:346(para)
+#: useradd.8.xml:349(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:355(term)
+#: useradd.8.xml:358(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:359(para)
+#: useradd.8.xml:362(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 "
 "<option>GROUP</option> variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:365(para) useradd.8.xml:473(para)
+#: useradd.8.xml:368(para) useradd.8.xml:489(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 "
@@ -1873,18 +1963,18 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:378(para)
+#: useradd.8.xml:381(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr "Позволяет создать учётную запись с уже имеющимся (не уникальным) UID."
 
-#: useradd.8.xml:379(para)
+#: useradd.8.xml:382(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid in combination with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:391(para) groupadd.8.xml:149(para)
+#: useradd.8.xml:394(para) groupadd.8.xml:151(para)
 #, fuzzy
 #| msgid ""
 #| "The encrypted password, as returned by "
@@ -1899,17 +1989,17 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>. По умолчанию учётная запись заблокирована."
 
-#: useradd.8.xml:408(term) newusers.8.xml:263(term) groupadd.8.xml:166(term)
+#: useradd.8.xml:411(term) newusers.8.xml:268(term) groupadd.8.xml:168(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:412(para) newusers.8.xml:267(para)
+#: useradd.8.xml:415(para) newusers.8.xml:272(para)
 msgid "Create a system account."
 msgstr ""
 
-#: useradd.8.xml:415(para)
+#: useradd.8.xml:418(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are chosen in the "
@@ -1919,7 +2009,7 @@
 "the creation of groups)."
 msgstr ""
 
-#: useradd.8.xml:424(para)
+#: useradd.8.xml:427(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."
@@ -1929,7 +2019,7 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:440(para)
+#: useradd.8.xml:456(para)
 #, fuzzy
 #| msgid ""
 #| "The name of the user's login shell. The default is to leave this field "
@@ -1944,7 +2034,7 @@
 "будет использована регистрационная оболочка по умолчанию."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:455(para)
+#: useradd.8.xml:471(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 "
@@ -1958,20 +2048,20 @@
 "ID большее 999 и большее любого другого значения пользователя. Значения от 0 "
 "до 999 обычно зарезервированы для системных учётных записей."
 
-#: useradd.8.xml:465(term)
+#: useradd.8.xml:481(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:469(para)
+#: useradd.8.xml:485(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><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:487(para)
+#: useradd.8.xml:503(para)
 #, fuzzy
 #| msgid ""
 #| "The name of the user's new login shell. Setting this field to blank "
@@ -1984,12 +2074,12 @@
 "значение, то будет использована регистрационная оболочка по умолчанию."
 
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: useradd.8.xml:497(title)
+#: useradd.8.xml:513(title)
 msgid "Changing the default values"
 msgstr "Изменение значений по умолчанию"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: useradd.8.xml:498(para)
+#: useradd.8.xml:514(para)
 #, fuzzy
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
@@ -2002,7 +2092,7 @@
 "изменяет их, если указаны дополнительные параметры в командной строке. "
 "Допустимые параметры:"
 
-#: useradd.8.xml:512(para)
+#: useradd.8.xml:528(para)
 #, fuzzy
 msgid ""
 "The path prefix for a new user's home directory. The user's name will be "
@@ -2015,25 +2105,25 @@
 "replaceable> для создания имени нового каталога, если не задан параметр "
 "<option>-d</option> при создании новой учётной записи."
 
-#: useradd.8.xml:519(para)
+#: useradd.8.xml:535(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:531(para)
+#: useradd.8.xml:547(para)
 msgid "The date on which the user account is disabled."
 msgstr "Дата, когда учётная запись пользователя заблокирована."
 
-#: useradd.8.xml:532(para)
+#: useradd.8.xml:548(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:544(para)
+#: useradd.8.xml:560(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
@@ -2041,13 +2131,13 @@
 "Число дней, которые должны пройти после устаревания пароля, перед тем как "
 "учётная запись будет заблокирована."
 
-#: useradd.8.xml:548(para)
+#: useradd.8.xml:564(para)
 msgid ""
 "This option sets the <option>INACTIVE</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:560(para)
+#: useradd.8.xml:576(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> "
@@ -2056,29 +2146,29 @@
 "have an existing entry."
 msgstr ""
 
-#: useradd.8.xml:569(para)
+#: useradd.8.xml:585(para)
 msgid ""
 "This option sets the <option>GROUP</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:581(para)
+#: useradd.8.xml:597(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
-#: useradd.8.xml:584(para)
+#: useradd.8.xml:600(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:596(title)
+#: useradd.8.xml:612(title)
 msgid "NOTES"
 msgstr "ЗАМЕЧАНИЯ"
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:597(para)
+#: useradd.8.xml:613(para)
 #, fuzzy
 #| msgid ""
 #| "The system administrator is responsible for placing the default user "
@@ -2093,7 +2183,7 @@
 "<filename>/etc/skel/</filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:606(para)
+#: useradd.8.xml:622(para)
 #, fuzzy
 msgid ""
 "You may not add a user to a NIS or LDAP group. This must be performed on the "
@@ -2103,7 +2193,7 @@
 "сервере."
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:611(para)
+#: useradd.8.xml:627(para)
 #, fuzzy
 msgid ""
 "Similarly, if the username already exists in an external user database such "
@@ -2115,7 +2205,7 @@
 "пользователя."
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:617(para)
+#: useradd.8.xml:633(para)
 #, fuzzy
 #| msgid ""
 #| "Usernames must begin with a lower case letter or an underscore, and only "
@@ -2132,7 +2222,7 @@
 "выражением: [a-z_][a-z0-9_-]*[$]"
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:623(para)
+#: useradd.8.xml:639(para)
 #, fuzzy
 #| msgid "Groupnames may only be up to 16 characters long."
 msgid "Usernames may only be up to 32 characters long."
@@ -2384,85 +2474,85 @@
 "текущие значения по умолчанию."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: useradd.8.xml:682(filename)
+#: useradd.8.xml:698(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:684(para)
+#: useradd.8.xml:700(para)
 msgid "Default values for account creation."
 msgstr "содержит защищаемую информацию о пользователях"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: useradd.8.xml:688(filename)
+#: useradd.8.xml:704(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:690(para)
+#: useradd.8.xml:706(para)
 msgid "Directory containing default files."
 msgstr "каталог, содержащий пользовательские файлы по умолчанию"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: useradd.8.xml:726(replaceable) shadow.3.xml:35(manvolnum)
-#: pwck.8.xml:294(replaceable) passwd.1.xml:427(replaceable)
-#: grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable)
-#: groupadd.8.xml:262(replaceable)
+#: useradd.8.xml:742(replaceable) shadow.3.xml:39(manvolnum)
+#: pwck.8.xml:298(replaceable) passwd.1.xml:443(replaceable)
+#: grpck.8.xml:250(replaceable) groupmod.8.xml:225(replaceable)
+#: groupadd.8.xml:277(replaceable)
 msgid "3"
 msgstr "3"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:728(para) passwd.1.xml:447(para) groupmod.8.xml:201(para)
-#: groupadd.8.xml:264(para)
+#: useradd.8.xml:744(para) passwd.1.xml:463(para) groupmod.8.xml:227(para)
+#: groupadd.8.xml:279(para)
 msgid "invalid argument to option"
 msgstr "недопустимое значение параметра"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: useradd.8.xml:732(replaceable) pwck.8.xml:300(replaceable)
-#: passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable)
-#: groupmod.8.xml:205(replaceable) groupadd.8.xml:268(replaceable)
+#: useradd.8.xml:748(replaceable) pwck.8.xml:304(replaceable)
+#: passwd.1.xml:449(replaceable) grpck.8.xml:256(replaceable)
+#: groupmod.8.xml:231(replaceable) groupadd.8.xml:283(replaceable)
 msgid "4"
 msgstr "4"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:734(para)
+#: useradd.8.xml:750(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:740(para) groupmod.8.xml:207(para) groupmod.8.xml:213(para)
-#: groupdel.8.xml:126(para)
+#: useradd.8.xml:756(para) groupmod.8.xml:233(para) groupmod.8.xml:239(para)
+#: groupdel.8.xml:159(para)
 msgid "specified group doesn't exist"
 msgstr "указанная группа не существует"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: useradd.8.xml:744(replaceable) groupmod.8.xml:217(replaceable)
-#: groupadd.8.xml:274(replaceable)
+#: useradd.8.xml:760(replaceable) groupmod.8.xml:243(replaceable)
+#: groupadd.8.xml:289(replaceable)
 msgid "9"
 msgstr "9"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:746(para)
+#: useradd.8.xml:762(para)
 msgid "username already in use"
 msgstr "имя пользователя уже существует"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:758(para)
+#: useradd.8.xml:774(para)
 msgid "can't create home directory"
 msgstr "не удалось создать домашний каталог"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: useradd.8.xml:762(replaceable)
+#: useradd.8.xml:778(replaceable)
 msgid "13"
 msgstr "13"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:764(para)
+#: useradd.8.xml:780(para)
 msgid "can't create mail spool"
 msgstr "не удалось создать почтовый ящик"
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:704(para)
+#: useradd.8.xml:720(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -2470,7 +2560,7 @@
 "Команда <command>useradd</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: useradd.8.xml:773(para)
+#: useradd.8.xml:789(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -2509,41 +2599,41 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refname>
-#: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
+#: suauth.5.xml:38(refentrytitle) suauth.5.xml:45(refname)
 msgid "suauth"
 msgstr "suauth"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><manvolnum>
-#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
-#: pwck.8.xml:306(replaceable) porttime.5.xml:35(manvolnum)
-#: passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable)
-#: login.defs.5.xml:101(manvolnum) login.access.5.xml:36(manvolnum)
-#: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
-#: grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
+#: suauth.5.xml:39(manvolnum) shadow.5.xml:39(manvolnum)
+#: pwck.8.xml:310(replaceable) porttime.5.xml:39(manvolnum)
+#: passwd.5.xml:39(manvolnum) passwd.1.xml:455(replaceable)
+#: login.defs.5.xml:102(manvolnum) login.access.5.xml:40(manvolnum)
+#: limits.5.xml:40(manvolnum) gshadow.5.xml:38(manvolnum)
+#: grpck.8.xml:262(replaceable) faillog.5.xml:39(manvolnum)
 msgid "5"
 msgstr "5"
 
 # type: Content of: <refentry><refmeta><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:102(refmiscinfo) login.access.5.xml:37(refmiscinfo)
-#: limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo)
-#: faillog.5.xml:36(refmiscinfo)
+#: suauth.5.xml:40(refmiscinfo) shadow.5.xml:40(refmiscinfo)
+#: porttime.5.xml:40(refmiscinfo) passwd.5.xml:40(refmiscinfo)
+#: login.defs.5.xml:103(refmiscinfo) login.access.5.xml:41(refmiscinfo)
+#: limits.5.xml:41(refmiscinfo) gshadow.5.xml:39(refmiscinfo)
+#: faillog.5.xml:40(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr "Форматы файлов"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: suauth.5.xml:40(refpurpose)
+#: suauth.5.xml:46(refpurpose)
 msgid "detailed su control file"
 msgstr "файл управления командой su"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: suauth.5.xml:45(command) suauth.5.xml:171(filename)
+#: suauth.5.xml:51(command) suauth.5.xml:177(filename)
 msgid "/etc/suauth"
 msgstr "/etc/suauth"
 
 # type: Content of: <refentry><refsect1><para>
-#: suauth.5.xml:51(para)
+#: suauth.5.xml:57(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:"
@@ -2553,7 +2643,7 @@
 
 # type: Content of: <refentry><refsect1><literallayout>
 #. .RS
-#: suauth.5.xml:58(literallayout)
+#: suauth.5.xml:64(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2566,7 +2656,7 @@
 
 # type: Content of: <refentry><refsect1><para>
 #. .fi
-#: suauth.5.xml:62(para)
+#: suauth.5.xml:68(para)
 msgid ""
 "2) the user executing the su command (or any groups he might be a member of)"
 msgstr ""
@@ -2574,7 +2664,7 @@
 "может быть)"
 
 # type: Content of: <refentry><refsect1><para>
-#: suauth.5.xml:67(para)
+#: suauth.5.xml:73(para)
 msgid ""
 "The file is formatted like this, with lines starting with a # being treated "
 "as comment lines and ignored;"
@@ -2583,7 +2673,7 @@
 "игнорируются;"
 
 # type: Content of: <refentry><refsect1><literallayout>
-#: suauth.5.xml:72(literallayout)
+#: suauth.5.xml:78(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2594,18 +2684,23 @@
 "      желаемый-id:желающий-id:ДЕЙСТВИЕ\n"
 "    "
 
-#: suauth.5.xml:76(para)
+#: suauth.5.xml:82(para)
+#, fuzzy
+#| 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 \",\""
 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 \",\""
+"a list of usernames delimited by \",\"."
 msgstr ""
 "Где желаемый-id может быть словом <emphasis>ALL</emphasis>, списком имён "
 "пользователей, перечисленных через запятую \",\" или фразы <emphasis>ALL "
 "EXCEPT</emphasis> , после которой идёт список имён пользователей "
 "перечисленных через \",\""
 
-#: suauth.5.xml:82(para)
+#: suauth.5.xml:88(para)
 msgid ""
 "from-id is formatted the same as to-id except the extra word "
 "<emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</"
@@ -2624,38 +2719,38 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para>
-#: suauth.5.xml:93(para)
+#: suauth.5.xml:99(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:99(emphasis)
+#: suauth.5.xml:105(emphasis)
 msgid "DENY"
 msgstr "DENY"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: suauth.5.xml:102(para)
+#: suauth.5.xml:108(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:109(emphasis)
+#: suauth.5.xml:115(emphasis)
 msgid "NOPASS"
 msgstr "NOPASS"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: suauth.5.xml:112(para)
+#: suauth.5.xml:118(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:120(emphasis)
+#: suauth.5.xml:126(emphasis)
 msgid "OWNPASS"
 msgstr "OWNPASS"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: suauth.5.xml:123(para)
+#: suauth.5.xml:129(para)
 msgid ""
 "For the su command to be successful, the user must enter his or her own "
 "password. They are told this."
@@ -2664,7 +2759,7 @@
 "собственный пароль."
 
 # type: Content of: <refentry><refsect1><para>
-#: suauth.5.xml:131(para)
+#: suauth.5.xml:137(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 "
@@ -2679,12 +2774,12 @@
 "администратору осуществлять любой контроль, какой он пожелает."
 
 # type: Content of: <refentry><refsect1><title>
-#: suauth.5.xml:141(title)
+#: suauth.5.xml:147(title)
 msgid "EXAMPLE"
 msgstr "ПРИМЕР"
 
 # type: Content of: <refentry><refsect1><literallayout>
-#: suauth.5.xml:142(literallayout)
+#: suauth.5.xml:148(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2734,12 +2829,12 @@
 "    "
 
 # type: Content of: <refentry><refsect1><title>
-#: suauth.5.xml:178(title) pwconv.8.xml:153(title) login.defs.5.xml:488(title)
+#: suauth.5.xml:184(title) pwconv.8.xml:198(title) login.defs.5.xml:491(title)
 msgid "BUGS"
 msgstr "ОШИБКИ РЕАЛИЗАЦИИ"
 
 # type: Content of: <refentry><refsect1><para>
-#: suauth.5.xml:179(para)
+#: suauth.5.xml:185(para)
 msgid ""
 "There could be plenty lurking. The file parser is particularly unforgiving "
 "about syntax errors, expecting no spurious whitespace (apart from beginning "
@@ -2750,11 +2845,11 @@
 "в начале и конце строк) и специальных слов, разделяющих различные вещи."
 
 # type: Content of: <refentry><refsect1><title>
-#: suauth.5.xml:188(title) shadow.3.xml:183(title)
+#: suauth.5.xml:194(title) shadow.3.xml:189(title)
 msgid "DIAGNOSTICS"
 msgstr "ДИАГНОСТИКА"
 
-#: suauth.5.xml:189(para)
+#: suauth.5.xml:195(para)
 msgid ""
 "An error parsing the file is reported using "
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
@@ -2764,7 +2859,7 @@
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry> с уровнем ERR средства AUTH."
 
-#: suauth.5.xml:198(para)
+#: suauth.5.xml:204(para)
 msgid ""
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -2773,33 +2868,33 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command)
-#: login.defs.5.xml:418(term)
+#: su.1.xml:55(refentrytitle) su.1.xml:62(refname) su.1.xml:67(command)
+#: login.defs.5.xml:421(term)
 msgid "su"
 msgstr "su"
 
 # type: Content of: <refentry><refmeta><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:40(refmiscinfo)
+#: su.1.xml:57(refmiscinfo) sg.1.xml:41(refmiscinfo)
+#: passwd.1.xml:47(refmiscinfo) newgrp.1.xml:41(refmiscinfo)
+#: login.1.xml:73(refmiscinfo) groups.1.xml:40(refmiscinfo)
+#: gpasswd.1.xml:45(refmiscinfo) expiry.1.xml:44(refmiscinfo)
+#: chsh.1.xml:43(refmiscinfo) chfn.1.xml:43(refmiscinfo)
+#: chage.1.xml:41(refmiscinfo)
 msgid "User Commands"
 msgstr "Пользовательские команды"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: su.1.xml:60(refpurpose)
+#: su.1.xml:63(refpurpose)
 msgid "change user ID or become superuser"
 msgstr "изменяет ID пользователя или делает его суперпользователем"
 
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><arg><replaceable>
-#: su.1.xml:70(replaceable) login.1.xml:85(replaceable)
-#: login.1.xml:93(replaceable)
+#: su.1.xml:73(replaceable) login.1.xml:88(replaceable)
+#: login.1.xml:96(replaceable)
 msgid "username"
 msgstr "имя_пользователя"
 
-#: su.1.xml:78(para)
+#: su.1.xml:81(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</"
@@ -2814,7 +2909,7 @@
 "option> можно использовать для воссоздания рабочей среды, такой же как если "
 "бы настоящий пользователь выполнял вход в систему."
 
-#: su.1.xml:87(para)
+#: su.1.xml:90(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 "
@@ -2829,7 +2924,7 @@
 "etc/passwd</filename>, которая является регистрационной для указываемого "
 "пользователя."
 
-#: su.1.xml:96(para)
+#: su.1.xml:99(para)
 msgid ""
 "You can use the <option>--</option> argument to separate <command>su</"
 "command> options from the arguments supplied to the shell."
@@ -2838,7 +2933,7 @@
 "<command>su</command> от параметров передаваемых оболочке."
 
 # type: Content of: <refentry><refsect1><para>
-#: su.1.xml:101(para)
+#: su.1.xml:104(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 "
@@ -2848,7 +2943,7 @@
 "возникает сообщение об ошибке. Все попытки, удачные и неудачные, "
 "протоколируются системой с целью обнаружения злоупотреблений."
 
-#: su.1.xml:106(para)
+#: su.1.xml:109(para)
 #, fuzzy
 #| msgid ""
 #| "The current environment is passed to the new shell. The value of <envar>"
@@ -2873,7 +2968,7 @@
 "<filename>/etc/login.defs</filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: su.1.xml:115(para) login.1.xml:166(para)
+#: su.1.xml:118(para) login.1.xml:169(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 "
@@ -2884,11 +2979,11 @@
 "как корень новой файловой системы, в которой регистрируется пользователь."
 
 # type: Content of: <refentry><refsect1><para>
-#: su.1.xml:124(para)
+#: su.1.xml:127(para)
 msgid "The options which apply to the <command>su</command> command are:"
 msgstr "Параметры команды <command>su</command>:"
 
-#: su.1.xml:128(term)
+#: su.1.xml:131(term)
 msgid ""
 "<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
 "replaceable>"
@@ -2897,7 +2992,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: su.1.xml:133(para)
+#: su.1.xml:136(para)
 msgid ""
 "Specify a command that will be invoked by the shell using its <option>-c</"
 "option>."
@@ -2905,12 +3000,18 @@
 "Указать команду, которая будет запущена оболочкой в виде параметра для "
 "<option>-c</option>."
 
-#: su.1.xml:140(term)
+#: su.1.xml:140(para)
+msgid ""
+"The executed command will have no controlling terminal. This option cannot "
+"be used to execute interractive programs which need a controlling TTY."
+msgstr ""
+
+#: su.1.xml:150(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:144(para)
+#: su.1.xml:154(para)
 msgid ""
 "Provide an environment similar to what the user would expect had the user "
 "logged in directly."
@@ -2918,7 +3019,7 @@
 "Предоставляет среду, как если бы пользователь непосредственно "
 "регистрировался в системе."
 
-#: su.1.xml:148(para)
+#: su.1.xml:158(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 "
@@ -2929,16 +3030,16 @@
 "<option>--login</option>) не имеют этого ограничения."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: su.1.xml:162(para)
+#: su.1.xml:172(para)
 msgid "The shell that will be invoked."
 msgstr "Оболочка, которая будет запущена."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: su.1.xml:170(para)
+#: su.1.xml:180(para)
 msgid "The shell specified with --shell."
 msgstr "Оболочка указанная в параметре --shell."
 
-#: su.1.xml:173(para)
+#: su.1.xml:183(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
@@ -2947,7 +3048,7 @@
 "задаётся переменной среды <envar>$SHELL</envar>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: su.1.xml:180(para)
+#: su.1.xml:190(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
@@ -2956,7 +3057,7 @@
 "заданного пользователя."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: su.1.xml:186(para)
+#: su.1.xml:196(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
@@ -2965,14 +3066,14 @@
 "помощью методов, указанных выше."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: su.1.xml:163(para)
+#: su.1.xml:173(para)
 msgid ""
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 "Запущенная оболочка выбирается из (в порядке убывания приоритета): "
 "<placeholder-1/>"
 
-#: su.1.xml:191(para)
+#: su.1.xml:201(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>/"
@@ -2987,7 +3088,7 @@
 "учётную запись, если <command>su</command> не была запущена "
 "суперпользователем."
 
-#: su.1.xml:202(term)
+#: su.1.xml:212(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2995,35 +3096,35 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:211(envar)
+#: su.1.xml:221(envar)
 msgid "$PATH"
 msgstr ""
 
-#: su.1.xml:213(para)
+#: su.1.xml:223(para)
 msgid ""
 "reset according to the <filename>/etc/login.defs</filename> options "
 "<option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
 msgstr ""
 
-#: su.1.xml:222(envar)
+#: su.1.xml:232(envar)
 msgid "$IFS"
 msgstr ""
 
-#: su.1.xml:224(para)
+#: su.1.xml:234(para)
 msgid ""
 "reset to <quote><space><tab><newline></quote>, if it was "
 "set."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: su.1.xml:207(para)
+#: su.1.xml:217(para)
 #, fuzzy
 #| msgid "Preserve the current environment."
 msgid "Preserve the current environment, except for: <placeholder-1/>"
 msgstr "Сохранить имеющуюся рабочую среду."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: su.1.xml:233(para)
+#: su.1.xml:243(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
@@ -3031,27 +3132,27 @@
 "Если заданный пользователь имеет ограниченную оболочку, то этот параметр не "
 "сработает (если <command>su</command> не запускается суперпользователем)."
 
-#: su.1.xml:242(para)
+#: su.1.xml:252(para)
 msgid ""
 "The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, "
 "<envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> "
 "environment variables are reset."
 msgstr ""
 
-#: su.1.xml:251(para)
+#: su.1.xml:261(para)
 msgid ""
 "If <option>--login</option> is not used, the environment is copied, except "
 "for the variables above."
 msgstr ""
 
-#: su.1.xml:258(para)
+#: su.1.xml:268(para)
 msgid ""
 "If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>"
 "$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> "
 "environment variables are copied if they were set."
 msgstr ""
 
-#: su.1.xml:268(para)
+#: su.1.xml:278(para)
 msgid ""
 "If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</"
 "envar>, and <envar>$MAIL</envar> environment variables are set according to "
@@ -3060,24 +3161,24 @@
 "option> (see below)."
 msgstr ""
 
-#: su.1.xml:281(para)
+#: su.1.xml:291(para)
 msgid ""
 "If <option>--login</option> is used, other environment variables might be "
 "set by the <option>ENVIRON_FILE</option> file (see below)."
 msgstr ""
 
-#: su.1.xml:289(para)
+#: su.1.xml:299(para)
 msgid "Other environments might be set by PAM modules."
 msgstr ""
 
-#: su.1.xml:237(para)
+#: su.1.xml:247(para)
 msgid ""
 "Note that the default behavior for the environment is the following: "
 "<placeholder-1/>"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: su.1.xml:303(para)
+#: su.1.xml:313(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -3130,7 +3231,7 @@
 #: 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."
+"is no."
 msgstr ""
 
 #: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
@@ -3247,7 +3348,7 @@
 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."
+"will not be translated."
 msgstr ""
 
 #: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
@@ -3280,7 +3381,9 @@
 msgstr "CHFN_AUTH (логический)"
 
 #: 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."
+msgid ""
+"Enable setting of resource limits from <filename>/etc/limits</filename> and "
+"ulimit, umask, and niceness from the user's passwd gecos field."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3334,64 +3437,64 @@
 "sulog file logging."
 msgstr ""
 
-#: su.1.xml:363(para)
+#: su.1.xml:373(para)
 msgid ""
 "On success, <command>su</command> returns the exit value of the command it "
 "executed."
 msgstr ""
 
-#: su.1.xml:367(para)
+#: su.1.xml:377(para)
 msgid ""
 "If this command was terminated by a signal, <command>su</command> returns "
 "the number of this signal plus 128."
 msgstr ""
 
-#: su.1.xml:371(para)
+#: su.1.xml:381(para)
 msgid ""
 "If su has to kill the command (because it was asked to terminate, and the "
 "command did not terminate in time), <command>su</command> returns 255."
 msgstr ""
 
-#: su.1.xml:383(para)
+#: su.1.xml:393(para)
 msgid "success (<option>--help</option> only)"
 msgstr ""
 
-#: su.1.xml:389(para)
+#: su.1.xml:399(para)
 msgid "System or authentication failure"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: su.1.xml:393(replaceable)
+#: su.1.xml:403(replaceable)
 #, fuzzy
 #| msgid "12"
 msgid "126"
 msgstr "12"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: su.1.xml:395(para)
+#: su.1.xml:405(para)
 #, fuzzy
 #| msgid "execute command as different group ID"
 msgid "The requested command was not found"
 msgstr "выполняет команду с правами другой группы"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: su.1.xml:399(replaceable)
+#: su.1.xml:409(replaceable)
 #, fuzzy
 #| msgid "12"
 msgid "127"
 msgstr "12"
 
-#: su.1.xml:401(para)
+#: su.1.xml:411(para)
 msgid "The requested command could not be executed"
 msgstr ""
 
-#: su.1.xml:376(para)
+#: su.1.xml:386(para)
 msgid ""
 "Some exit values from <command>su</command> are independent from the "
 "executed command: <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:410(para)
+#: su.1.xml:420(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
@@ -3416,30 +3519,30 @@
 "manvolnum></citerefentry>"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command)
+#: sg.1.xml:39(refentrytitle) sg.1.xml:46(refname) sg.1.xml:52(command)
 msgid "sg"
 msgstr "sg"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: sg.1.xml:44(refpurpose)
+#: sg.1.xml:47(refpurpose)
 msgid "execute command as different group ID"
 msgstr "выполняет команду с правами другой группы"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><option>
-#: sg.1.xml:50(arg) newgrp.1.xml:49(arg)
+#: sg.1.xml:53(arg) newgrp.1.xml:52(arg)
 msgid "-"
 msgstr "-"
 
 # type: Content of: <refentry><refsect1><para><option>
-#: sg.1.xml:52(arg) expiry.1.xml:53(arg)
+#: sg.1.xml:55(arg)
 msgid "-c"
 msgstr "-c"
 
-#: sg.1.xml:51(arg)
+#: sg.1.xml:54(arg)
 msgid "group <placeholder-1/> command"
 msgstr "группа <placeholder-1/> команда"
 
-#: sg.1.xml:60(para)
+#: sg.1.xml:63(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/"
@@ -3472,7 +3575,7 @@
 msgid "Enable \"syslog\" logging of <command>sg</command> activity."
 msgstr ""
 
-#: sg.1.xml:119(para)
+#: sg.1.xml:122(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -3511,22 +3614,21 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
-#: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
-#: pwck.8.xml:63(replaceable) pwck.8.xml:78(replaceable)
-#: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
+#: shadow.5.xml:38(refentrytitle) shadow.5.xml:45(refname)
+#: shadow.3.xml:38(refentrytitle) shadow.3.xml:45(refname)
+#: pwck.8.xml:65(replaceable) grpck.8.xml:57(replaceable)
 msgid "shadow"
 msgstr "shadow"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: shadow.5.xml:40(refpurpose)
+#: shadow.5.xml:46(refpurpose)
 #, fuzzy
 #| msgid "the password file"
 msgid "shadowed password file"
 msgstr "файл паролей"
 
 # type: Content of: <refentry><refsect1><para>
-#: shadow.5.xml:45(para)
+#: shadow.5.xml:51(para)
 #, fuzzy
 #| msgid ""
 #| "<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
@@ -3541,7 +3643,7 @@
 "Включает в себя:"
 
 # type: Content of: <refentry><refsect1><para>
-#: shadow.5.xml:51(para) gshadow.5.xml:49(para)
+#: shadow.5.xml:57(para) gshadow.5.xml:55(para)
 msgid ""
 "This file must not be readable by regular users if password security is to "
 "be maintained."
@@ -3549,27 +3651,27 @@
 "Этот файл должен быть недоступен обычному пользователю, если нужно "
 "обеспечить безопасность паролей."
 
-#: shadow.5.xml:56(para)
+#: shadow.5.xml:62(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:63(emphasis) passwd.5.xml:53(para)
+#: shadow.5.xml:69(emphasis) passwd.5.xml:59(para)
 msgid "login name"
 msgstr "имя пользователя для входа в систему"
 
-#: shadow.5.xml:65(para)
+#: shadow.5.xml:71(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:71(emphasis) gshadow.5.xml:68(emphasis)
+#: shadow.5.xml:77(emphasis) gshadow.5.xml:74(emphasis)
 msgid "encrypted password"
 msgstr "шифрованный пароль"
 
-#: shadow.5.xml:73(para) gshadow.5.xml:70(para)
+#: shadow.5.xml:79(para) gshadow.5.xml:76(para)
 msgid ""
 "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry> for details on how this string is interpreted."
@@ -3578,7 +3680,7 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>."
 
-#: shadow.5.xml:78(para)
+#: shadow.5.xml:84(para)
 #, fuzzy
 #| msgid ""
 #| "If the password field contains some string that is not valid result of "
@@ -3600,7 +3702,7 @@
 "<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
 "citerefentry>."
 
-#: shadow.5.xml:85(para)
+#: shadow.5.xml:91(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 "
@@ -3608,7 +3710,7 @@
 "access at all if the password field is empty."
 msgstr ""
 
-#: shadow.5.xml:92(para) gshadow.5.xml:92(para)
+#: shadow.5.xml:98(para) gshadow.5.xml:98(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 "
@@ -3616,85 +3718,85 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.5.xml:102(emphasis)
+#: shadow.5.xml:108(emphasis)
 #, fuzzy
 #| msgid "days before password may be changed"
 msgid "date of last password change"
 msgstr "число дней, перед тем как пароль может быть изменён"
 
-#: shadow.5.xml:105(para)
+#: shadow.5.xml:111(para)
 msgid ""
 "The date of the last password change, expressed as the number of days since "
 "Jan 1, 1970."
 msgstr ""
 
-#: shadow.5.xml:109(para)
+#: shadow.5.xml:115(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:114(para)
+#: shadow.5.xml:120(para)
 msgid "An empty field means that password aging features are disabled."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: shadow.5.xml:121(emphasis)
+#: shadow.5.xml:127(emphasis)
 #, fuzzy
 #| msgid "Password Changes"
 msgid "minimum password age"
 msgstr "Изменение пароля"
 
-#: shadow.5.xml:123(para)
+#: shadow.5.xml:129(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)
+#: shadow.5.xml:134(para)
 msgid "An empty field and value 0 mean that there are no minimum password age."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: shadow.5.xml:135(emphasis)
+#: shadow.5.xml:141(emphasis)
 #, fuzzy
 #| msgid "Password Changes"
 msgid "maximum password age"
 msgstr "Изменение пароля"
 
-#: shadow.5.xml:137(para)
+#: shadow.5.xml:143(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)
+#: shadow.5.xml:147(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)
+#: shadow.5.xml:152(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)
+#: shadow.5.xml:157(para)
 msgid ""
 "If the maximum password age is lower than the minimum password age, the user "
 "cannot change her password."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: shadow.5.xml:159(emphasis)
+#: shadow.5.xml:165(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)
+#: shadow.5.xml:168(para)
 #, fuzzy
 #| msgid ""
 #| "The number of days after a password has expired before the account will "
@@ -3706,96 +3808,96 @@
 "Число дней, которые должны пройти после устаревания пароля, перед тем как "
 "учётная запись будет заблокирована."
 
-#: shadow.5.xml:167(para)
+#: shadow.5.xml:173(para)
 msgid ""
 "An empty field and value 0 mean that there are no password warning period."
 msgstr ""
 
-#: shadow.5.xml:175(emphasis)
+#: shadow.5.xml:181(emphasis)
 msgid "password inactivity period"
 msgstr ""
 
-#: shadow.5.xml:178(para)
+#: shadow.5.xml:184(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)
+#: shadow.5.xml:190(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)
+#: shadow.5.xml:195(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)
+#: shadow.5.xml:203(emphasis)
 #, fuzzy
 #| msgid "User account information."
 msgid "account expiration date"
 msgstr "содержит информацию о пользователях"
 
-#: shadow.5.xml:200(para)
+#: shadow.5.xml:206(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)
+#: shadow.5.xml:210(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)
+#: shadow.5.xml:216(para)
 msgid "An empty field means that the account will never expire."
 msgstr ""
 
-#: shadow.5.xml:213(para)
+#: shadow.5.xml:219(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)
+#: shadow.5.xml:227(emphasis)
 #, fuzzy
 #| msgid "a reserved field"
 msgid "reserved field"
 msgstr "зарезервированное поле"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.5.xml:223(para)
+#: shadow.5.xml:229(para)
 #, fuzzy
 #| msgid "sp_flag - reserved for future use"
 msgid "This field is reserved for future use."
 msgstr "sp_flag - зарезервировано"
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: shadow.5.xml:245(filename)
+#: shadow.5.xml:251(filename)
 #, fuzzy
 #| msgid "/etc/shadow"
 msgid "/etc/shadow-"
 msgstr "/etc/shadow"
 
-#: shadow.5.xml:247(para)
+#: shadow.5.xml:253(para)
 msgid "Backup file for /etc/shadow."
 msgstr ""
 
-#: shadow.5.xml:248(para) passwd.5.xml:134(para)
+#: shadow.5.xml:254(para) passwd.5.xml:140(para)
 msgid ""
 "Note that this file is used by the tools of the shadow toolsuite, but not by "
 "all user and password management tools."
 msgstr ""
 
-#: shadow.5.xml:259(para)
+#: shadow.5.xml:265(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
@@ -3844,107 +3946,107 @@
 "manvolnum></citerefentry>"
 
 # type: Content of: <refentry><refmeta><refmiscinfo>
-#: shadow.3.xml:36(refmiscinfo)
+#: shadow.3.xml:40(refmiscinfo)
 msgid "Library Calls"
 msgstr "Библиотечные функции"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: shadow.3.xml:40(refname)
+#: shadow.3.xml:46(refname)
 msgid "getspnam"
 msgstr "getspnam"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:41(refpurpose)
+#: shadow.3.xml:47(refpurpose)
 msgid "encrypted password file routines"
 msgstr "процедуры для работы с файлом шифрованных паролей"
 
 # type: Content of: <refentry><refsect1><title>
-#: shadow.3.xml:45(title)
+#: shadow.3.xml:51(title)
 msgid "SYNTAX"
 msgstr "СИНТАКСИС"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:47(emphasis)
+#: shadow.3.xml:53(emphasis)
 msgid "#include <shadow.h>"
 msgstr "#include <shadow.h>"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:51(emphasis)
+#: shadow.3.xml:57(emphasis)
 msgid "struct spwd *getspent();"
 msgstr "struct spwd *getspent();"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:55(emphasis)
+#: shadow.3.xml:61(emphasis)
 msgid "struct spwd *getspnam(char"
 msgstr "struct spwd *getspnam(char"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: shadow.3.xml:56(emphasis)
+#: shadow.3.xml:62(emphasis)
 msgid "*name"
 msgstr "*name"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis)
-#: shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:62(emphasis) shadow.3.xml:75(emphasis)
+#: shadow.3.xml:80(emphasis) shadow.3.xml:86(emphasis)
 msgid ");"
 msgstr ");"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:60(emphasis)
+#: shadow.3.xml:66(emphasis)
 msgid "void setspent();"
 msgstr "void setspent();"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:64(emphasis)
+#: shadow.3.xml:70(emphasis)
 msgid "void endspent();"
 msgstr "void endspent();"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:68(emphasis)
+#: shadow.3.xml:74(emphasis)
 msgid "struct spwd *fgetspent(FILE"
 msgstr "struct spwd *fgetspent(FILE"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><emphasis>
-#: shadow.3.xml:69(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:75(emphasis) shadow.3.xml:86(emphasis)
 msgid "*fp"
 msgstr "*fp"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:73(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "struct spwd *sgetspent(char"
 msgstr "struct spwd *sgetspent(char"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:74(emphasis)
+#: shadow.3.xml:80(emphasis)
 msgid "*cp"
 msgstr "*cp"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:78(emphasis)
+#: shadow.3.xml:84(emphasis)
 msgid "int putspent(struct spwd"
 msgstr "int putspent(struct spwd"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "*p,"
 msgstr "*p,"
 
 # type: Content of: <refentry><refsect1><title>
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "FILE"
 msgstr "ФАЙЛ"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:84(emphasis)
+#: shadow.3.xml:90(emphasis)
 msgid "int lckpwdf();"
 msgstr "int lckpwdf();"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:88(emphasis)
+#: shadow.3.xml:94(emphasis)
 msgid "int ulckpwdf();"
 msgstr "int ulckpwdf();"
 
-#: shadow.3.xml:94(para)
+#: shadow.3.xml:100(para)
 msgid ""
 "<emphasis remap=\"I\">shadow</emphasis> manipulates the contents of the "
 "shadow password file, <filename>/etc/shadow</filename>. The structure in the "
@@ -3955,7 +4057,7 @@
 "\"I\">#include</emphasis>:"
 
 # type: Content of: <refentry><refsect1><programlisting>
-#: shadow.3.xml:99(programlisting)
+#: shadow.3.xml:105(programlisting)
 #, no-wrap
 msgid ""
 "struct spwd {\n"
@@ -3984,44 +4086,44 @@
 "}"
 
 # type: Content of: <refentry><refsect1><para>
-#: shadow.3.xml:111(para)
+#: shadow.3.xml:117(para)
 msgid "The meanings of each field are:"
 msgstr "Значение каждого поля:"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:114(para)
+#: shadow.3.xml:120(para)
 msgid "sp_namp - pointer to null-terminated user name"
 msgstr ""
 "sp_namp - указатель на строку с именем пользователя, завершающуюся нулевым "
 "символом"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:117(para)
+#: shadow.3.xml:123(para)
 msgid "sp_pwdp - pointer to null-terminated password"
 msgstr ""
 "sp_pwdp - указатель на строку с паролем, завершающуюся нулевым символом"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:120(para)
+#: shadow.3.xml:126(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:123(para)
+#: shadow.3.xml:129(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:126(para)
+#: shadow.3.xml:132(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:129(para)
+#: shadow.3.xml:135(para)
 msgid ""
 "sp_warn - days before password is to expire that user is warned of pending "
 "password expiration"
@@ -4030,7 +4132,7 @@
 "устаревании пароля перед тем как пароль устареет"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:134(para)
+#: shadow.3.xml:140(para)
 msgid ""
 "sp_inact - days after password expires that account is considered inactive "
 "and disabled"
@@ -4039,18 +4141,18 @@
 "когда начинать считать, что учётная запись неактивна и заблокирована"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:139(para)
+#: shadow.3.xml:145(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:142(para)
+#: shadow.3.xml:148(para)
 msgid "sp_flag - reserved for future use"
 msgstr "sp_flag - зарезервировано"
 
-#: shadow.3.xml:150(para)
+#: shadow.3.xml:156(para)
 msgid ""
 "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, "
 "<emphasis>fgetspent</emphasis>, and <emphasis>sgetspent</emphasis> each "
@@ -4073,7 +4175,7 @@
 "начиная с текущей позиции в файле запись по имени <emphasis>name</emphasis>."
 
 # type: Content of: <refentry><refsect1><para>
-#: shadow.3.xml:163(para)
+#: shadow.3.xml:169(para)
 msgid ""
 "<emphasis>setspent</emphasis> and <emphasis>endspent</emphasis> may be used "
 "to begin and end, respectively, access to the shadow password file."
@@ -4082,7 +4184,7 @@
 "использовать для перемещения в начало и конец файла теневых паролей "
 "соответственно."
 
-#: shadow.3.xml:169(para)
+#: shadow.3.xml:175(para)
 msgid ""
 "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines "
 "should be used to insure exclusive access to the <filename>/etc/shadow</"
@@ -4104,7 +4206,7 @@
 "успешно возвращается 0."
 
 # type: Content of: <refentry><refsect1><para>
-#: shadow.3.xml:184(para)
+#: shadow.3.xml:190(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 "
@@ -4115,7 +4217,7 @@
 "при успешном выполнении и -1 в случае неудачи."
 
 # type: Content of: <refentry><refsect1><para>
-#: shadow.3.xml:194(para)
+#: shadow.3.xml:200(para)
 msgid ""
 "These routines may only be used by the superuser as access to the shadow "
 "password file is restricted."
@@ -4123,7 +4225,7 @@
 "Данные функции могут использоваться только суперпользователем, так как "
 "доступ к файлу теневых паролей ограничен."
 
-#: shadow.3.xml:214(para)
+#: shadow.3.xml:220(para)
 msgid ""
 "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -4134,35 +4236,35 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><command>
-#: pwconv.8.xml:43(refentrytitle) pwconv.8.xml:48(refname)
-#: pwconv.8.xml:57(command) login.defs.5.xml:401(term)
+#: pwconv.8.xml:44(refentrytitle) pwconv.8.xml:51(refname)
+#: pwconv.8.xml:60(command) login.defs.5.xml:404(term)
 msgid "pwconv"
 msgstr "pwconv"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: pwconv.8.xml:49(refname) pwconv.8.xml:60(command)
-#: login.defs.5.xml:410(term)
+#: pwconv.8.xml:52(refname) pwconv.8.xml:66(command)
+#: login.defs.5.xml:413(term)
 msgid "pwunconv"
 msgstr "pwunconv"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: pwconv.8.xml:50(refname) pwconv.8.xml:63(command)
-#: login.defs.5.xml:314(term)
+#: pwconv.8.xml:53(refname) pwconv.8.xml:72(command)
+#: login.defs.5.xml:317(term)
 msgid "grpconv"
 msgstr "grpconv"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: pwconv.8.xml:51(refname) pwconv.8.xml:66(command)
-#: login.defs.5.xml:320(term)
+#: pwconv.8.xml:54(refname) pwconv.8.xml:78(command)
+#: login.defs.5.xml:323(term)
 msgid "grpunconv"
 msgstr "grpunconv"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: pwconv.8.xml:52(refpurpose)
+#: pwconv.8.xml:55(refpurpose)
 msgid "convert to and from shadow passwords and groups"
 msgstr "преобразует пароли пользователей и групп в/из защищённую форму"
 
-#: pwconv.8.xml:72(para)
+#: pwconv.8.xml:87(para)
 msgid ""
 "The <command>pwconv</command> command creates <emphasis remap=\"I\">shadow</"
 "emphasis> from <emphasis remap=\"I\">passwd</emphasis> and an optionally "
@@ -4172,7 +4274,7 @@
 "emphasis> из файла <emphasis remap=\"I\">passwd</emphasis> и необязательно "
 "существующего файла <emphasis remap=\"I\">shadow</emphasis>."
 
-#: pwconv.8.xml:77(para)
+#: pwconv.8.xml:92(para)
 msgid ""
 "<command>pwconv</command> does not work with <option>USE_TCB</option> "
 "enabled. To convert to tcb passwords, you should first use <command>pwconv</"
@@ -4182,7 +4284,7 @@
 "in <filename>login.defs</filename>.)"
 msgstr ""
 
-#: pwconv.8.xml:87(para)
+#: pwconv.8.xml:102(para)
 msgid ""
 "The <command>pwunconv</command> command creates <emphasis remap=\"I"
 "\">passwd</emphasis> from <emphasis remap=\"I\">passwd</emphasis> and "
@@ -4194,7 +4296,7 @@
 "<emphasis remap=\"I\">shadow</emphasis>, а затем удаляет файл <emphasis "
 "remap=\"I\">shadow</emphasis>."
 
-#: pwconv.8.xml:93(para)
+#: pwconv.8.xml:108(para)
 msgid ""
 "<command>pwunconv</command> does not work with <option>USE_TCB</option> "
 "enabled. You should first switch back from tcb to shadowed passwords using "
@@ -4202,7 +4304,7 @@
 "in <filename>login.defs</filename> before using <command>pwunconv</command>."
 msgstr ""
 
-#: pwconv.8.xml:102(para)
+#: pwconv.8.xml:117(para)
 msgid ""
 "The <command>grpconv</command> command creates <emphasis remap=\"I"
 "\">gshadow</emphasis> from <emphasis remap=\"I\">group</emphasis> and an "
@@ -4212,7 +4314,7 @@
 "\">gshadow</emphasis> из файла <emphasis remap=\"I\">group</emphasis> и "
 "необязательно существующего файла <emphasis remap=\"I\">gshadow</emphasis>."
 
-#: pwconv.8.xml:108(para)
+#: pwconv.8.xml:123(para)
 msgid ""
 "The <command>grpunconv</command> command creates <emphasis remap=\"I"
 "\">group</emphasis> from <emphasis remap=\"I\">group</emphasis> and "
@@ -4224,7 +4326,7 @@
 "<emphasis remap=\"I\">gshadow</emphasis>, а затем удаляет файл <emphasis "
 "remap=\"I\">gshadow</emphasis>."
 
-#: pwconv.8.xml:115(para)
+#: pwconv.8.xml:130(para)
 msgid ""
 "These four programs all operate on the normal and shadow password and group "
 "files: <filename>/etc/passwd</filename>, <filename>/etc/group</filename>, "
@@ -4236,7 +4338,7 @@
 "filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: pwconv.8.xml:122(para)
+#: pwconv.8.xml:137(para)
 msgid ""
 "Each program acquires the necessary locks before conversion. "
 "<command>pwconv</command> and <command>grpconv</command> are similar. First, "
@@ -4257,7 +4359,7 @@
 "так и для обновления теневого файла, если главный файл редактировался "
 "вручную."
 
-#: pwconv.8.xml:133(para)
+#: pwconv.8.xml:148(para)
 msgid ""
 "<command>pwconv</command> will use the values of <emphasis remap=\"I"
 "\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis>, "
@@ -4271,7 +4373,7 @@
 "<filename>/etc/shadow</filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: pwconv.8.xml:142(para)
+#: pwconv.8.xml:157(para)
 msgid ""
 "Likewise <command>pwunconv</command> and <command>grpunconv</command> are "
 "similar. Passwords in the main file are updated from the shadowed file. "
@@ -4287,8 +4389,19 @@
 "Информация об устаревании пароля не учитывается программой "
 "<command>pwunconv</command>. Конвертируется только возможное."
 
+#: pwconv.8.xml:169(para)
+#, fuzzy
+#| msgid ""
+#| "The options which apply to the <command>vipw</command> and <command>vigr</"
+#| "command> commands are:"
+msgid ""
+"The options which apply to the <command>pwconv</command>, <command>pwunconv</"
+"command>, <command>grpconv</command>, and <command>grpunconv</command> "
+"commands are:"
+msgstr "Параметры команд <command>vipw</command> и <command>vigr</command>:"
+
 # type: Content of: <refentry><refsect1><para>
-#: pwconv.8.xml:154(para)
+#: pwconv.8.xml:199(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. "
@@ -4300,20 +4413,20 @@
 "Перед конвертацией запустите <command>pwck</command> и <command>grpck</"
 "command>, чтобы исправить возможные ошибки."
 
-#: pwconv.8.xml:165(para)
+#: pwconv.8.xml:210(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:173(para)
+#: pwconv.8.xml:218(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of <command>pwconv</command>:"
 msgstr ""
 
-#: pwconv.8.xml:200(para)
+#: pwconv.8.xml:245(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
@@ -4344,43 +4457,26 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: pwck.8.xml:43(refentrytitle) pwck.8.xml:48(refname) pwck.8.xml:54(command)
-#: pwck.8.xml:69(command) login.defs.5.xml:392(term)
+#: pwck.8.xml:44(refentrytitle) pwck.8.xml:51(refname) pwck.8.xml:57(command)
+#: login.defs.5.xml:395(term)
 msgid "pwck"
 msgstr "pwck"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: pwck.8.xml:49(refpurpose)
+#: pwck.8.xml:52(refpurpose)
 msgid "verify integrity of password files"
 msgstr "проверяет целостность файлов паролей"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: pwck.8.xml:55(arg) pwck.8.xml:70(arg) pwck.8.xml:177(option)
-msgid "-q"
-msgstr "-q"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: pwck.8.xml:56(arg) pwck.8.xml:198(option) grpck.8.xml:58(arg)
-#: grpck.8.xml:149(option)
-msgid "-s"
-msgstr "-s"
-
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: pwck.8.xml:59(replaceable) pwck.8.xml:74(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:381(term)
+#: pwck.8.xml:61(replaceable) passwd.5.xml:38(refentrytitle)
+#: passwd.5.xml:45(refname) passwd.1.xml:45(refentrytitle)
+#: passwd.1.xml:52(refname) passwd.1.xml:58(command)
+#: login.defs.5.xml:384(term)
 msgid "passwd"
 msgstr "passwd"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: pwck.8.xml:71(arg) pwck.8.xml:188(option) login.1.xml:222(option)
-#: grpck.8.xml:49(arg) grpck.8.xml:139(option)
-msgid "-r"
-msgstr "-r"
-
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:87(para)
+#: pwck.8.xml:74(para)
 #, fuzzy
 #| msgid ""
 #| "The <command>pwck</command> command verifies the integrity of the system "
@@ -4406,82 +4502,82 @@
 "которых невозможно."
 
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:99(para) grpck.8.xml:80(para)
+#: pwck.8.xml:86(para) grpck.8.xml:75(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr "Выполняются следующие проверки:"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:102(para) grpck.8.xml:84(para)
+#: pwck.8.xml:89(para) grpck.8.xml:79(para)
 msgid "the correct number of fields"
 msgstr "правильное количество полей"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:105(para)
+#: pwck.8.xml:92(para)
 #, fuzzy
 #| msgid "a unique user name"
 msgid "a unique and valid user name"
 msgstr "уникальность имени пользователя"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:108(para)
+#: pwck.8.xml:95(para)
 msgid "a valid user and group identifier"
 msgstr "допустимость идентификатора пользователя и группы"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:111(para)
+#: pwck.8.xml:98(para)
 msgid "a valid primary group"
 msgstr "допустимость первичной группы"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:114(para)
+#: pwck.8.xml:101(para)
 msgid "a valid home directory"
 msgstr "допустимость домашнего каталога"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:117(para)
+#: pwck.8.xml:104(para)
 msgid "a valid login shell"
 msgstr "допустимость регистрационной оболочки"
 
-#: pwck.8.xml:121(para)
+#: pwck.8.xml:108(para)
 msgid ""
 "<filename>shadow</filename> checks are enabled when a second file parameter "
 "is specified or when <filename>/etc/shadow</filename> exists on the system."
 msgstr ""
 
-#: pwck.8.xml:126(para)
+#: pwck.8.xml:113(para)
 msgid "These checks are the following:"
 msgstr ""
 
-#: pwck.8.xml:131(para)
+#: pwck.8.xml:118(para)
 msgid ""
 "every passwd entry has a matching shadow entry, and every shadow entry has a "
 "matching passwd entry"
 msgstr ""
 
-#: pwck.8.xml:137(para)
+#: pwck.8.xml:124(para)
 msgid "passwords are specified in the shadowed file"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:140(para)
+#: pwck.8.xml:127(para)
 #, fuzzy
 #| msgid "the correct number of fields"
 msgid "shadow entries have the correct number of fields"
 msgstr "правильное количество полей"
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:130(para)
 msgid "shadow entries are unique in shadow"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:146(para)
+#: pwck.8.xml:133(para)
 #, fuzzy
 #| msgid "days before password may be changed"
 msgid "the last password changes are not in the future"
 msgstr "число дней, перед тем как пароль может быть изменён"
 
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:150(para)
+#: pwck.8.xml:137(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 "
@@ -4500,7 +4596,7 @@
 "пользователю предлагается запустить команду <command>usermod</command>, "
 "чтобы исправить ошибку."
 
-#: pwck.8.xml:161(para)
+#: pwck.8.xml:148(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> "
@@ -4510,13 +4606,22 @@
 "изменять повреждённые или дублирующиеся записи. Как раз в этом случае и "
 "нужно использовать <command>pwck</command> для удаления испорченной записи."
 
+#: pwck.8.xml:158(para) grpck.8.xml:129(para)
+#, fuzzy
+msgid ""
+"The <option>-r</option> and <option>-s</option> options cannot be combined."
+msgstr ""
+"Параметры <option>-r</option>, <option>-h</option> и <option>-f</option> "
+"используются только если <command>login</command> запускается "
+"суперпользователем."
+
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:171(para)
+#: pwck.8.xml:162(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:180(para)
+#: pwck.8.xml:175(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
@@ -4524,11 +4629,23 @@
 "Сообщать только об ошибках. Предупреждения, которые не требуют от "
 "пользователя никаких действий, показаны не будут."
 
-#: pwck.8.xml:191(para)
+#: pwck.8.xml:182(term) grpck.8.xml:144(term)
+#, fuzzy
+#| msgid "<option>-r</option>, <option>--remove</option>"
+msgid "<option>-r</option>, <option>--read-only</option>"
+msgstr "<option>-r</option>, <option>--remove</option>"
+
+#: pwck.8.xml:184(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr "Выполнять команду <command>pwck</command> в режиме \"только чтение\"."
 
-#: pwck.8.xml:201(para)
+#: pwck.8.xml:203(term) grpck.8.xml:167(term)
+#, fuzzy
+#| msgid "<option>-s</option>, <option>--shadow</option>"
+msgid "<option>-s</option>, <option>--sort</option>"
+msgstr "<option>-s</option>, <option>--shadow</option>"
+
+#: pwck.8.xml:205(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
@@ -4536,13 +4653,13 @@
 "Отсортировать все записи в файлах <filename>/etc/passwd</filename> и "
 "<filename>/etc/shadow</filename> по числовому идентификатору пользователя."
 
-#: pwck.8.xml:205(para)
+#: pwck.8.xml:209(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "This option has no effect when <option>USE_TCB</option> is enabled."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: pwck.8.xml:212(para)
+#: pwck.8.xml:216(para)
 #, fuzzy
 #| msgid ""
 #| "By default, <command>pwck</command> operates on the files <filename>/etc/"
@@ -4561,7 +4678,7 @@
 "указать другие файлы с помощью параметров <emphasis remap=\"I\">passwd</"
 "emphasis> и <emphasis remap=\"I\">shadow</emphasis>"
 
-#: pwck.8.xml:221(para)
+#: pwck.8.xml:225(para)
 msgid ""
 "Note that when <option>USE_TCB</option> is enabled, you cannot specify an "
 "alternative <replaceable>shadow</replaceable> file. In future releases, this "
@@ -4569,34 +4686,34 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:290(para)
+#: pwck.8.xml:294(para)
 msgid "one or more bad password entries"
 msgstr "есть одна или более записей с недопустимыми паролями"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:296(para)
+#: pwck.8.xml:300(para)
 msgid "can't open password files"
 msgstr "не удалось открыть файл паролей"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:302(para)
+#: pwck.8.xml:306(para)
 msgid "can't lock password files"
 msgstr "не удалось заблокировать файл паролей"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:308(para)
+#: pwck.8.xml:312(para)
 msgid "can't update password files"
 msgstr "не удалось изменить файл паролей"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:314(para)
+#: pwck.8.xml:318(para)
 #, fuzzy
 #| msgid "can't open password files"
 msgid "can't sort password files"
 msgstr "не удалось открыть файл паролей"
 
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:272(para)
+#: pwck.8.xml:276(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4604,7 +4721,7 @@
 "Команда <command>pwck</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: pwck.8.xml:323(para)
+#: pwck.8.xml:327(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
@@ -4635,17 +4752,17 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
+#: porttime.5.xml:38(refentrytitle) porttime.5.xml:45(refname)
 msgid "porttime"
 msgstr "porttime"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: porttime.5.xml:40(refpurpose)
+#: porttime.5.xml:46(refpurpose)
 msgid "port access time file"
 msgstr "файл с временами доступа к портам"
 
 # type: Content of: <refentry><refsect1><para>
-#: porttime.5.xml:45(para)
+#: porttime.5.xml:51(para)
 msgid ""
 "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, "
 "user names, and permitted login times."
@@ -4654,7 +4771,7 @@
 "tty, имена пользователей и разрешённое время входа."
 
 # type: Content of: <refentry><refsect1><para>
-#: porttime.5.xml:50(para)
+#: porttime.5.xml:56(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 "
@@ -4671,7 +4788,7 @@
 "под правило этой записи. В третьем поле содержится список (через запятую) "
 "допустимого времени работы."
 
-#: porttime.5.xml:59(para)
+#: porttime.5.xml:65(para)
 msgid ""
 "Each access time entry consists of zero or more days of the week, "
 "abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</"
@@ -4691,11 +4808,11 @@
 "предполагается <emphasis>Al</emphasis> в качестве значения по умолчанию."
 
 # type: Content of: <refentry><refsect1><title>
-#: porttime.5.xml:73(title)
+#: porttime.5.xml:79(title)
 msgid "EXAMPLES"
 msgstr "ПРИМЕРЫ"
 
-#: porttime.5.xml:74(para)
+#: porttime.5.xml:80(para)
 msgid ""
 "The following entry allows access to user <emphasis remap=\"B\">jfh</"
 "emphasis> on every port during weekdays from 9am to 5pm."
@@ -4704,11 +4821,11 @@
 "emphasis> с любого порта по будням с 9:00 до 17:00."
 
 # type: Content of: <refentry><refsect1><para>
-#: porttime.5.xml:80(para)
+#: porttime.5.xml:86(para)
 msgid "*:jfh:Wk0900-1700"
 msgstr "*:jfh:Wk0900-1700"
 
-#: porttime.5.xml:82(para)
+#: porttime.5.xml:88(para)
 msgid ""
 "The following entries allow access only to the users <emphasis>root</"
 "emphasis> and <emphasis>oper</emphasis> on <filename>/dev/console</filename> "
@@ -4724,7 +4841,7 @@
 "в любое время."
 
 # type: Content of: <refentry><refsect1><programlisting>
-#: porttime.5.xml:91(programlisting)
+#: porttime.5.xml:97(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -4737,7 +4854,7 @@
 "      console:*:\n"
 "    "
 
-#: porttime.5.xml:96(para)
+#: porttime.5.xml:102(para)
 msgid ""
 "The following entry allows access for the user <emphasis>games</emphasis> on "
 "any port during non-working hours."
@@ -4746,23 +4863,23 @@
 "любого порта в нерабочие часы."
 
 # type: Content of: <refentry><refsect1><para>
-#: porttime.5.xml:101(para)
+#: porttime.5.xml:107(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:108(filename) logoutd.8.xml:67(filename)
+#: porttime.5.xml:114(filename) logoutd.8.xml:73(filename)
 msgid "/etc/porttime"
 msgstr "/etc/porttime"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: porttime.5.xml:110(para) logoutd.8.xml:69(para)
+#: porttime.5.xml:116(para) logoutd.8.xml:75(para)
 msgid "File containing port access."
 msgstr ""
 "содержит разрешённое время работы определённых пользователей с определённых "
 "портов"
 
-#: porttime.5.xml:118(para) login.access.5.xml:109(para)
+#: porttime.5.xml:124(para) login.access.5.xml:115(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -4771,12 +4888,12 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: passwd.5.xml:40(refpurpose)
+#: passwd.5.xml:46(refpurpose)
 msgid "the password file"
 msgstr "файл паролей"
 
 # type: Content of: <refentry><refsect1><para>
-#: passwd.5.xml:45(para)
+#: passwd.5.xml:51(para)
 msgid ""
 "<filename>/etc/passwd</filename> contains one line for each user account, "
 "with seven fields delimited by colons (<quote>:</quote>). These fields are:"
@@ -4786,36 +4903,36 @@
 "двоеточиями (<quote>:</quote>). Поля:"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: passwd.5.xml:56(para)
+#: passwd.5.xml:62(para)
 msgid "optional encrypted password"
 msgstr "необязательный зашифрованный пароль"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: passwd.5.xml:59(para)
+#: passwd.5.xml:65(para)
 msgid "numerical user ID"
 msgstr "числовой идентификатор пользователя"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: passwd.5.xml:62(para)
+#: passwd.5.xml:68(para)
 msgid "numerical group ID"
 msgstr "числовой идентификатор группы"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: passwd.5.xml:65(para)
+#: passwd.5.xml:71(para)
 msgid "user name or comment field"
 msgstr "ФИО пользователя или поле комментария"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: passwd.5.xml:68(para)
+#: passwd.5.xml:74(para)
 msgid "user home directory"
 msgstr "домашний каталог пользователя"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: passwd.5.xml:71(para)
+#: passwd.5.xml:77(para)
 msgid "optional user command interpreter"
 msgstr "необязательный интерпретатор командной строки пользователя"
 
-#: passwd.5.xml:75(para)
+#: passwd.5.xml:81(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 "
@@ -4846,7 +4963,7 @@
 "определено в <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>."
 
-#: passwd.5.xml:94(para)
+#: passwd.5.xml:100(para)
 msgid ""
 "The comment field is used by various system utilities, such as "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
@@ -4856,7 +4973,7 @@
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: passwd.5.xml:100(para)
+#: passwd.5.xml:106(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 "
@@ -4866,7 +4983,7 @@
 "<command>login</command> использует эту информацию для установки значения "
 "переменной среды <envar>$HOME</envar>."
 
-#: passwd.5.xml:106(para)
+#: passwd.5.xml:112(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 "
@@ -4881,22 +4998,22 @@
 "используется значение по умолчанию <filename>/bin/sh</filename>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.5.xml:127(para)
+#: passwd.5.xml:133(para)
 msgid "optional encrypted password file"
 msgstr "необязательный файл с шифрованными паролями"
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: passwd.5.xml:131(filename)
+#: passwd.5.xml:137(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/passwd-"
 msgstr "/etc/passwd"
 
-#: passwd.5.xml:133(para)
+#: passwd.5.xml:139(para)
 msgid "Backup file for /etc/passwd."
 msgstr ""
 
-#: passwd.5.xml:145(para)
+#: passwd.5.xml:151(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
@@ -4953,12 +5070,12 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: passwd.1.xml:50(refpurpose)
+#: passwd.1.xml:53(refpurpose)
 msgid "change user password"
 msgstr "изменяет пароль пользователя"
 
 # type: Content of: <refentry><refsect1><para>
-#: passwd.1.xml:67(para)
+#: passwd.1.xml:70(para)
 #, fuzzy
 #| msgid ""
 #| "The <command>passwd</command> command changes passwords for user "
@@ -4981,12 +5098,12 @@
 "или дату устаревания пароля и интервал."
 
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: passwd.1.xml:76(title)
+#: passwd.1.xml:79(title)
 msgid "Password Changes"
 msgstr "Изменение пароля"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: passwd.1.xml:77(para)
+#: passwd.1.xml:80(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 "
@@ -4999,7 +5116,7 @@
 "пропускается, для того чтобы можно было изменить забытый пароль."
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: passwd.1.xml:85(para)
+#: passwd.1.xml:88(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, "
@@ -5011,7 +5128,7 @@
 "завершает работу."
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: passwd.1.xml:92(para)
+#: passwd.1.xml:95(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 "
@@ -5022,7 +5139,7 @@
 "совпасть."
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: passwd.1.xml:98(para)
+#: passwd.1.xml:101(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 "
@@ -5033,22 +5150,22 @@
 "символов каждого типа:"
 
 # type: Content of: <refentry><refsect1><refsect2><itemizedlist><listitem><para>
-#: passwd.1.xml:106(para)
+#: passwd.1.xml:109(para)
 msgid "lower case alphabetics"
 msgstr "строчные буквы"
 
 # type: Content of: <refentry><refsect1><refsect2><itemizedlist><listitem><para>
-#: passwd.1.xml:109(para)
+#: passwd.1.xml:112(para)
 msgid "digits 0 thru 9"
 msgstr "цифры от 0 до 9"
 
 # type: Content of: <refentry><refsect1><refsect2><itemizedlist><listitem><para>
-#: passwd.1.xml:112(para)
+#: passwd.1.xml:115(para)
 msgid "punctuation marks"
 msgstr "знаки пунктуации"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: passwd.1.xml:116(para)
+#: passwd.1.xml:119(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 "
@@ -5059,12 +5176,12 @@
 "сложности."
 
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: passwd.1.xml:125(title)
+#: passwd.1.xml:128(title)
 msgid "Hints for user passwords"
 msgstr "Выбор пароля"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: passwd.1.xml:126(para)
+#: passwd.1.xml:129(para)
 #, fuzzy
 #| msgid ""
 #| "The security of a password depends upon the strength of the encryption "
@@ -5086,7 +5203,7 @@
 "зависит от степени произвольности выбранного пароля."
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: passwd.1.xml:135(para)
+#: passwd.1.xml:138(para)
 msgid ""
 "Compromises in password security normally result from careless password "
 "selection or handling. For this reason, you should not select a password "
@@ -5101,22 +5218,22 @@
 "лицензии, днём рождения и домашним адресом. Обо всём этом легко догадаться, "
 "что приведёт к нарушению безопасности системы."
 
-#: passwd.1.xml:144(para)
+#: passwd.1.xml:147(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:153(para)
+#: passwd.1.xml:156(para)
 msgid "The options which apply to the <command>passwd</command> command are:"
 msgstr "Параметры команды <command>passwd</command>:"
 
-#: passwd.1.xml:158(term) faillog.8.xml:71(term)
+#: passwd.1.xml:161(term) faillog.8.xml:77(term)
 msgid "<option>-a</option>, <option>--all</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
-#: passwd.1.xml:162(para)
+#: passwd.1.xml:165(para)
 msgid ""
 "This option can be used only with <option>-S</option> and causes show status "
 "for all users."
@@ -5124,12 +5241,12 @@
 "Этот параметр можно использовать только вместе с <option>-S</option> для "
 "вывода статуса всех пользователей."
 
-#: passwd.1.xml:169(term)
+#: passwd.1.xml:172(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:173(para)
+#: passwd.1.xml:176(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."
@@ -5138,12 +5255,12 @@
 "заблокировать пароль учётной записи. Это делает указанную учётную запись "
 "беспарольной."
 
-#: passwd.1.xml:181(term)
+#: passwd.1.xml:184(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:185(para)
+#: passwd.1.xml:188(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."
@@ -5151,7 +5268,7 @@
 "Немедленно сделать пароль устаревшим. В результате это заставит пользователя "
 "изменить пароль при следующем входе в систему."
 
-#: passwd.1.xml:198(term)
+#: passwd.1.xml:201(term)
 msgid ""
 "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -5160,7 +5277,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:202(para)
+#: passwd.1.xml:205(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 "
@@ -5172,12 +5289,12 @@
 "и прошло более указанных <replaceable>ДНЕЙ</replaceable>, то пользователь "
 "больше не сможет использовать данную учётную запись."
 
-#: passwd.1.xml:211(term)
+#: passwd.1.xml:214(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:215(para)
+#: passwd.1.xml:218(para)
 msgid ""
 "Indicate password change should be performed only for expired authentication "
 "tokens (passwords). The user wishes to keep their non-expired tokens as "
@@ -5187,12 +5304,12 @@
 "аутентификации (паролей). Пользователи хотят оставить свои непросроченные "
 "ключи нетронутыми."
 
-#: passwd.1.xml:223(term)
+#: passwd.1.xml:226(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:227(para)
+#: passwd.1.xml:230(para)
 #, fuzzy
 msgid ""
 "Lock the password of the named account. This option disables a password by "
@@ -5203,7 +5320,7 @@
 "запись изменяя значение пароля на вариант, который не может быть шифрованным "
 "паролем."
 
-#: passwd.1.xml:233(para)
+#: passwd.1.xml:236(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 "
@@ -5211,11 +5328,11 @@
 "(this set the account's expire date to Jan 2, 1970)."
 msgstr ""
 
-#: passwd.1.xml:240(para)
+#: passwd.1.xml:243(para)
 msgid "Users with a locked password are not allowed to change their password."
 msgstr ""
 
-#: passwd.1.xml:247(term)
+#: passwd.1.xml:250(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
@@ -5228,7 +5345,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:251(para) chage.1.xml:146(para)
+#: passwd.1.xml:254(para) chage.1.xml:149(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -5238,7 +5355,7 @@
 "пароля. Нулевое значение этого поля указывает на то, что пользователь может "
 "менять свой пароль когда захочет."
 
-#: passwd.1.xml:269(term)
+#: passwd.1.xml:272(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -5246,16 +5363,16 @@
 "<option>-r</option>, <option>--repository</option> <replaceable>РЕПОЗИТОРИЙ</"
 "replaceable>"
 
-#: passwd.1.xml:273(para)
+#: passwd.1.xml:276(para)
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr "Изменить пароль в <replaceable>РЕПОЗИТОРИИ</replaceable>."
 
-#: passwd.1.xml:279(term)
+#: passwd.1.xml:295(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:283(para)
+#: passwd.1.xml:299(para)
 #, fuzzy
 #| msgid ""
 #| "Display account status information. The status information consists of 7 "
@@ -5282,12 +5399,12 @@
 "выдачи предупреждения и период неактивности пароля. Эти сроки измеряются в "
 "днях."
 
-#: passwd.1.xml:297(term)
+#: passwd.1.xml:313(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:301(para)
+#: passwd.1.xml:317(para)
 #, fuzzy
 msgid ""
 "Unlock the password of the named account. This option re-enables a password "
@@ -5298,7 +5415,7 @@
 "запись изменяя пароль на прежнее значение (которое было перед использованием "
 "параметра <option>-l</option>)."
 
-#: passwd.1.xml:310(term)
+#: passwd.1.xml:326(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -5307,7 +5424,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:314(para)
+#: passwd.1.xml:330(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 "
@@ -5319,7 +5436,7 @@
 "дней перед тем как пароль устареет, в течении которых пользователю будут "
 "напоминать, что пароль скоро устареет."
 
-#: passwd.1.xml:323(term)
+#: passwd.1.xml:339(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -5328,7 +5445,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:327(para)
+#: passwd.1.xml:343(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -5337,7 +5454,7 @@
 "рабочим. После <replaceable>МАКС_ДНЕЙ</replaceable> пароль нужно изменить."
 
 # type: Content of: <refentry><refsect1><para>
-#: passwd.1.xml:339(para)
+#: passwd.1.xml:355(para)
 #, fuzzy
 #| msgid ""
 #| "Not all options may be supported. Password complexity checking may vary "
@@ -5354,13 +5471,13 @@
 "сложности, чтобы ему нормально работалось. Пользователи не могут изменять "
 "свои пароли в системе, если включён NIS и они не вошли на сервер NIS."
 
-#: passwd.1.xml:344(para)
+#: passwd.1.xml:360(para)
 msgid ""
 "Users may not be able to change their password on a system if NIS is enabled "
 "and they are not logged into the NIS server."
 msgstr ""
 
-#: passwd.1.xml:349(para)
+#: passwd.1.xml:365(para)
 msgid ""
 "<command>passwd</command> uses PAM to authenticate users and to change their "
 "passwords."
@@ -5434,7 +5551,7 @@
 #: 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 "
+"This variable is superseded by the <option>ENCRYPT_METHOD</option> variable "
 "or by any command line option used to configure the encryption algorithm."
 msgstr ""
 
@@ -5528,7 +5645,7 @@
 
 #: 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."
+msgid "The values must be inside the 1000-999,999,999 range."
 msgstr ""
 
 #: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para)
@@ -5547,45 +5664,45 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: passwd.1.xml:395(filename)
+#: passwd.1.xml:411(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/passwd"
 
-#: passwd.1.xml:397(para)
+#: passwd.1.xml:413(para)
 msgid "PAM configuration for <command>passwd</command>."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:417(para) chage.1.xml:257(para)
+#: passwd.1.xml:433(para) chage.1.xml:273(para)
 msgid "permission denied"
 msgstr "доступ запрещён"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:423(para)
+#: passwd.1.xml:439(para)
 msgid "invalid combination of options"
 msgstr "недопустимая комбинация параметров"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:429(para)
+#: passwd.1.xml:445(para)
 msgid "unexpected failure, nothing done"
 msgstr "неожиданная ошибка при работе, ничего не сделано"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:435(para)
+#: passwd.1.xml:451(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:441(para)
+#: passwd.1.xml:457(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 "файл <filename>passwd</filename> занят другой программой, попробуйте ещё раз"
 
 # type: Content of: <refentry><refsect1><para>
-#: passwd.1.xml:405(para)
+#: passwd.1.xml:421(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5593,44 +5710,49 @@
 "Программа <command>passwd</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: passwd.1.xml:456(para)
+#: passwd.1.xml:472(para)
 #, fuzzy
 #| msgid ""
-#| "<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>."
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
-"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
-"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>chpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <phrase condition=\"no_pam"
+"\"><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, </phrase><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><command>
-#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname)
-#: nologin.8.xml:45(command)
+#: nologin.8.xml:38(refentrytitle) nologin.8.xml:45(refname)
+#: nologin.8.xml:51(command)
 msgid "nologin"
 msgstr "nologin"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: nologin.8.xml:40(refpurpose)
+#: nologin.8.xml:46(refpurpose)
 msgid "politely refuse a login"
 msgstr "вежливо отказывает во входе в систему"
 
 # type: Content of: <refentry><refsect1><para>
-#: nologin.8.xml:51(para)
+#: nologin.8.xml:57(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 "
@@ -5641,7 +5763,7 @@
 "для замены оболочки командной строки в поле оболочки у заблокированных "
 "учётных записей."
 
-#: nologin.8.xml:56(para)
+#: nologin.8.xml:62(para)
 msgid ""
 "To disable all logins, investigate <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
@@ -5650,7 +5772,7 @@
 "<citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>."
 
-#: nologin.8.xml:65(para)
+#: nologin.8.xml:71(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
@@ -5661,38 +5783,37 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><title>
-#: nologin.8.xml:76(title)
+#: nologin.8.xml:82(title)
 #, fuzzy
 #| msgid "HYSTORY"
 msgid "HISTORY"
 msgstr "ИСТОРИЯ"
 
 # type: Content of: <refentry><refsect1><para>
-#: nologin.8.xml:77(para)
+#: nologin.8.xml:83(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:50(refentrytitle) newusers.8.xml:55(refname)
-#: newusers.8.xml:61(command) login.defs.5.xml:365(term)
+#: newusers.8.xml:51(refentrytitle) newusers.8.xml:58(refname)
+#: newusers.8.xml:64(command) login.defs.5.xml:368(term)
 msgid "newusers"
 msgstr "newusers"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: newusers.8.xml:56(refpurpose)
+#: newusers.8.xml:59(refpurpose)
 msgid "update and create new users in batch"
 msgstr ""
 "обновляет и создаёт новые учётные записи пользователей в пакетном режиме"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: newusers.8.xml:64(replaceable)
-msgid "new_users"
-msgstr "new_users"
+#: newusers.8.xml:69(replaceable)
+msgid "file"
+msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: newusers.8.xml:71(para)
+#: newusers.8.xml:76(para)
 #, fuzzy
 #| msgid ""
 #| "The <command>newusers</command> command reads a file of user name and "
@@ -5702,12 +5823,12 @@
 #| "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 exceptions "
-"explained below:"
+"The <command>newusers</command> command reads a <replaceable>file</"
+"replaceable> (or the standard input by default) and uses this information to "
+"update a set 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 exceptions explained below:"
 msgstr ""
 "Программа <command>newusers</command> читает файл с парами имя пользователя/"
 "нешифрованный пароль и использует эту информацию для обновления группы "
@@ -5715,22 +5836,22 @@
 "стандартного файла паролей (смотрите <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>) за исключением:"
 
-#: newusers.8.xml:79(para)
+#: newusers.8.xml:84(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:84(emphasis)
+#: newusers.8.xml:89(emphasis)
 #, fuzzy
 #| msgid "group_name"
 msgid "pw_name"
 msgstr "имя_группы"
 
-#: newusers.8.xml:87(para)
+#: newusers.8.xml:92(para)
 msgid "This is the name of the user."
 msgstr ""
 
-#: newusers.8.xml:90(para)
+#: newusers.8.xml:95(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, "
@@ -5738,12 +5859,12 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: newusers.8.xml:101(emphasis)
+#: newusers.8.xml:106(emphasis)
 msgid "pw_passwd"
 msgstr "pw_passwd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: newusers.8.xml:104(para)
+#: newusers.8.xml:109(para)
 msgid ""
 "This field will be encrypted and used as the new value of the encrypted "
 "password."
@@ -5752,63 +5873,63 @@
 "пароля."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
-#: newusers.8.xml:112(emphasis)
+#: newusers.8.xml:117(emphasis)
 #, fuzzy
 #| msgid "pw_gid"
 msgid "pw_uid"
 msgstr "pw_gid"
 
-#: newusers.8.xml:115(para)
+#: newusers.8.xml:120(para)
 msgid "This field is used to define the UID of the user."
 msgstr ""
 
-#: newusers.8.xml:118(para)
+#: newusers.8.xml:123(para)
 msgid ""
 "If the field is empty, an new (unused) UID will be defined automatically by "
 "<command>newusers</command>."
 msgstr ""
 
-#: newusers.8.xml:122(para)
+#: newusers.8.xml:127(para)
 msgid "If this field contains a number, this number will be used as the UID."
 msgstr ""
 
-#: newusers.8.xml:126(para)
+#: newusers.8.xml:131(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:132(para)
+#: newusers.8.xml:137(para)
 msgid ""
 "If the UID of an existing user is changed, the files ownership of the user's "
 "file should be fixed manually."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
-#: newusers.8.xml:140(emphasis)
+#: newusers.8.xml:145(emphasis)
 msgid "pw_gid"
 msgstr "pw_gid"
 
-#: newusers.8.xml:143(para)
+#: newusers.8.xml:148(para)
 msgid "This field is used to define the primary group ID for the user."
 msgstr ""
 
-#: newusers.8.xml:146(para)
+#: newusers.8.xml:151(para)
 msgid ""
 "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:152(para)
+#: newusers.8.xml:157(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:158(para)
+#: newusers.8.xml:163(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> "
@@ -5816,57 +5937,57 @@
 "group."
 msgstr ""
 
-#: newusers.8.xml:164(para)
+#: newusers.8.xml:169(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 "
+"created before 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."
+"and GID for the new group."
 msgstr ""
 
-#: newusers.8.xml:176(emphasis)
+#: newusers.8.xml:181(emphasis)
 msgid "pw_gecos"
 msgstr ""
 
-#: newusers.8.xml:179(para)
+#: newusers.8.xml:184(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:186(emphasis)
+#: newusers.8.xml:191(emphasis)
 msgid "pw_dir"
 msgstr "pw_dir"
 
-#: newusers.8.xml:189(para)
+#: newusers.8.xml:194(para)
 msgid "This field is used to define the home directory of the user."
 msgstr ""
 
-#: newusers.8.xml:192(para)
+#: newusers.8.xml:197(para)
 msgid ""
 "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:197(para)
+#: newusers.8.xml:202(para)
 msgid ""
 "If the home directory of an existing user is changed, <command>newusers</"
 "command> does not move or copy the content of the old directory to the new "
 "location. This should be done manually."
 msgstr ""
 
-#: newusers.8.xml:207(emphasis)
+#: newusers.8.xml:212(emphasis)
 msgid "pw_shell"
 msgstr ""
 
-#: newusers.8.xml:210(para)
+#: newusers.8.xml:215(para)
 msgid ""
 "This field defines the shell of the user. No checks are performed on this "
 "field."
 msgstr ""
 
-#: newusers.8.xml:218(para)
+#: newusers.8.xml:223(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 "
@@ -5874,7 +5995,7 @@
 "no changes are committed to the databases."
 msgstr ""
 
-#: newusers.8.xml:224(para)
+#: newusers.8.xml:229(para)
 msgid ""
 "During this first pass, users are created with a locked password (and "
 "passwords are not changed for the users which are not created). A second "
@@ -5883,7 +6004,7 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: newusers.8.xml:232(para)
+#: newusers.8.xml:237(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are updated at a single time."
@@ -5892,29 +6013,29 @@
 "один раз заводится несколько учётных записей."
 
 # type: Content of: <refentry><refsect1><para>
-#: newusers.8.xml:240(para)
+#: newusers.8.xml:245(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:245(term) chgpasswd.8.xml:95(term)
+#: newusers.8.xml:250(term) chgpasswd.8.xml:98(term)
 #, fuzzy
 msgid "<option>-c</option>, <option>--crypt-method</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: newusers.8.xml:247(para) chpasswd.8.xml:120(para) chgpasswd.8.xml:97(para)
+#: newusers.8.xml:252(para) chpasswd.8.xml:123(para) chgpasswd.8.xml:100(para)
 msgid "Use the specified method to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:248(para) chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
+#: newusers.8.xml:253(para) chpasswd.8.xml:127(para) chgpasswd.8.xml:104(para)
 msgid ""
 "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc "
 "support these methods."
 msgstr ""
 
-#: newusers.8.xml:270(para)
+#: newusers.8.xml:275(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are chosen in the "
@@ -5924,62 +6045,62 @@
 "the creation of groups)."
 msgstr ""
 
-#: newusers.8.xml:284(term) chgpasswd.8.xml:129(term)
+#: newusers.8.xml:302(term) chgpasswd.8.xml:145(term)
 #, fuzzy
 msgid "<option>-s</option>, <option>--sha-rounds</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: newusers.8.xml:286(para) chpasswd.8.xml:172(para) chgpasswd.8.xml:131(para)
+#: newusers.8.xml:304(para) chpasswd.8.xml:188(para) chgpasswd.8.xml:147(para)
 msgid "Use the specified number of rounds to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:289(para) chpasswd.8.xml:175(para) chgpasswd.8.xml:134(para)
+#: newusers.8.xml:307(para) chpasswd.8.xml:191(para) chgpasswd.8.xml:150(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:293(para) chpasswd.8.xml:179(para) chgpasswd.8.xml:138(para)
+#: newusers.8.xml:311(para) chpasswd.8.xml:195(para) chgpasswd.8.xml:154(para)
 msgid ""
 "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr ""
 
-#: newusers.8.xml:297(para) chpasswd.8.xml:183(para) chgpasswd.8.xml:142(para)
+#: newusers.8.xml:315(para) chpasswd.8.xml:199(para) chgpasswd.8.xml:158(para)
 msgid "You can only use this option with the SHA256 or SHA512 crypt method."
 msgstr ""
 
-#: newusers.8.xml:301(para) chgpasswd.8.xml:146(para)
+#: newusers.8.xml:319(para) chgpasswd.8.xml:162(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:313(para)
+#: newusers.8.xml:331(para)
 msgid ""
 "The input file must be protected since it contains unencrypted passwords."
 msgstr ""
 "Файл с входными данными должен быть защищён, так как в нём содержатся не "
 "шифрованные пароли."
 
-#: newusers.8.xml:317(para) chgpasswd.8.xml:162(para)
+#: newusers.8.xml:335(para) chgpasswd.8.xml:178(para)
 msgid ""
 "You should make sure the passwords and the encryption method respect the "
 "system's password policy."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: newusers.8.xml:390(filename)
+#: newusers.8.xml:408(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/newusers"
 msgstr "/etc/passwd"
 
-#: newusers.8.xml:392(para)
+#: newusers.8.xml:410(para)
 msgid "PAM configuration for <command>newusers</command>."
 msgstr ""
 
-#: newusers.8.xml:400(para)
+#: newusers.8.xml:418(para)
 msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5994,25 +6115,24 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname)
-#: newgrp.1.xml:49(command)
+#: newgrp.1.xml:39(refentrytitle) newgrp.1.xml:46(refname)
+#: newgrp.1.xml:52(command)
 msgid "newgrp"
 msgstr "newgrp"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: newgrp.1.xml:44(refpurpose)
+#: newgrp.1.xml:47(refpurpose)
 msgid "log in to a new group"
 msgstr "выполняет регистрацию пользователя в новой группе"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
-#: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
-#: groupadd.8.xml:57(replaceable) gpasswd.1.xml:66(replaceable)
+#: newgrp.1.xml:53(replaceable) grpck.8.xml:55(replaceable)
+#: groupadd.8.xml:59(replaceable) gpasswd.1.xml:69(replaceable)
 msgid "group"
 msgstr "группа"
 
 # type: Content of: <refentry><refsect1><para>
-#: newgrp.1.xml:56(para)
+#: newgrp.1.xml:59(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, "
@@ -6026,7 +6146,7 @@
 "пользователь заново вошёл в систему, иначе имеющаяся среда, включая текущий "
 "рабочий каталог, изменены не будут."
 
-#: newgrp.1.xml:64(para)
+#: newgrp.1.xml:67(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 "
@@ -6052,7 +6172,7 @@
 "пароль, то пользователю будет отказано в доступе."
 
 # type: Content of: <refentry><refsect1><para>
-#: newgrp.1.xml:78(para)
+#: newgrp.1.xml:81(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 "
@@ -6063,7 +6183,7 @@
 "то список членов и пароль этой группы будут взяты из этого файла, иначе "
 "используется запись из файла <filename>/etc/group</filename>."
 
-#: newgrp.1.xml:130(para)
+#: newgrp.1.xml:133(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -6090,17 +6210,19 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname)
-#: logoutd.8.xml:45(command)
+#: logoutd.8.xml:38(refentrytitle) logoutd.8.xml:45(refname)
+#: logoutd.8.xml:51(command)
 msgid "logoutd"
 msgstr "logoutd"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: logoutd.8.xml:40(refpurpose)
-msgid "Enforce login time restrictions"
+#: logoutd.8.xml:46(refpurpose)
+#, fuzzy
+#| msgid "Enforce login time restrictions"
+msgid "enforce login time restrictions"
 msgstr "контролирует временные интервалы работы в системе"
 
-#: logoutd.8.xml:51(para)
+#: logoutd.8.xml:57(para)
 msgid ""
 "<command>logoutd</command> enforces the login time and port restrictions "
 "specified in <filename>/etc/porttime</filename>. <command>logoutd</command> "
@@ -6120,27 +6242,27 @@
 "файле <filename>/etc/porttime</filename>, будет завершена."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: logoutd.8.xml:73(filename) login.1.xml:319(filename)
+#: logoutd.8.xml:79(filename) login.1.xml:322(filename)
 msgid "/var/run/utmp"
 msgstr "/var/run/utmp"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: logoutd.8.xml:75(para) login.1.xml:321(para)
+#: logoutd.8.xml:81(para) login.1.xml:324(para)
 msgid "List of current login sessions."
 msgstr "содержит список работающих сеансов в системе"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:100(refentrytitle) login.defs.5.xml:105(refname)
+#: login.defs.5.xml:101(refentrytitle) login.defs.5.xml:108(refname)
 msgid "login.defs"
 msgstr "login.defs"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:106(refpurpose)
+#: login.defs.5.xml:109(refpurpose)
 msgid "shadow password suite configuration"
 msgstr "содержит конфигурацию подсистемы теневых паролей"
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:111(para)
+#: login.defs.5.xml:114(para)
 msgid ""
 "The <filename>/etc/login.defs</filename> file defines the site-specific "
 "configuration for the shadow password suite. This file is required. Absence "
@@ -6153,7 +6275,7 @@
 "приведёт к выполнению нежелаемых операций."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:118(para)
+#: login.defs.5.xml:121(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 "
@@ -6168,7 +6290,7 @@
 "быть первым непробельным символом в строке."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:126(para)
+#: login.defs.5.xml:129(para)
 #, fuzzy
 msgid ""
 "Parameter values may be of four types: strings, booleans, numbers, and long "
@@ -6192,7 +6314,7 @@
 "архитектуры компьютера."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:141(para)
+#: login.defs.5.xml:144(para)
 msgid "The following configuration items are provided:"
 msgstr "Возможны следующие параметры конфигурации:"
 
@@ -6419,7 +6541,7 @@
 #: login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "This will most likely be overridden by PAM, since the default pam_unix "
-"module has it's own built in of 3 retries. However, this is a safe fallback "
+"module has its 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 ""
@@ -6460,7 +6582,7 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:184(para)
+#: login.defs.5.xml:187(para)
 #, fuzzy
 msgid ""
 "<option>PASS_MAX_DAYS</option>, <option>PASS_MIN_DAYS</option> and "
@@ -6477,9 +6599,18 @@
 msgid "<option>PORTTIME_CHECKS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
+# type: Content of: <refentry><refsect1><para>
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "Enable checking of time restrictions specified in /etc/porttime."
+#, fuzzy
+#| msgid ""
+#| "This information supersedes any password present in <filename>/etc/group</"
+#| "filename>."
+msgid ""
+"Enable checking of time restrictions specified in <filename>/etc/porttime</"
+"filename>."
 msgstr ""
+"Данная информация заменяет любой пароль файла <filename>/etc/group</"
+"filename>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -6543,13 +6674,13 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
-#: login.defs.5.xml:215(title)
+#: login.defs.5.xml:218(title)
 #, fuzzy
 msgid "CROSS REFERENCES"
 msgstr "ПЕРЕКРЁСТНАЯ ССЫЛКА"
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:216(para)
+#: login.defs.5.xml:219(para)
 #, fuzzy
 msgid ""
 "The following cross references show which programs in the shadow password "
@@ -6559,80 +6690,80 @@
 "параметры."
 
 # type: Content of: <refentry><refsect1><para><command>
-#: login.defs.5.xml:223(term) chage.1.xml:38(refentrytitle)
-#: chage.1.xml:43(refname) chage.1.xml:48(command)
+#: login.defs.5.xml:226(term) chage.1.xml:39(refentrytitle)
+#: chage.1.xml:46(refname) chage.1.xml:51(command)
 msgid "chage"
 msgstr "chage"
 
-#: login.defs.5.xml:225(para) login.defs.5.xml:413(phrase)
-#: login.defs.5.xml:480(phrase)
+#: login.defs.5.xml:228(para) login.defs.5.xml:416(phrase)
+#: login.defs.5.xml:483(phrase)
 msgid "USE_TCB"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:229(term) chfn.1.xml:41(refentrytitle)
-#: chfn.1.xml:46(refname) chfn.1.xml:52(command)
+#: login.defs.5.xml:232(term) chfn.1.xml:41(refentrytitle)
+#: chfn.1.xml:48(refname) chfn.1.xml:54(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:231(para)
+#: login.defs.5.xml:234(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:239(term) chgpasswd.8.xml:42(refentrytitle)
-#: chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
+#: login.defs.5.xml:242(term) chgpasswd.8.xml:43(refentrytitle)
+#: chgpasswd.8.xml:50(refname) chgpasswd.8.xml:56(command)
 msgid "chgpasswd"
 msgstr "chgpasswd"
 
-#: login.defs.5.xml:241(para) login.defs.5.xml:272(para)
+#: login.defs.5.xml:244(para) login.defs.5.xml:275(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:249(term) chpasswd.8.xml:41(refentrytitle)
-#: chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
+#: login.defs.5.xml:252(term) chpasswd.8.xml:42(refentrytitle)
+#: chpasswd.8.xml:49(refname) chpasswd.8.xml:55(command)
 msgid "chpasswd"
 msgstr "chpasswd"
 
-#: login.defs.5.xml:252(phrase)
+#: login.defs.5.xml:255(phrase)
 msgid "ENCRYPT_METHOD MD5_CRYPT_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:254(phrase)
+#: login.defs.5.xml:257(phrase)
 msgid "SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:260(term) chsh.1.xml:40(refentrytitle)
-#: chsh.1.xml:45(refname) chsh.1.xml:51(command)
+#: login.defs.5.xml:263(term) chsh.1.xml:41(refentrytitle)
+#: chsh.1.xml:48(refname) chsh.1.xml:54(command)
 msgid "chsh"
 msgstr "chsh"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:262(para)
+#: login.defs.5.xml:265(para)
 #, fuzzy
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:270(term) gpasswd.1.xml:42(refentrytitle)
-#: gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
+#: login.defs.5.xml:273(term) gpasswd.1.xml:43(refentrytitle)
+#: gpasswd.1.xml:50(refname) gpasswd.1.xml:64(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:280(term) groupadd.8.xml:41(refentrytitle)
-#: groupadd.8.xml:46(refname) groupadd.8.xml:52(command)
+#: login.defs.5.xml:283(term) groupadd.8.xml:41(refentrytitle)
+#: groupadd.8.xml:48(refname) groupadd.8.xml:54(command)
 msgid "groupadd"
 msgstr "groupadd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:282(para)
+#: login.defs.5.xml:285(para)
 #, fuzzy
 msgid "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 msgstr ""
@@ -6640,43 +6771,43 @@
 "UMASK"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:289(term) groupdel.8.xml:38(refentrytitle)
-#: groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
+#: login.defs.5.xml:292(term) groupdel.8.xml:39(refentrytitle)
+#: groupdel.8.xml:46(refname) groupdel.8.xml:52(command)
 msgid "groupdel"
 msgstr "groupdel"
 
-#: login.defs.5.xml:291(para) login.defs.5.xml:297(para)
-#: login.defs.5.xml:303(para) login.defs.5.xml:310(para)
-#: login.defs.5.xml:316(para) login.defs.5.xml:322(para)
+#: login.defs.5.xml:294(para) login.defs.5.xml:300(para)
+#: login.defs.5.xml:306(para) login.defs.5.xml:313(para)
+#: login.defs.5.xml:319(para) login.defs.5.xml:325(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><command>
-#: login.defs.5.xml:295(term) groupmems.8.xml:38(refentrytitle)
-#: groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
+#: login.defs.5.xml:298(term) groupmems.8.xml:39(refentrytitle)
+#: groupmems.8.xml:46(refname) groupmems.8.xml:52(command)
 msgid "groupmems"
 msgstr "groupmems"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:301(term) groupmod.8.xml:38(refentrytitle)
-#: groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
+#: login.defs.5.xml:304(term) groupmod.8.xml:39(refentrytitle)
+#: groupmod.8.xml:46(refname) groupmod.8.xml:52(command)
 msgid "groupmod"
 msgstr "groupmod"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:308(term) grpck.8.xml:38(refentrytitle)
-#: grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
+#: login.defs.5.xml:311(term) grpck.8.xml:39(refentrytitle)
+#: grpck.8.xml:46(refname) grpck.8.xml:52(command)
 msgid "grpck"
 msgstr "grpck"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:328(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)
+#: login.defs.5.xml:331(term) login.1.xml:71(refentrytitle)
+#: login.1.xml:78(refname) login.1.xml:84(command) login.1.xml:92(command)
+#: login.1.xml:99(command)
 msgid "login"
 msgstr "login"
 
-#: login.defs.5.xml:330(para)
+#: login.defs.5.xml:333(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</"
@@ -6692,18 +6823,18 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:357(term)
+#: login.defs.5.xml:360(term)
 #, fuzzy
 #| msgid "newgrp"
 msgid "newgrp / sg"
 msgstr "newgrp"
 
-#: login.defs.5.xml:359(para)
+#: login.defs.5.xml:362(para)
 msgid "SYSLOG_SG_ENAB"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:367(para)
+#: login.defs.5.xml:370(para)
 #, fuzzy
 msgid ""
 "ENCRYPT_METHOD GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB "
@@ -6714,21 +6845,21 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:383(para)
+#: login.defs.5.xml:386(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:394(para)
+#: login.defs.5.xml:397(para)
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb"
 "\">TCB_AUTH_GROUP TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:403(para)
+#: login.defs.5.xml:406(para)
 #, fuzzy
 #| msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 msgid ""
@@ -6736,7 +6867,7 @@
 "phrase>"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 
-#: login.defs.5.xml:420(para)
+#: login.defs.5.xml:423(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH "
@@ -6747,17 +6878,17 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:435(term)
+#: login.defs.5.xml:438(term)
 #, fuzzy
 msgid "sulogin"
 msgstr "login"
 
-#: login.defs.5.xml:437(para)
+#: login.defs.5.xml:440(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:446(para)
+#: login.defs.5.xml:449(para)
 #, fuzzy
 msgid ""
 "CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
@@ -6768,19 +6899,19 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:460(para)
+#: login.defs.5.xml:463(para)
 msgid ""
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB <phrase "
 "condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:470(para)
+#: login.defs.5.xml:473(para)
 msgid ""
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP <phrase condition=\"tcb"
 "\">TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:489(para)
+#: login.defs.5.xml:492(para)
 #, fuzzy
 #| msgid ""
 #| "Much of the functionality that used to be provided by the shadow password "
@@ -6811,7 +6942,7 @@
 "citerefentry>. Настройку данных программ следует выполнять в файлах "
 "конфигурации PAM."
 
-#: login.defs.5.xml:505(para)
+#: login.defs.5.xml:508(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -6834,17 +6965,17 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
+#: login.access.5.xml:39(refentrytitle) login.access.5.xml:46(refname)
 msgid "login.access"
 msgstr "login.access"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: login.access.5.xml:41(refpurpose)
+#: login.access.5.xml:47(refpurpose)
 msgid "login access control table"
 msgstr "файл контроля доступа в систему"
 
 # type: Content of: <refentry><refsect1><para>
-#: login.access.5.xml:46(para)
+#: login.access.5.xml:52(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 "
@@ -6855,7 +6986,7 @@
 "будет разрешён или запрещён вход в систему."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.access.5.xml:52(para)
+#: login.access.5.xml:58(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, "
@@ -6871,7 +7002,7 @@
 "записи вход в систему или нет."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.access.5.xml:60(para)
+#: login.access.5.xml:66(para)
 msgid ""
 "Each line of the login access control table has three fields separated by a "
 "\":\" character:"
@@ -6879,7 +7010,7 @@
 "Каждая строка таблицы контроля доступа в систему состоит из трёх полей "
 "разделённых символом \":\" и выглядит так:"
 
-#: login.access.5.xml:65(para)
+#: login.access.5.xml:71(para)
 msgid ""
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
 "emphasis>:<emphasis remap=\"I\">origins</emphasis>"
@@ -6887,7 +7018,7 @@
 "<emphasis remap=\"I\">права_доступа</emphasis>:<emphasis remap=\"I"
 "\">пользователи</emphasis>:<emphasis remap=\"I\">источники</emphasis>"
 
-#: login.access.5.xml:69(para)
+#: login.access.5.xml:75(para)
 msgid ""
 "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or "
 "\"<emphasis>-</emphasis>\" (access denied) character. The second field "
@@ -6913,7 +7044,7 @@
 "пользователей."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.access.5.xml:83(para)
+#: login.access.5.xml:89(para)
 msgid ""
 "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
 "compact rules."
@@ -6921,7 +7052,7 @@
 "Оператор <emphasis>EXCEPT</emphasis> помогает в написании компактных правил."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.access.5.xml:88(para)
+#: login.access.5.xml:94(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 "
@@ -6933,41 +7064,41 @@
 "значение первичной группы пользователя."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: login.1.xml:76(refpurpose)
+#: login.1.xml:79(refpurpose)
 msgid "begin session on the system"
 msgstr "начинает сеанс в системе"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><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)
+#: login.1.xml:85(arg) login.1.xml:93(arg) login.1.xml:100(arg)
+#: login.1.xml:217(option) groupmems.8.xml:57(arg)
 msgid "-p"
 msgstr "-p"
 
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: login.1.xml:83(replaceable) login.1.xml:91(replaceable)
-#: login.1.xml:98(replaceable)
+#: login.1.xml:86(replaceable) login.1.xml:94(replaceable)
+#: login.1.xml:101(replaceable)
 msgid "host"
 msgstr "хост"
 
-#: login.1.xml:83(arg) login.1.xml:91(arg) chfn.1.xml:56(arg)
+#: login.1.xml:86(arg) login.1.xml:94(arg)
 msgid "-h <placeholder-1/>"
 msgstr "-h <placeholder-1/>"
 
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: login.1.xml:86(replaceable)
+#: login.1.xml:89(replaceable)
 msgid "ENV=VAR"
 msgstr "ПЕРЕМЕННАЯ_СРЕДЫ=ЗНАЧЕНИЕ"
 
 # type: Content of: <refentry><refsect1><para><option>
-#: login.1.xml:92(arg) login.1.xml:192(option) expiry.1.xml:54(arg)
+#: login.1.xml:95(arg) login.1.xml:195(option)
 msgid "-f"
 msgstr "-f"
 
-#: login.1.xml:98(arg) chfn.1.xml:54(arg)
+#: login.1.xml:101(arg)
 msgid "-r <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
-#: login.1.xml:104(para)
+#: login.1.xml:107(para)
 #, fuzzy
 #| msgid ""
 #| "The <command>login</command> program is used to establish a new session "
@@ -7003,7 +7134,7 @@
 "приводит к сообщению об ошибке."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.1.xml:118(para)
+#: login.1.xml:121(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 "
@@ -7016,7 +7147,7 @@
 "<command>login</command> закончит работу и прервёт подключение."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.1.xml:125(para)
+#: login.1.xml:128(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 "
@@ -7030,7 +7161,7 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: login.1.xml:134(para)
+#: login.1.xml:137(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 "
@@ -7048,7 +7179,7 @@
 "\"<emphasis>У вас есть почта.</emphasis>\" или \"<emphasis>У вас нет почты.</"
 "emphasis>\", в зависимости от наполненности почтового ящика."
 
-#: login.1.xml:145(para)
+#: login.1.xml:148(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>, "
@@ -7064,7 +7195,7 @@
 "записи пользователя. Также могут быть установлены значения ulimit, umask и "
 "nice из поля GECOS."
 
-#: login.1.xml:154(para)
+#: login.1.xml:157(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 "
@@ -7075,7 +7206,7 @@
 "filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.1.xml:160(para)
+#: login.1.xml:163(para)
 msgid ""
 "An initialization script for your command interpreter may also be executed. "
 "Please see the appropriate manual section for more information on this "
@@ -7085,7 +7216,7 @@
 "интерпретатора команд. Подробней об этой функции смотрите соответствующую "
 "страницу руководства."
 
-#: login.1.xml:172(para) login.1.xml:248(para)
+#: login.1.xml:175(para) login.1.xml:251(para)
 msgid ""
 "The <command>login</command> program is NOT responsible for removing users "
 "from the utmp file. It is the responsibility of "
@@ -7107,35 +7238,40 @@
 "завершения работы в \"порождённом сеансе\"."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:195(para)
+#: login.1.xml:198(para)
 msgid "Do not perform authentication, user is preauthenticated."
 msgstr "Не выполнять аутентификацию, пользователь уже прошёл проверку."
 
-#: login.1.xml:198(para)
+#: login.1.xml:201(para)
 msgid "Note: In that case, <replaceable>username</replaceable> is mandatory."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: login.1.xml:206(option)
+#: login.1.xml:209(option)
 msgid "-h"
 msgstr "-h"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:209(para)
+#: login.1.xml:212(para)
 msgid "Name of the remote host for this login."
 msgstr "Имя удалённого хоста, на который нужно войти."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:217(para)
+#: login.1.xml:220(para)
 msgid "Preserve environment."
 msgstr "Сохранить среду."
 
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
+#: login.1.xml:225(option)
+msgid "-r"
+msgstr "-r"
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:225(para)
+#: login.1.xml:228(para)
 msgid "Perform autologin protocol for rlogin."
 msgstr "Выполнить протокол autologin для rlogin."
 
-#: login.1.xml:230(para)
+#: login.1.xml:233(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."
@@ -7145,7 +7281,7 @@
 "суперпользователем."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.1.xml:239(para)
+#: login.1.xml:242(para)
 msgid ""
 "This version of <command>login</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -7155,13 +7291,13 @@
 "машине."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.1.xml:244(para)
+#: login.1.xml:247(para)
 msgid ""
 "The location of files is subject to differences in system configuration."
 msgstr "Расположение файлов может отличаться на разных системах."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.1.xml:260(para)
+#: login.1.xml:263(para)
 #, fuzzy
 msgid ""
 "As with any program, <command>login</command>'s appearance can be faked. If "
@@ -7178,58 +7314,58 @@
 "предотвращения атаки."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: login.1.xml:325(filename)
+#: login.1.xml:328(filename)
 msgid "/var/log/wtmp"
 msgstr "/var/log/wtmp"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:327(para)
+#: login.1.xml:330(para)
 msgid "List of previous login sessions."
 msgstr "содержит список завершённых сеансов работы с системой"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: login.1.xml:343(filename)
+#: login.1.xml:346(filename)
 msgid "/etc/motd"
 msgstr "/etc/motd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:345(para)
+#: login.1.xml:348(para)
 msgid "System message of the day file."
 msgstr "содержит системные сообщения за день"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: login.1.xml:349(filename)
+#: login.1.xml:352(filename)
 msgid "/etc/nologin"
 msgstr "/etc/nologin"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:351(para)
+#: login.1.xml:354(para)
 msgid "Prevent non-root users from logging in."
 msgstr ""
 "при существовании файла блокируется доступ в систему обычным пользователям"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: login.1.xml:355(filename)
+#: login.1.xml:358(filename)
 msgid "/etc/ttytype"
 msgstr "/etc/ttytype"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:357(para)
+#: login.1.xml:360(para)
 msgid "List of terminal types."
 msgstr "содержит список типов терминалов"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: login.1.xml:361(filename)
+#: login.1.xml:364(filename)
 msgid "$HOME/.hushlogin"
 msgstr "$HOME/.hushlogin"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:363(para)
+#: login.1.xml:366(para)
 msgid "Suppress printing of system messages."
 msgstr ""
 "при существовании файла системные сообщения при входе в систему не выводятся"
 
-#: login.1.xml:377(para)
+#: login.1.xml:380(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -7260,17 +7396,17 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
+#: limits.5.xml:39(refentrytitle) limits.5.xml:46(refname)
 msgid "limits"
 msgstr "limits"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: limits.5.xml:41(refpurpose)
+#: limits.5.xml:47(refpurpose)
 msgid "resource limits definition"
 msgstr "файл контроля ресурсов"
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:47(para)
+#: limits.5.xml:53(para)
 msgid ""
 "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</"
 "filename> by default or LIMITS_FILE defined <filename>config.h</filename>) "
@@ -7284,7 +7420,7 @@
 "должно быть только у суперпользователя."
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:55(para)
+#: limits.5.xml:61(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)."
@@ -7294,28 +7430,28 @@
 "имеющие права суперпользователя (учётные записи с UID равным 0)."
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:61(para)
+#: limits.5.xml:67(para)
 msgid "Each line describes a limit for a user in the form:"
 msgstr "Каждая строка описывает ограничение для одного пользователя имеет вид:"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: limits.5.xml:64(emphasis)
+#: limits.5.xml:70(emphasis)
 msgid "user LIMITS_STRING"
 msgstr "user СТРОКА_ОГРАНИЧЕНИЙ"
 
-#: limits.5.xml:67(para)
+#: limits.5.xml:73(para)
 msgid "or in the form:"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: limits.5.xml:70(emphasis)
+#: limits.5.xml:76(emphasis)
 #, fuzzy
 #| msgid "user LIMITS_STRING"
 msgid "@group LIMITS_STRING"
 msgstr "user СТРОКА_ОГРАНИЧЕНИЙ"
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:73(para)
+#: limits.5.xml:79(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 "
@@ -7326,93 +7462,93 @@
 "буквенного идентификатора и числового значения."
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:79(para)
+#: limits.5.xml:85(para)
 msgid "The valid identifiers are:"
 msgstr "Допустимые идентификаторы:"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:82(para)
+#: limits.5.xml:88(para)
 msgid "A: max address space (KB)"
 msgstr "A: максимальное адресное пространство (КБ)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:83(para)
+#: limits.5.xml:89(para)
 msgid "C: max core file size (KB)"
 msgstr "C: максимальный размер файла core (КБ)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:84(para)
+#: limits.5.xml:90(para)
 msgid "D: max data size (KB)"
 msgstr "D: максимальный размер данных (КБ)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:85(para)
+#: limits.5.xml:91(para)
 msgid "F: maximum filesize (KB)"
 msgstr "F: максимальный размер файла (КБ)"
 
+#: limits.5.xml:92(para)
+msgid ""
+"K: file creation mask, set by <citerefentry><refentrytitle>umask</"
+"refentrytitle><manvolnum>2</manvolnum></citerefentry>."
+msgstr ""
+"K: маска создаваемых файлов, устанавливается с помощью вызова "
+"<citerefentry><refentrytitle>umask</refentrytitle><manvolnum>2</manvolnum></"
+"citerefentry>."
+
+#: limits.5.xml:97(para)
+msgid "I: max nice value (0..39 which translates to 20..-19)"
+msgstr ""
+
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:86(para)
+#: limits.5.xml:99(para)
+msgid "L: max number of logins for this user"
+msgstr ""
+"L: максимальное число возможных регистраций в системе этого пользователя"
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: limits.5.xml:100(para)
 msgid "M: max locked-in-memory address space (KB)"
 msgstr "M: максимальное синхронизируемое адресное пространство памяти (КБ)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:87(para)
+#: limits.5.xml:101(para)
 msgid "N: max number of open files"
 msgstr "N: максимальное число открытых файлов"
 
+#: limits.5.xml:102(para)
+msgid "O: max real time priority"
+msgstr ""
+
+#: limits.5.xml:103(para)
+msgid ""
+"P: process priority, set by <citerefentry><refentrytitle>setpriority</"
+"refentrytitle><manvolnum>2</manvolnum></citerefentry>."
+msgstr ""
+"P: приоритет процесса, устанавливается с помощью вызова "
+"<citerefentry><refentrytitle>setpriority</refentrytitle><manvolnum>2</"
+"manvolnum></citerefentry>."
+
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:88(para)
+#: limits.5.xml:108(para)
 msgid "R: max resident set size (KB)"
 msgstr "R: максимальный размер резидентного сегмента (КБ)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:89(para)
+#: limits.5.xml:109(para)
 msgid "S: max stack size (KB)"
 msgstr "S: максимальный размер стека (КБ)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:90(para)
+#: limits.5.xml:110(para)
 msgid "T: max CPU time (MIN)"
 msgstr "T: максимальное время использования процессора (минут)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:91(para)
+#: limits.5.xml:111(para)
 msgid "U: max number of processes"
 msgstr "U: максимальное число процессов"
 
-#: limits.5.xml:92(para)
-msgid ""
-"K: file creation mask, set by <citerefentry><refentrytitle>umask</"
-"refentrytitle><manvolnum>2</manvolnum></citerefentry>."
-msgstr ""
-"K: маска создаваемых файлов, устанавливается с помощью вызова "
-"<citerefentry><refentrytitle>umask</refentrytitle><manvolnum>2</manvolnum></"
-"citerefentry>."
-
-# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:97(para)
-msgid "L: max number of logins for this user"
-msgstr ""
-"L: максимальное число возможных регистраций в системе этого пользователя"
-
-#: limits.5.xml:98(para)
-msgid ""
-"P: process priority, set by <citerefentry><refentrytitle>setpriority</"
-"refentrytitle><manvolnum>2</manvolnum></citerefentry>."
-msgstr ""
-"P: приоритет процесса, устанавливается с помощью вызова "
-"<citerefentry><refentrytitle>setpriority</refentrytitle><manvolnum>2</"
-"manvolnum></citerefentry>."
-
-#: limits.5.xml:103(para)
-msgid "I: max nice value (0..39 which translates to 20..-19)"
-msgstr ""
-
-#: limits.5.xml:105(para)
-msgid "O: max real time priority"
-msgstr ""
-
-#: limits.5.xml:108(para)
+#: limits.5.xml:114(para)
 #, fuzzy
 #| msgid ""
 #| "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
@@ -7428,7 +7564,7 @@
 "записи эквивалентны:"
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:114(programlisting)
+#: limits.5.xml:120(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -7442,7 +7578,7 @@
 "    "
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:119(para)
+#: limits.5.xml:125(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 "
@@ -7454,7 +7590,7 @@
 "Неправильная строка ограничений будет отброшена (не учтена) программой "
 "<command>login</command>."
 
-#: limits.5.xml:126(para)
+#: limits.5.xml:132(para)
 msgid ""
 "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
 "have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
@@ -7465,7 +7601,7 @@
 "вас есть несколько записей <emphasis remap=\"I\">по умолчанию</emphasis> в "
 "файле <emphasis>LIMITS_FILE</emphasis>, то будет использоваться последняя."
 
-#: limits.5.xml:133(para)
+#: limits.5.xml:139(para)
 #, fuzzy
 msgid ""
 "The limits specified in the form \"<replaceable>@group</replaceable>\" apply "
@@ -7474,22 +7610,22 @@
 "Имя группы будет изменено с <emphasis remap=\"I\">ГРУППА</emphasis> на "
 "<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
 
-#: limits.5.xml:139(para)
+#: limits.5.xml:145(para)
 msgid ""
-"If a line with limits for an user exist, only the first line for this user "
-"will be considered."
+"If more than one line with limits for an user exist, only the first line for "
+"this user will be considered."
 msgstr ""
 
-#: limits.5.xml:144(para)
+#: limits.5.xml:150(para)
 msgid ""
 "If no lines are specified for an user, the last <replaceable>@group</"
 "replaceable> line matching a group whose the user is a member of will be "
-"conisdered, or the last line with default limits if no groups contain the "
-"user)."
+"considered, or the last line with default limits if no groups contain the "
+"user."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:151(para)
+#: limits.5.xml:157(para)
 msgid ""
 "To completely disable limits for a user, a single dash \"<emphasis>-</"
 "emphasis>\" will do."
@@ -7497,14 +7633,14 @@
 "Чтобы полностью снять ограничения с пользователя, используется одиночное "
 "тире \"<emphasis>-</emphasis> \"."
 
-#: limits.5.xml:156(para)
+#: limits.5.xml:162(para)
 msgid ""
 "To disable a limit for a user, a single dash \"<replaceable>-</replaceable>"
 "\" can be used instead of the numerical value for this limit."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:162(para)
+#: limits.5.xml:168(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 "
@@ -7515,11 +7651,11 @@
 "глобальные ограничения и появятся, но пока это только в планах ;)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: limits.5.xml:173(filename)
+#: limits.5.xml:179(filename)
 msgid "/etc/limits"
 msgstr "/etc/limits"
 
-#: limits.5.xml:181(para)
+#: limits.5.xml:187(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>setpriority</"
@@ -7534,18 +7670,18 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname)
-#: lastlog.8.xml:46(command)
+#: lastlog.8.xml:39(refentrytitle) lastlog.8.xml:46(refname)
+#: lastlog.8.xml:52(command)
 msgid "lastlog"
 msgstr "lastlog"
 
-#: lastlog.8.xml:41(refpurpose)
+#: lastlog.8.xml:47(refpurpose)
 msgid "reports the most recent login of all users or of a given user"
 msgstr ""
 "выводит отчёт о последней регистрации в системе всех или указанного "
 "пользователя"
 
-#: lastlog.8.xml:55(para)
+#: lastlog.8.xml:61(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</"
@@ -7562,38 +7698,39 @@
 "пользователей в файле <filename>/etc/passwd</filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: lastlog.8.xml:67(para)
+#: lastlog.8.xml:73(para)
 msgid "The options which apply to the <command>lastlog</command> command are:"
 msgstr "Параметры команды <command>lastlog</command>:"
 
-#: lastlog.8.xml:72(term)
+#: lastlog.8.xml:78(term)
 msgid ""
 "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
-"<option>-b</option>, <option>--before</option> <replaceable>ДНЕЙ</replaceable>"
+"<option>-b</option>, <option>--before</option> <replaceable>ДНЕЙ</"
+"replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: lastlog.8.xml:76(para)
+#: lastlog.8.xml:82(para)
 msgid ""
 "Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
 msgstr ""
 "Показать записи lastlog за последние <emphasis remap=\"I\">ДНЕЙ</emphasis>."
 
-#: lastlog.8.xml:90(term) faillog.8.xml:157(term)
+#: lastlog.8.xml:109(term) faillog.8.xml:176(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:95(para)
+#: lastlog.8.xml:114(para)
 msgid ""
 "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
 "emphasis>."
 msgstr ""
 "Показать записи lastlog новее чем <emphasis remap=\"I\">ДНЕЙ</emphasis>."
 
-#: lastlog.8.xml:102(term) faillog.8.xml:168(term)
+#: lastlog.8.xml:121(term) faillog.8.xml:187(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
@@ -7606,7 +7743,7 @@
 "replaceable>=<replaceable>ЗНАЧЕНИЕ</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: lastlog.8.xml:107(para)
+#: lastlog.8.xml:126(para)
 #, fuzzy
 #| msgid ""
 #| "Print the lastlog record for user with specified <emphasis remap=\"I"
@@ -7616,7 +7753,7 @@
 "Показать запись lastlog только для указанного пользователя с emphasis remap="
 "\"I\">ИМЕНЕМ</emphasis>."
 
-#: lastlog.8.xml:110(para) faillog.8.xml:178(para)
+#: lastlog.8.xml:129(para) faillog.8.xml:197(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</"
@@ -7625,7 +7762,7 @@
 "UID_MAX</replaceable>), or a min value (<replaceable>UID_MIN-</replaceable>)."
 msgstr ""
 
-#: lastlog.8.xml:122(para)
+#: lastlog.8.xml:141(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."
@@ -7634,20 +7771,20 @@
 "сообщение <emphasis>** Никогда не входил в систему**</emphasis> вместо "
 "названия порта и даты."
 
-#: lastlog.8.xml:127(para)
+#: lastlog.8.xml:146(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:135(title) groups.1.xml:65(title) chsh.1.xml:106(title)
-#: chage.1.xml:197(title)
+#: lastlog.8.xml:154(title) groups.1.xml:71(title) chsh.1.xml:122(title)
+#: chage.1.xml:213(title)
 msgid "NOTE"
 msgstr "ЗАМЕЧАНИЕ"
 
 # type: Content of: <refentry><refsect1><para>
-#: lastlog.8.xml:136(para)
+#: lastlog.8.xml:155(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, "
@@ -7666,17 +7803,17 @@
 "\"."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: lastlog.8.xml:150(filename)
+#: lastlog.8.xml:169(filename)
 msgid "/var/log/lastlog"
 msgstr "/var/log/lastlog"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: lastlog.8.xml:152(para)
+#: lastlog.8.xml:171(para)
 msgid "Database times of previous user logins."
 msgstr "содержит список завершённых сеансов работы с системой"
 
 # type: Content of: <refentry><refsect1><para>
-#: lastlog.8.xml:160(para)
+#: lastlog.8.xml:179(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 "
@@ -7689,17 +7826,17 @@
 "800, то во время обработки UID с 171 по 799 программа кажется повисшей)."
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: gshadow.5.xml:33(refentrytitle) gshadow.5.xml:38(refname)
+#: gshadow.5.xml:37(refentrytitle) gshadow.5.xml:44(refname)
 msgid "gshadow"
 msgstr "gshadow"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: gshadow.5.xml:39(refpurpose)
+#: gshadow.5.xml:45(refpurpose)
 msgid "shadowed group file"
 msgstr "файл с защищаемой информацией о группах"
 
 # type: Content of: <refentry><refsect1><para>
-#: gshadow.5.xml:44(para)
+#: gshadow.5.xml:50(para)
 #, fuzzy
 #| msgid ""
 #| "<filename>/etc/gshadow</filename> contains the shadowed information for "
@@ -7713,20 +7850,20 @@
 "группах. Он состоит из строк с полями, отделёнными друг от друга двоеточием. "
 "Поля:"
 
-#: gshadow.5.xml:54(para)
+#: gshadow.5.xml:60(para)
 msgid "Each line of this file contains the following colon-separated fields:"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: gshadow.5.xml:60(emphasis)
+#: gshadow.5.xml:66(emphasis)
 msgid "group name"
 msgstr "имя группы"
 
-#: gshadow.5.xml:62(para)
+#: gshadow.5.xml:68(para)
 msgid "It must be a valid group name, which exist on the system."
 msgstr ""
 
-#: gshadow.5.xml:75(para)
+#: gshadow.5.xml:81(para)
 #, fuzzy
 #| msgid ""
 #| "If the password field contains some string that is not valid result of "
@@ -7748,7 +7885,7 @@
 "<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
 "citerefentry>."
 
-#: gshadow.5.xml:82(para)
+#: gshadow.5.xml:88(para)
 #, fuzzy
 #| msgid ""
 #| "The comment field is used by various system utilities, such as "
@@ -7763,14 +7900,14 @@
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: gshadow.5.xml:88(para)
+#: gshadow.5.xml:94(para)
 msgid ""
 "This field may be empty, in which case only the group members can gain the "
 "group permissions."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: gshadow.5.xml:98(para)
+#: gshadow.5.xml:104(para)
 #, fuzzy
 #| msgid ""
 #| "This information supersedes any password present in <filename>/etc/group</"
@@ -7782,36 +7919,36 @@
 "Данная информация заменяет любой пароль файла <filename>/etc/group</"
 "filename>."
 
-#: gshadow.5.xml:106(emphasis)
+#: gshadow.5.xml:112(emphasis)
 msgid "administrators"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: gshadow.5.xml:108(para) gshadow.5.xml:124(para)
+#: gshadow.5.xml:114(para) gshadow.5.xml:130(para)
 #, fuzzy
 #| msgid "comma-separated list of group members"
 msgid "It must be a comma-separated list of user names."
 msgstr "список членов группы, перечисленных через запятую"
 
-#: gshadow.5.xml:111(para)
+#: gshadow.5.xml:117(para)
 msgid "Administrators can change the password or the members of the group."
 msgstr ""
 
-#: gshadow.5.xml:115(para)
+#: gshadow.5.xml:121(para)
 msgid ""
 "Administrators also have the same permissions as the members (see below)."
 msgstr ""
 
-#: gshadow.5.xml:122(emphasis)
+#: gshadow.5.xml:128(emphasis)
 msgid "members"
 msgstr ""
 
-#: gshadow.5.xml:127(para)
+#: gshadow.5.xml:133(para)
 msgid "Members can access the group without being prompted for a password."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: gshadow.5.xml:131(para)
+#: gshadow.5.xml:137(para)
 #, fuzzy
 #| msgid ""
 #| "This information supersedes any password present in <filename>/etc/group</"
@@ -7822,7 +7959,7 @@
 "Данная информация заменяет любой пароль файла <filename>/etc/group</"
 "filename>."
 
-#: gshadow.5.xml:160(para)
+#: gshadow.5.xml:166(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
@@ -7853,12 +7990,12 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: grpck.8.xml:44(refpurpose)
+#: grpck.8.xml:47(refpurpose)
 msgid "verify integrity of group files"
 msgstr "проверяет корректность файлов групп"
 
 # type: Content of: <refentry><refsect1><para>
-#: grpck.8.xml:70(para)
+#: grpck.8.xml:65(para)
 #, fuzzy
 #| msgid ""
 #| "The <command>grpck</command> command verifies the integrity of the system "
@@ -7883,13 +8020,13 @@
 "которых невозможно."
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: grpck.8.xml:87(para)
+#: grpck.8.xml:82(para)
 #, fuzzy
 #| msgid "a unique group name"
 msgid "a unique and valid group name"
 msgstr "уникальность имени группы"
 
-#: grpck.8.xml:90(para)
+#: grpck.8.xml:85(para)
 #, fuzzy
 #| msgid ""
 #| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
@@ -7902,7 +8039,7 @@
 "<filename>/etc/shadow</filename> по числовому идентификатору пользователя."
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: grpck.8.xml:97(para)
+#: grpck.8.xml:92(para)
 #, fuzzy
 #| msgid "a valid list of members and administrators"
 msgid ""
@@ -7910,7 +8047,7 @@
 "phrase>"
 msgstr "корректный список членов и администраторов"
 
-#: grpck.8.xml:103(para)
+#: grpck.8.xml:98(para)
 #, fuzzy
 #| msgid ""
 #| "These four programs all operate on the normal and shadow password and "
@@ -7928,7 +8065,7 @@
 "filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: grpck.8.xml:111(para)
+#: grpck.8.xml:106(para)
 #, fuzzy
 #| msgid ""
 #| "The checks for correct number of fields and unique group name are fatal. "
@@ -7956,7 +8093,7 @@
 "предлагается запустить команду <command>groupmod</command> чтобы исправить "
 "ошибку."
 
-#: grpck.8.xml:122(para)
+#: grpck.8.xml:117(para)
 #, fuzzy
 #| msgid ""
 #| "The commands which operate on the <filename>/etc/group</filename> file "
@@ -7976,20 +8113,20 @@
 "испорченной записи."
 
 # type: Content of: <refentry><refsect1><para>
-#: grpck.8.xml:134(para)
+#: grpck.8.xml:133(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:141(para)
+#: grpck.8.xml:146(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:151(para)
+#: grpck.8.xml:169(para)
 #, fuzzy
 #| msgid ""
 #| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
@@ -8001,7 +8138,7 @@
 "Отсортировать все записи в файлах <filename>/etc/passwd</filename> и "
 "<filename>/etc/shadow</filename> по числовому идентификатору пользователя."
 
-#: grpck.8.xml:160(para)
+#: grpck.8.xml:178(para)
 #, fuzzy
 #| msgid ""
 #| "By default, <command>pwck</command> operates on the files <filename>/etc/"
@@ -8022,27 +8159,27 @@
 "emphasis> и <emphasis remap=\"I\">shadow</emphasis>"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: grpck.8.xml:228(para)
+#: grpck.8.xml:246(para)
 msgid "one or more bad group entries"
 msgstr "есть одна или более неправильных записей групп"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: grpck.8.xml:234(para)
+#: grpck.8.xml:252(para)
 msgid "can't open group files"
 msgstr "не удалось открыть файл групп"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: grpck.8.xml:240(para)
+#: grpck.8.xml:258(para)
 msgid "can't lock group files"
 msgstr "не удалось заблокировать файл групп"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: grpck.8.xml:246(para)
+#: grpck.8.xml:264(para)
 msgid "can't update group files"
 msgstr "не удалось изменить файл групп"
 
 # type: Content of: <refentry><refsect1><para>
-#: grpck.8.xml:210(para)
+#: grpck.8.xml:228(para)
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -8050,7 +8187,7 @@
 "Команда <command>grpck</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: grpck.8.xml:255(para)
+#: grpck.8.xml:273(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -8085,22 +8222,22 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
-#: groups.1.xml:45(command)
+#: groups.1.xml:38(refentrytitle) groups.1.xml:45(refname)
+#: groups.1.xml:51(command)
 msgid "groups"
 msgstr "groups"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: groups.1.xml:40(refpurpose)
+#: groups.1.xml:46(refpurpose)
 msgid "display current group names"
 msgstr "показывает имена групп запустившего программу пользователя"
 
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: groups.1.xml:47(replaceable) chfn.1.xml:58(replaceable)
+#: groups.1.xml:53(replaceable)
 msgid "user"
 msgstr "имя"
 
-#: groups.1.xml:54(para)
+#: groups.1.xml:60(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/"
@@ -8115,11 +8252,17 @@
 "<emphasis remap=\"I\">имя</emphasis> выводятся группы для учётной записи с "
 "указанным <emphasis remap=\"I\">именем</emphasis>."
 
-#: groups.1.xml:66(para)
+#: groups.1.xml:72(para)
+#, fuzzy
+#| msgid ""
+#| "Systems which do not support concurrent group sets will have the "
+#| "information from <filename>/etc/group</filename> reported. The user must "
+#| "use <command>newgrp</command> or <command>sg</command> to change their "
+#| "current real and effective group ID."
 msgid ""
 "Systems which do not support concurrent group sets will have the information "
 "from <filename>/etc/group</filename> reported. The user must use "
-"<command>newgrp</command> or <command>sg</command> to change their current "
+"<command>newgrp</command> or <command>sg</command> to change his current "
 "real and effective group ID."
 msgstr ""
 "В системах, не имеющих поддержки одновременного членства в группах, "
@@ -8127,7 +8270,7 @@
 "своей текущей реальной или эффективной группы пользователь должен "
 "использовать команды <command>newgrp</command> или <command>sg</command>."
 
-#: groups.1.xml:88(para)
+#: groups.1.xml:94(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getgid</"
@@ -8144,15 +8287,15 @@
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: groupmod.8.xml:44(refpurpose)
+#: groupmod.8.xml:47(refpurpose)
 msgid "modify a group definition on the system"
 msgstr "изменяет определение группы в системе"
 
-#: groupmod.8.xml:53(replaceable)
+#: groupmod.8.xml:56(replaceable) groupdel.8.xml:56(replaceable)
 msgid "GROUP"
 msgstr "ГРУППА"
 
-#: groupmod.8.xml:59(para)
+#: groupmod.8.xml:62(para)
 msgid ""
 "The <command>groupmod</command> command modifies the definition of the "
 "specified <replaceable>GROUP</replaceable> by modifying the appropriate "
@@ -8162,17 +8305,17 @@
 "<replaceable>ГРУППЫ</replaceable>, изменяя соответствующую запись в базе "
 "данных групп."
 
-#: groupmod.8.xml:68(para)
+#: groupmod.8.xml:71(para)
 msgid "The options which apply to the <command>groupmod</command> command are:"
 msgstr "Параметры команды <command>groupmod</command>:"
 
-#: groupmod.8.xml:74(term) groupadd.8.xml:93(term)
+#: groupmod.8.xml:77(term) groupadd.8.xml:95(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option> <replaceable>GID</replaceable>"
 
-#: groupmod.8.xml:78(para)
+#: groupmod.8.xml:81(para)
 #, fuzzy
 #| msgid ""
 #| "The name of the group will be changed from <replaceable>GROUP</"
@@ -8185,7 +8328,7 @@
 "<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmod.8.xml:82(para)
+#: groupmod.8.xml:85(para)
 #, fuzzy
 #| msgid ""
 #| "The numerical value of the user's ID. This value must be unique, unless "
@@ -8204,13 +8347,19 @@
 "ID большее 999 и большее любого другого значения пользователя. Значения от 0 "
 "до 999 обычно зарезервированы для системных учётных записей."
 
-#: groupmod.8.xml:89(para)
+#: groupmod.8.xml:92(para)
 msgid ""
+"Users who use the group as primary group will be updated to keep the group "
+"as their primary group."
+msgstr ""
+
+#: groupmod.8.xml:96(para)
+msgid ""
 "Any files that have the old group ID and must continue to belong to "
 "<replaceable>GROUP</replaceable>, must have their group ID changed manually."
 msgstr ""
 
-#: groupmod.8.xml:104(term)
+#: groupmod.8.xml:111(term)
 msgid ""
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
@@ -8218,7 +8367,7 @@
 "<option>-n</option>, <option>--new-name</option> <replaceable>НОВАЯ_ГРУППА</"
 "replaceable>"
 
-#: groupmod.8.xml:109(para)
+#: groupmod.8.xml:116(para)
 msgid ""
 "The name of the group will be changed from <replaceable>GROUP</replaceable> "
 "to <replaceable>NEW_GROUP</replaceable> name."
@@ -8227,7 +8376,7 @@
 "<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmod.8.xml:120(para)
+#: groupmod.8.xml:127(para)
 #, fuzzy
 msgid ""
 "When used with the <option>-g</option> option, allow to change the group "
@@ -8237,12 +8386,12 @@
 "<replaceable>GID</replaceable> группы не уникальным значением."
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: groupmod.8.xml:219(para)
+#: groupmod.8.xml:245(para)
 msgid "group name already in use"
 msgstr "такое имя группы уже используется"
 
 # type: Content of: <refentry><refsect1><para>
-#: groupmod.8.xml:183(para)
+#: groupmod.8.xml:209(para)
 msgid ""
 "The <command>groupmod</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -8250,7 +8399,7 @@
 "Команда <command>groupmod</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: groupmod.8.xml:234(para)
+#: groupmod.8.xml:260(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -8283,38 +8432,38 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: groupmems.8.xml:44(refpurpose)
+#: groupmems.8.xml:47(refpurpose)
 msgid "administer members of a user's primary group"
 msgstr "управляет членами первичной группы пользователя"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
-#: groupmems.8.xml:51(replaceable) groupmems.8.xml:52(replaceable)
+#: groupmems.8.xml:54(replaceable) groupmems.8.xml:55(replaceable)
 msgid "user_name"
 msgstr "имя_пользователя"
 
-#: groupmems.8.xml:51(arg)
+#: groupmems.8.xml:54(arg)
 msgid "-a <placeholder-1/>"
 msgstr "-a <placeholder-1/>"
 
-#: groupmems.8.xml:52(arg)
+#: groupmems.8.xml:55(arg)
 msgid "-d <placeholder-1/>"
 msgstr "-d <placeholder-1/>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
-#: groupmems.8.xml:53(replaceable)
+#: groupmems.8.xml:56(replaceable)
 msgid "group_name"
 msgstr "имя_группы"
 
-#: groupmems.8.xml:53(arg)
+#: groupmems.8.xml:56(arg)
 msgid "-g <placeholder-1/>"
 msgstr "-g <placeholder-1/>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: groupmems.8.xml:54(arg)
+#: groupmems.8.xml:57(arg)
 msgid "-l"
 msgstr "-l"
 
-#: groupmems.8.xml:61(para)
+#: groupmems.8.xml:64(para)
 msgid ""
 "The <command>groupmems</command> command allows a user to administer his/her "
 "own group membership list without the requirement of superuser privileges. "
@@ -8327,7 +8476,7 @@
 "группы пользователя является группа с именем совпадающим с именем "
 "пользователя (то есть, guest / guest)."
 
-#: groupmems.8.xml:69(para)
+#: groupmems.8.xml:72(para)
 msgid ""
 "Only the superuser, as administrator, can use <command>groupmems</command> "
 "to alter the memberships of other groups."
@@ -8335,12 +8484,12 @@
 "Только суперпользователь как администратор может использовать "
 "<command>groupmems</command>, чтобы изменить список членов не своей группы."
 
-#: groupmems.8.xml:76(para)
+#: groupmems.8.xml:79(para)
 msgid ""
 "The options which apply to the <command>groupmems</command> command are:"
 msgstr "Параметры команды <command>groupmems</command>:"
 
-#: groupmems.8.xml:82(term)
+#: groupmems.8.xml:85(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
@@ -8351,21 +8500,21 @@
 "<option>-u</option>, <option>--uid</option> <replaceable>UID</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmems.8.xml:84(para)
+#: groupmems.8.xml:87(para)
 #, fuzzy
 #| msgid "Add a new user to the group membership list."
 msgid "Add an user to the group membership list."
 msgstr "Добавить нового пользователя в группу."
 
-#: groupmems.8.xml:85(para) groupmems.8.xml:101(para)
-#: groupmems.8.xml:132(para)
+#: groupmems.8.xml:88(para) groupmems.8.xml:104(para)
+#: groupmems.8.xml:135(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)
+#: groupmems.8.xml:96(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -8377,17 +8526,17 @@
 "<option>-t</option>, <option>--time</option> <replaceable>ДНЕЙ</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmems.8.xml:95(para)
+#: groupmems.8.xml:98(para)
 msgid "Delete a user from the group membership list."
 msgstr "Удалить пользователя из группы."
 
-#: groupmems.8.xml:96(para)
+#: groupmems.8.xml:99(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:109(term)
+#: groupmems.8.xml:112(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
@@ -8398,38 +8547,38 @@
 "<option>-g</option>, <option>--gid</option> <replaceable>GID</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmems.8.xml:111(para)
+#: groupmems.8.xml:114(para)
 msgid "The superuser can specify which group membership list to modify."
 msgstr ""
 "Суперпользователь может указать группу, в которой нужно изменить список "
 "членов."
 
-#: groupmems.8.xml:123(term) chage.1.xml:132(term)
+#: groupmems.8.xml:126(term) chage.1.xml:135(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:125(para)
+#: groupmems.8.xml:128(para)
 msgid "List the group membership list."
 msgstr "Показать список членов группы."
 
-#: groupmems.8.xml:129(term)
+#: groupmems.8.xml:132(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:131(para)
+#: groupmems.8.xml:134(para)
 msgid "Purge all users from the group membership list."
 msgstr "Вычистить всех пользователей из списка членов группы."
 
 # type: Content of: <refentry><refsect1><title>
-#: groupmems.8.xml:143(title)
+#: groupmems.8.xml:159(title)
 msgid "SETUP"
 msgstr "НАСТРОЙКА"
 
-#: groupmems.8.xml:144(para)
+#: groupmems.8.xml:160(para)
 msgid ""
 "The <command>groupmems</command> executable should be in mode <literal>2770</"
 "literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</"
@@ -8445,7 +8594,7 @@
 "членством в своей группе."
 
 # type: Content of: <refentry><refsect1><programlisting>
-#: groupmems.8.xml:153(programlisting)
+#: groupmems.8.xml:169(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -8463,11 +8612,11 @@
 "    "
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmems.8.xml:185(para)
+#: groupmems.8.xml:201(para)
 msgid "secure group account information"
 msgstr "содержит защищаемую информацию о группах"
 
-#: groupmems.8.xml:193(para)
+#: groupmems.8.xml:209(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -8496,22 +8645,34 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: groupdel.8.xml:44(refpurpose)
+#: groupdel.8.xml:47(refpurpose)
 msgid "delete a group"
 msgstr "удаляет группу"
 
-#: groupdel.8.xml:58(para)
+#: groupdel.8.xml:62(para)
+#, fuzzy
+#| 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."
 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."
+"deleting all entries that refer to <replaceable>GROUP</replaceable>. The "
+"named group must exist."
 msgstr ""
 "Программа <command>groupdel</command> изменяет системные файлы учётных "
 "записей, удаляя все записи, относящиеся к <emphasis remap=\"I\">группе</"
 "emphasis>. Группа с таким именем должна существовать."
 
+#: groupdel.8.xml:70(para)
+#, fuzzy
+#| msgid ""
+#| "The options which apply to the <command>groupmod</command> command are:"
+msgid "The options which apply to the <command>groupdel</command> command are:"
+msgstr "Параметры команды <command>groupmod</command>:"
+
 # type: Content of: <refentry><refsect1><para>
-#: groupdel.8.xml:66(para)
+#: groupdel.8.xml:99(para)
 msgid ""
 "You may not remove the primary group of any existing user. You must remove "
 "the user before you remove the group."
@@ -8520,7 +8681,7 @@
 "пользователя. Вы должны удалить пользователя перед тем как удалять группу."
 
 # type: Content of: <refentry><refsect1><para>
-#: groupdel.8.xml:70(para)
+#: groupdel.8.xml:103(para)
 #, fuzzy
 #| msgid ""
 #| "You must manually check all file systems to insure that no files remain "
@@ -8533,12 +8694,12 @@
 "осталось файлов, принадлежащих удалённой группе."
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: groupdel.8.xml:132(para)
+#: groupdel.8.xml:165(para)
 msgid "can't remove user's primary group"
 msgstr "не удалось удалить первичную пользовательскую группу"
 
 # type: Content of: <refentry><refsect1><para>
-#: groupdel.8.xml:108(para)
+#: groupdel.8.xml:141(para)
 msgid ""
 "The <command>groupdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -8546,7 +8707,23 @@
 "Программа <command>groupdel</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: groupdel.8.xml:147(para)
+#: groupdel.8.xml:180(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>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -8561,7 +8738,7 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -8579,12 +8756,12 @@
 "manvolnum></citerefentry>"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: groupadd.8.xml:47(refpurpose)
+#: groupadd.8.xml:49(refpurpose)
 msgid "create a new group"
 msgstr "создаёт новую группу"
 
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:64(para)
+#: groupadd.8.xml:66(para)
 #, fuzzy
 msgid ""
 "The <command>groupadd</command> command creates a new group account using "
@@ -8595,11 +8772,11 @@
 "указанным значениям командной строки и системным значениям по умолчанию. "
 "Новая группа будет добавлена в системные файлы."
 
-#: groupadd.8.xml:73(para)
+#: groupadd.8.xml:75(para)
 msgid "The options which apply to the <command>groupadd</command> command are:"
 msgstr "Параметры команды <command>groupadd</command>:"
 
-#: groupadd.8.xml:83(para)
+#: groupadd.8.xml:85(para)
 #, fuzzy
 msgid ""
 "This option causes the command to simply exit with success status if the "
@@ -8613,7 +8790,7 @@
 "g</option> игнорируется)."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupadd.8.xml:97(para)
+#: groupadd.8.xml:99(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 "
@@ -8628,7 +8805,7 @@
 "зарезервированы под системные группы."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupadd.8.xml:117(para)
+#: groupadd.8.xml:119(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (GID_MIN, GID_MAX "
 "and others). Multiple <option>-K</option> options can be specified."
@@ -8637,7 +8814,7 @@
 "в файле <filename>/etc/login.defs</filename>. Можно указать несколько "
 "параметров <option>-K</option>."
 
-#: groupadd.8.xml:122(para)
+#: groupadd.8.xml:124(para)
 #, fuzzy
 #| msgid ""
 #| "Example: <option>-K </option><replaceable>GID_MIN</"
@@ -8652,7 +8829,7 @@
 "replaceable>=<replaceable>100</replaceable><option> -K </"
 "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: groupadd.8.xml:126(para)
+#: groupadd.8.xml:128(para)
 msgid ""
 "Note: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
@@ -8663,19 +8840,19 @@
 "replaceable>=<replaceable>499</replaceable> пока не работает."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupadd.8.xml:138(para)
+#: groupadd.8.xml:140(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:170(para)
+#: groupadd.8.xml:172(para)
 #, fuzzy
 #| msgid "create a new group"
 msgid "Create a system group."
 msgstr "создаёт новую группу"
 
-#: groupadd.8.xml:173(para)
+#: groupadd.8.xml:175(para)
 msgid ""
 "The numeric identifiers of new system groups are chosen in the "
 "<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
@@ -8684,7 +8861,7 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:224(para)
+#: groupadd.8.xml:239(para)
 #, fuzzy
 #| msgid ""
 #| "Groupnames must begin with a lower case letter or an underscore, and only "
@@ -8700,14 +8877,14 @@
 "доллара. Это можно описать регулярным выражением: [a-z_][a-z0-9_-]*[$]"
 
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:230(para)
+#: groupadd.8.xml:245(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:233(para)
+#: groupadd.8.xml:248(para)
 #, fuzzy
 msgid ""
 "You may not add a NIS or LDAP group. This must be performed on the "
@@ -8717,7 +8894,7 @@
 "сервере."
 
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:237(para)
+#: groupadd.8.xml:252(para)
 #, fuzzy
 msgid ""
 "If the groupname already exists in an external group database such as NIS or "
@@ -8726,17 +8903,17 @@
 "Если имя группы уже существует во внешней базе данных групп, например в NIS, "
 "то <command>groupadd</command> не станет создавать группу."
 
-#: groupadd.8.xml:270(para)
+#: groupadd.8.xml:285(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:276(para)
+#: groupadd.8.xml:291(para)
 msgid "group name not unique"
 msgstr "не уникальное имя группы"
 
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:246(para)
+#: groupadd.8.xml:261(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -8744,7 +8921,7 @@
 "Программа <command>groupadd</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: groupadd.8.xml:291(para)
+#: groupadd.8.xml:306(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -8779,24 +8956,24 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: gpasswd.1.xml:49(phrase)
+#: gpasswd.1.xml:52(phrase)
 #, fuzzy
 #| msgid "administer the <placeholder-1/> file"
 msgid "administer <placeholder-1/>"
 msgstr "управляет файлом <placeholder-1/>"
 
-#: gpasswd.1.xml:52(phrase)
+#: gpasswd.1.xml:55(phrase)
 #, fuzzy
 msgid "administer <placeholder-1/> and <placeholder-2/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: gpasswd.1.xml:63(replaceable)
+#: gpasswd.1.xml:66(replaceable) expiry.1.xml:57(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "параметры"
 
-#: gpasswd.1.xml:73(para)
+#: gpasswd.1.xml:76(para)
 #, fuzzy
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
@@ -8812,7 +8989,7 @@
 "администратора(ов) и параметр <option>-M</option> для определения списка "
 "членов, а также имеет все права администраторов и членов группы."
 
-#: gpasswd.1.xml:81(para)
+#: gpasswd.1.xml:84(para)
 #, fuzzy
 msgid ""
 "System administrators can use the <option>-A</option> option to define group "
@@ -8827,7 +9004,7 @@
 "администратора(ов) и параметр <option>-M</option> для определения списка "
 "членов, а также имеет все права администраторов и членов группы."
 
-#: gpasswd.1.xml:86(para)
+#: gpasswd.1.xml:89(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -8835,7 +9012,7 @@
 "of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:93(para)
+#: gpasswd.1.xml:96(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still use "
@@ -8849,12 +9026,12 @@
 "не члены группы должны ввести пароль."
 
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: gpasswd.1.xml:101(title)
+#: gpasswd.1.xml:104(title)
 msgid "Notes about group passwords"
 msgstr "Замечания о паролях групп"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: gpasswd.1.xml:102(para)
+#: gpasswd.1.xml:105(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 "
@@ -8864,7 +9041,7 @@
 "более одного человека. Однако, группы являются полезным инструментом "
 "совместной работы различных пользователей."
 
-#: gpasswd.1.xml:113(para)
+#: gpasswd.1.xml:116(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
@@ -8874,17 +9051,17 @@
 "используются только если <command>login</command> запускается "
 "суперпользователем."
 
-#: gpasswd.1.xml:117(para)
+#: gpasswd.1.xml:120(para)
 msgid "The options cannot be combined."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: gpasswd.1.xml:120(para)
+#: gpasswd.1.xml:123(para)
 #, fuzzy
 msgid "The options which apply to the <command>gpasswd</command> command are:"
 msgstr "Параметры команды <command>passwd</command>:"
 
-#: gpasswd.1.xml:125(term)
+#: gpasswd.1.xml:128(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
@@ -8893,7 +9070,7 @@
 msgstr ""
 "<option>-u</option>, <option>--uid</option> <replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:129(para)
+#: gpasswd.1.xml:132(para)
 #, fuzzy
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
@@ -8902,7 +9079,7 @@
 "Имя группы будет изменено с <emphasis remap=\"I\">ГРУППА</emphasis> на "
 "<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
 
-#: gpasswd.1.xml:138(term)
+#: gpasswd.1.xml:141(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -8912,7 +9089,7 @@
 msgstr ""
 "<option>-t</option>, <option>--time</option> <replaceable>ДНЕЙ</replaceable>"
 
-#: gpasswd.1.xml:142(para)
+#: gpasswd.1.xml:145(para)
 #, fuzzy
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
@@ -8921,33 +9098,45 @@
 "Имя группы будет изменено с <emphasis remap=\"I\">ГРУППА</emphasis> на "
 "<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
 
-#: gpasswd.1.xml:159(term)
+#: gpasswd.1.xml:162(term)
 #, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-Q</option>, <option>--root</option><replaceable>CHROOT_DIR</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option> <replaceable>ДОМАШНИЙ_КАТАЛОГ</"
+"replaceable>"
+
+#: gpasswd.1.xml:177(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:163(para)
+#: gpasswd.1.xml:181(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:174(term)
+#: gpasswd.1.xml:192(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:178(para)
+#: gpasswd.1.xml:196(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:189(term)
+#: gpasswd.1.xml:207(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
@@ -8960,12 +9149,12 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: gpasswd.1.xml:193(para)
+#: gpasswd.1.xml:211(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr "список администраторов группы, перечисленных через запятую"
 
-#: gpasswd.1.xml:201(term)
+#: gpasswd.1.xml:219(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
@@ -8974,15 +9163,16 @@
 "<option>-M</option>, <option>--members</option><replaceable>user</"
 "replaceable>,..."
 msgstr ""
-"<option>-b</option>, <option>--before</option> <replaceable>ДНЕЙ</replaceable>"
+"<option>-b</option>, <option>--before</option> <replaceable>ДНЕЙ</"
+"replaceable>"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: gpasswd.1.xml:205(para)
+#: gpasswd.1.xml:223(para)
 #, fuzzy
 msgid "Set the list of group members."
 msgstr "список членов группы, перечисленных через запятую"
 
-#: gpasswd.1.xml:215(para)
+#: gpasswd.1.xml:233(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -8991,7 +9181,7 @@
 "server."
 msgstr ""
 
-#: gpasswd.1.xml:260(para)
+#: gpasswd.1.xml:278(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -9019,20 +9209,20 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><citerefentry><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:86(refentrytitle)
+#: faillog.8.xml:38(refentrytitle) faillog.8.xml:45(refname)
+#: faillog.8.xml:51(command) faillog.5.xml:38(refentrytitle)
+#: faillog.5.xml:45(refname) faillog.5.xml:92(refentrytitle)
 msgid "faillog"
 msgstr "faillog"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: faillog.8.xml:40(refpurpose)
+#: faillog.8.xml:46(refpurpose)
 msgid "display faillog records or set login failure limits"
 msgstr ""
 "показывает записи из файла faillog или задаёт предел неудачных попыток входа "
 "в систему"
 
-#: faillog.8.xml:54(para)
+#: faillog.8.xml:60(para)
 #, fuzzy
 #| msgid ""
 #| "<command>faillog</command> formats the contents of the failure log from "
@@ -9055,30 +9245,30 @@
 "имеется хотя бы одна неудачная попытка входа."
 
 # type: Content of: <refentry><refsect1><para>
-#: faillog.8.xml:65(para)
+#: faillog.8.xml:71(para)
 msgid "The options which apply to the <command>faillog</command> command are:"
 msgstr "Параметры команды <command>faillog</command>:"
 
-#: faillog.8.xml:73(para)
+#: faillog.8.xml:79(para)
 msgid ""
 "Display (or act on) faillog records for all users having an entry in the "
 "<filename>faillog</filename> database."
 msgstr ""
 
-#: faillog.8.xml:77(para)
+#: faillog.8.xml:83(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "The range of users can be restricted with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: faillog.8.xml:81(para)
+#: faillog.8.xml:87(para)
 msgid ""
 "In display mode, this is still restricted to existing users but forces the "
 "display of the faillog entries even if they are empty."
 msgstr ""
 
-#: faillog.8.xml:86(para)
+#: faillog.8.xml:92(para)
 msgid ""
 "With the <option>-l</option>, <option>-m</option>, <option>-r</option>, "
 "<option>-t</option> options, the users' records are changed, even if the "
@@ -9086,7 +9276,7 @@
 "that have been deleted or to set a policy in advance for a range of users."
 msgstr ""
 
-#: faillog.8.xml:103(term)
+#: faillog.8.xml:109(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
@@ -9098,7 +9288,7 @@
 "<option>-l</option>, <option>--lock-time</option> <replaceable>СЕКУНД</"
 "replaceable>"
 
-#: faillog.8.xml:108(para)
+#: faillog.8.xml:114(para)
 #, fuzzy
 #| msgid ""
 #| "Lock account to <replaceable>SEC</replaceable> seconds after failed login."
@@ -9108,20 +9298,20 @@
 "Блокировать учётную запись на <replaceable>СЕКУНД</replaceable> после "
 "неудачной попытки входа."
 
-#: faillog.8.xml:112(para) faillog.8.xml:138(para) faillog.8.xml:150(para)
+#: faillog.8.xml:118(para) faillog.8.xml:144(para) faillog.8.xml:156(para)
 msgid ""
 "Write access to <filename>/var/log/faillog</filename> is required for this "
 "option."
 msgstr ""
 
-#: faillog.8.xml:119(term)
+#: faillog.8.xml:125(term)
 msgid ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--maximum</option> <replaceable>МАКС_ЧИСЛО</"
 "replaceable>"
 
-#: faillog.8.xml:124(para)
+#: faillog.8.xml:130(para)
 #, fuzzy
 #| msgid ""
 #| "Reset the counters of login failures or one record if used with the "
@@ -9136,27 +9326,27 @@
 "replaceable>. Для этого требуются права на запись в файл <filename>/var/log/"
 "faillog</filename>."
 
-#: faillog.8.xml:128(para)
+#: faillog.8.xml:134(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:133(para)
+#: faillog.8.xml:139(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:145(term)
+#: faillog.8.xml:151(term)
 msgid "<option>-r</option>, <option>--reset</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: faillog.8.xml:147(para)
+#: faillog.8.xml:153(para)
 msgid "Reset the counters of login failures."
 msgstr ""
 
-#: faillog.8.xml:161(para)
+#: faillog.8.xml:180(para)
 #, fuzzy
 #| msgid ""
 #| "Display faillog records more recent than <replaceable>DAYS</replaceable>. "
@@ -9167,7 +9357,7 @@
 "Показать записи faillog новее чем <replaceable>ДНЕЙ</replaceable>. Параметр "
 "<option>-t</option> отменяет действие параметра <option>-u</option>."
 
-#: faillog.8.xml:173(para)
+#: faillog.8.xml:192(para)
 #, fuzzy
 #| msgid ""
 #| "Display faillog record or maintains failure counters and limits (if used "
@@ -9182,7 +9372,7 @@
 "<option>-l</option>, <option>-m</option> или <option>-r</option>) только для "
 "учётной записи с <replaceable>ИМЕНЕМ</replaceable>."
 
-#: faillog.8.xml:191(para)
+#: faillog.8.xml:210(para)
 #, fuzzy
 #| msgid ""
 #| "The <option>-r</option>, <option>-h</option> and <option>-f</option> "
@@ -9197,7 +9387,7 @@
 "суперпользователем."
 
 # type: Content of: <refentry><refsect1><para>
-#: faillog.8.xml:200(para)
+#: faillog.8.xml:219(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 "
@@ -9211,16 +9401,16 @@
 "специально указать имя пользователя с помощью параметра <option>-a</option>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: faillog.8.xml:213(filename) faillog.5.xml:74(filename)
+#: faillog.8.xml:232(filename) faillog.5.xml:80(filename)
 msgid "/var/log/faillog"
 msgstr "/var/log/faillog"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: faillog.8.xml:215(para) faillog.5.xml:76(para)
+#: faillog.8.xml:234(para) faillog.5.xml:82(para)
 msgid "Failure logging file."
 msgstr "содержит журнал неудавшихся попыток входа в систему"
 
-#: faillog.8.xml:223(para)
+#: faillog.8.xml:242(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
@@ -9231,18 +9421,18 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: faillog.5.xml:40(refpurpose)
+#: faillog.5.xml:46(refpurpose)
 msgid "login failure logging file"
 msgstr "файл протокола неудачных попыток входа в систему"
 
-#: faillog.5.xml:45(para)
+#: faillog.5.xml:51(para)
 msgid ""
 "<filename>/var/log/faillog</filename> maintains a count of login failures "
 "and the limits for each account."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: faillog.5.xml:49(para)
+#: faillog.5.xml:55(para)
 #, fuzzy
 #| msgid ""
 #| "<filename>/var/log/faillog</filename> maintains a count of login failures "
@@ -9256,7 +9446,7 @@
 "The file contains fixed length records, indexed by numerical UID. Each "
 "record contains the count of login failures since the last successful login; "
 "the maximum number of failures before the account is disabled; the line on "
-"whiche the last login failure occurred; the date of the last login failure; "
+"which the last login failure occurred; the date of the last login failure; "
 "and the duration (in seconds) during which the account will be locked after "
 "a failure."
 msgstr ""
@@ -9271,12 +9461,12 @@
 "заблокирована в случае неудачной регистрации."
 
 # type: Content of: <refentry><refsect1><para>
-#: faillog.5.xml:59(para)
+#: faillog.5.xml:65(para)
 msgid "The structure of the file is:"
 msgstr "Структура файла:"
 
 # type: Content of: <refentry><refsect1><programlisting>
-#: faillog.5.xml:60(programlisting)
+#: faillog.5.xml:66(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -9298,17 +9488,17 @@
 "};"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
-#: expiry.1.xml:52(command)
+#: expiry.1.xml:42(refentrytitle) expiry.1.xml:49(refname)
+#: expiry.1.xml:55(command)
 msgid "expiry"
 msgstr "expiry"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: expiry.1.xml:47(refpurpose)
+#: expiry.1.xml:50(refpurpose)
 msgid "check and enforce password expiration policy"
 msgstr "проверяет и изменяет пароль согласно срокам действия"
 
-#: expiry.1.xml:60(para)
+#: expiry.1.xml:64(para)
 msgid ""
 "The <command>expiry</command> command checks (<option>-c</option>) the "
 "current password expiration and forces (<option>-f</option>) changes when "
@@ -9319,7 +9509,31 @@
 "его (параметр <option>-f</option>), если это требуется. Она может "
 "запускаться обычным пользователем."
 
-#: expiry.1.xml:87(para) chage.1.xml:278(para)
+# type: Content of: <refentry><refsect1><para>
+#: expiry.1.xml:73(para)
+#, fuzzy
+#| msgid "The options which apply to the <command>pwck</command> command are:"
+msgid "The options which apply to the <command>expiry</command> command are:"
+msgstr "Параметры команды <command>pwck</command>:"
+
+#: expiry.1.xml:78(term)
+#, fuzzy
+#| msgid "<option>-L</option>, <option>--lock</option>"
+msgid "<option>-c</option>, <option>--check</option>"
+msgstr "<option>-L</option>, <option>--lock</option>"
+
+# type: Content of: <refentry><refnamediv><refpurpose>
+#: expiry.1.xml:80(para)
+#, fuzzy
+#| msgid "check and enforce password expiration policy"
+msgid "Check the password expiration of the current user."
+msgstr "проверяет и изменяет пароль согласно срокам действия"
+
+#: expiry.1.xml:86(para)
+msgid "Force a password change if the current user has an expired password."
+msgstr ""
+
+#: expiry.1.xml:121(para) chage.1.xml:294(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -9330,12 +9544,12 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: chsh.1.xml:46(refpurpose)
+#: chsh.1.xml:49(refpurpose)
 msgid "change login shell"
 msgstr "изменяет регистрационную оболочку пользователя"
 
 # type: Content of: <refentry><refsect1><para>
-#: chsh.1.xml:63(para)
+#: chsh.1.xml:66(para)
 #, fuzzy
 #| msgid ""
 #| "The <command>chsh</command> command changes the user login shell. This "
@@ -9355,12 +9569,12 @@
 "регистрационную оболочку любой учётной записи."
 
 # type: Content of: <refentry><refsect1><para>
-#: chsh.1.xml:74(para)
+#: chsh.1.xml:77(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:96(para)
+#: chsh.1.xml:112(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 "
@@ -9374,7 +9588,7 @@
 "если введена пустая строка, то текущее значение остаётся неизменным. Текущее "
 "значение регистрационной оболочки указано в скобках <emphasis>[ ]</emphasis>."
 
-#: chsh.1.xml:107(para)
+#: chsh.1.xml:123(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 "
@@ -9394,16 +9608,16 @@
 "ограниченную оболочку, то не сможет восстановить её первоначальное значение."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: chsh.1.xml:142(filename)
+#: chsh.1.xml:158(filename)
 msgid "/etc/shells"
 msgstr "/etc/shells"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chsh.1.xml:144(para)
+#: chsh.1.xml:160(para)
 msgid "List of valid login shells."
 msgstr "содержит список разрешённых регистрационных оболочек"
 
-#: chsh.1.xml:158(para)
+#: chsh.1.xml:174(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -9418,12 +9632,12 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: chpasswd.8.xml:47(refpurpose)
+#: chpasswd.8.xml:50(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "обновляет пароли в пакетном режиме"
 
 # type: Content of: <refentry><refsect1><para>
-#: chpasswd.8.xml:61(para)
+#: chpasswd.8.xml:64(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 "
@@ -9433,7 +9647,7 @@
 "\" из стандартного входного потока и обновляет информацию о существующих "
 "пользователях. Каждая строка имеет вид:"
 
-#: chpasswd.8.xml:66(para)
+#: chpasswd.8.xml:69(para)
 msgid ""
 "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -9442,7 +9656,7 @@
 "\">пароль</emphasis>"
 
 # type: Content of: <refentry><refsect1><para>
-#: chpasswd.8.xml:70(para)
+#: chpasswd.8.xml:73(para)
 #, fuzzy
 msgid ""
 "By default the passwords must be supplied in clear-text, and are encrypted "
@@ -9453,7 +9667,7 @@
 "Алгоритмом шифрования по умолчанию является DES. Также, если есть срок "
 "устаревания пароля, то он будет обновлён."
 
-#: chpasswd.8.xml:75(para)
+#: chpasswd.8.xml:78(para)
 msgid ""
 "The default encryption algorithm can be defined for the system with the "
 "<option>ENCRYPT_METHOD</option> or <option>MD5_CRYPT_ENAB</option> variables "
@@ -9461,14 +9675,14 @@
 "<option>-e</option>, <option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
-#: chpasswd.8.xml:83(para)
+#: chpasswd.8.xml:86(para)
 msgid ""
 "By default, passwords are encrypted by PAM, but (even if not recommended) "
 "you can select a different encryption method with the <option>-e</option>, "
 "<option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
-#: chpasswd.8.xml:89(para)
+#: chpasswd.8.xml:92(para)
 msgid ""
 "<phrase condition=\"pam\">Except when PAM is used to encrypt the passwords,</"
 "phrase><command>chpasswd</command> first updates all the passwords in "
@@ -9476,7 +9690,7 @@
 "any user."
 msgstr ""
 
-#: chpasswd.8.xml:95(para)
+#: chpasswd.8.xml:98(para)
 msgid ""
 "When PAM is used to encrypt the passwords (and update the passwords in the "
 "system database) then if a password cannot be updated <command>chpasswd</"
@@ -9485,7 +9699,7 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: chpasswd.8.xml:101(para) chgpasswd.8.xml:81(para)
+#: chpasswd.8.xml:104(para) chgpasswd.8.xml:84(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
@@ -9493,11 +9707,11 @@
 "Данная команда предназначена для работы в крупных системных средах, где за "
 "один раз заводится несколько учётных записей."
 
-#: chpasswd.8.xml:109(para)
+#: chpasswd.8.xml:112(para)
 msgid "The options which apply to the <command>chpasswd</command> command are:"
 msgstr "Параметры команды <command>chpasswd</command>:"
 
-#: chpasswd.8.xml:115(term)
+#: chpasswd.8.xml:118(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
@@ -9509,15 +9723,15 @@
 "<option>-c</option>, <option>--comment</option> <replaceable>КОММЕНТАРИЙ</"
 "replaceable>"
 
-#: chpasswd.8.xml:121(para) chgpasswd.8.xml:98(para)
+#: chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
 msgid "The available methods are DES, MD5, and NONE."
 msgstr ""
 
-#: chpasswd.8.xml:128(para)
+#: chpasswd.8.xml:131(para)
 msgid "By default, PAM is used to encrypt the passwords."
 msgstr ""
 
-#: chpasswd.8.xml:131(para)
+#: chpasswd.8.xml:134(para)
 msgid ""
 "By default (if none of the <option>-c</option>, <option>-m</option>, or "
 "<option>-e</option> options are specified), the encryption method is defined "
@@ -9525,21 +9739,21 @@
 "variables of <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: chpasswd.8.xml:142(term) chgpasswd.8.xml:108(term)
+#: chpasswd.8.xml:145(term) chgpasswd.8.xml:111(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:144(para) chgpasswd.8.xml:110(para)
+#: chpasswd.8.xml:147(para) chgpasswd.8.xml:113(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Передаваемые пароли заданы в шифрованном виде."
 
-#: chpasswd.8.xml:158(term) chgpasswd.8.xml:120(term)
+#: chpasswd.8.xml:161(term) chgpasswd.8.xml:123(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:160(para) chgpasswd.8.xml:122(para)
+#: chpasswd.8.xml:163(para) chgpasswd.8.xml:125(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -9547,7 +9761,7 @@
 "Использовать алгоритм шифрования MD5 вместо DES, если пароли передаются не "
 "шифрованными."
 
-#: chpasswd.8.xml:167(term)
+#: chpasswd.8.xml:183(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
@@ -9559,7 +9773,7 @@
 "<option>-w</option>, <option>--warndays</option> <replaceable>ПРЕД_ДНЕЙ</"
 "replaceable>"
 
-#: chpasswd.8.xml:187(para)
+#: chpasswd.8.xml:203(para)
 #, fuzzy
 #| msgid ""
 #| "The mail spool is defined by the <emphasis>MAIL_DIR</emphasis> variable "
@@ -9573,7 +9787,7 @@
 "в файле <filename>login.defs</filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: chpasswd.8.xml:200(para) chgpasswd.8.xml:158(para)
+#: chpasswd.8.xml:216(para) chgpasswd.8.xml:174(para)
 msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
@@ -9582,17 +9796,17 @@
 "нешифрованных файлов другими пользователями."
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: chpasswd.8.xml:244(filename)
+#: chpasswd.8.xml:260(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/chpasswd"
 msgstr "/etc/passwd"
 
-#: chpasswd.8.xml:246(para)
+#: chpasswd.8.xml:262(para)
 msgid "PAM configuration for <command>chpasswd</command>."
 msgstr ""
 
-#: chpasswd.8.xml:254(para)
+#: chpasswd.8.xml:270(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
@@ -9610,12 +9824,12 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: chgpasswd.8.xml:48(refpurpose)
+#: chgpasswd.8.xml:51(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "обновляет пароли групп в пакетном режиме"
 
 # type: Content of: <refentry><refsect1><para>
-#: chgpasswd.8.xml:62(para)
+#: chgpasswd.8.xml:65(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 "
@@ -9625,7 +9839,7 @@
 "из стандартного входного потока и обновляет информацию о существующих "
 "группах. Каждая строка имеет вид:"
 
-#: chgpasswd.8.xml:67(para)
+#: chgpasswd.8.xml:70(para)
 msgid ""
 "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -9634,7 +9848,7 @@
 "emphasis>"
 
 # type: Content of: <refentry><refsect1><para>
-#: chgpasswd.8.xml:71(para)
+#: chgpasswd.8.xml:74(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -9643,20 +9857,20 @@
 "По умолчанию, передаваемый пароль должен быть в виде обычного текста. "
 "Алгоритмом шифрования по умолчанию является DES."
 
-#: chgpasswd.8.xml:75(para)
+#: chgpasswd.8.xml:78(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 "
-"overwiten with the <option>-e</option>, <option>-m</option>, or <option>-c</"
-"option> options."
+"<option>ENCRYPT_METHOD</option> variable of <filename>/etc/login.defs</"
+"filename>, and can be overwiten with the <option>-e</option>, <option>-m</"
+"option>, or <option>-c</option> options."
 msgstr ""
 
-#: chgpasswd.8.xml:89(para)
+#: chgpasswd.8.xml:92(para)
 msgid ""
 "The options which apply to the <command>chgpasswd</command> command are:"
 msgstr "Параметры команды <command>chgpasswd</command>:"
 
-#: chgpasswd.8.xml:209(para)
+#: chgpasswd.8.xml:225(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
@@ -9672,52 +9886,28 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: chfn.1.xml:47(refpurpose)
+#: chfn.1.xml:49(refpurpose)
 msgid "change real user name and information"
 msgstr "изменяет информацию о пользователе"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><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:54(replaceable)
-msgid "room_no"
-msgstr "номер комнаты"
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: chfn.1.xml:55(replaceable)
-msgid "work_ph"
-msgstr "рабочий телефон"
-
-#: chfn.1.xml:55(arg)
-msgid "-w <placeholder-1/>"
-msgstr "-w <placeholder-1/>"
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: chfn.1.xml:56(replaceable)
-msgid "home_ph"
-msgstr "домашний телефон"
-
-# type: Content of: <refentry><refsect1><para><emphasis>
-#: chfn.1.xml:57(replaceable)
-msgid "other"
-msgstr "другое"
-
-#: chfn.1.xml:57(arg)
-msgid "-o <placeholder-1/>"
-msgstr "-o <placeholder-1/>"
-
-#: chfn.1.xml:64(para)
+#: chfn.1.xml:66(para)
+#, fuzzy
+#| msgid ""
+#| "The <command>chfn</command> command changes user fullname, office number, "
+#| "office extension, and home phone number information for a user's account. "
+#| "This information is typically printed by "
+#| "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry> and similar programs. A normal user may only "
+#| "change the fields for her own account, subject to the restrictions in "
+#| "<filename>/etc/login.defs</filename>. (The default configuration is to "
+#| "prevent users from changing their fullname.) The superuser may change any "
+#| "field for any account. Additionally, only the superuser may use the "
+#| "<option>-o</option> option to change the undefined portions of the GECOS "
+#| "field."
 msgid ""
-"The <command>chfn</command> command changes user fullname, office number, "
-"office extension, and home phone number information for a user's account. "
-"This information is typically printed by "
+"The <command>chfn</command> command changes user fullname, office room "
+"number, office phone number, and home phone number information for a user's "
+"account. This information is typically printed by "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and similar programs. A normal user may only change the fields "
 "for her own account, subject to the restrictions in <filename>/etc/login."
@@ -9737,7 +9927,7 @@
 "записи. Кроме того, только суперпользователь может использовать параметр "
 "<option>-o</option> для изменения нестандартизованной части поля GECOS."
 
-#: chfn.1.xml:78(para)
+#: chfn.1.xml:80(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. "
@@ -9747,8 +9937,105 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: chfn.1.xml:87(para)
+#: chfn.1.xml:93(para)
+#, fuzzy
+#| msgid "The options which apply to the <command>chsh</command> command are:"
+msgid "The options which apply to the <command>chfn</command> command are:"
+msgstr "Параметры команды <command>chsh</command>:"
+
+#: chfn.1.xml:98(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
+#| "replaceable>"
 msgid ""
+"<option>-f</option>, <option>--full-name</option><replaceable>FULL_NAME</"
+"replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--user</option><replaceable>ИМЯ</replaceable>"
+
+# type: Content of: <refentry><refsect1><refsect2><title>
+#: chfn.1.xml:102(para)
+#, fuzzy
+#| msgid "Changing the default values"
+msgid "Change the user's full name."
+msgstr "Изменение значений по умолчанию"
+
+#: chfn.1.xml:106(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-h</option>, <option>--home-phone</option><replaceable>HOME_PHONE</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option> <replaceable>ДОМАШНИЙ_КАТАЛОГ</"
+"replaceable>"
+
+#: chfn.1.xml:110(para)
+msgid "Change the user's home phone number."
+msgstr ""
+
+#: chfn.1.xml:114(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-o</option>, <option>--other</option><replaceable>OTHER</replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option> <replaceable>ДОМАШНИЙ_КАТАЛОГ</"
+"replaceable>"
+
+#: chfn.1.xml:118(para)
+msgid ""
+"Change the user's other GECOS information. This field is used to store "
+"accounting information used by other applications, and can be changed only "
+"by a superuser."
+msgstr ""
+
+#: chfn.1.xml:126(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-r</option>, <option>--room</option><replaceable>ROOM_NUMBER</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option> <replaceable>ДОМАШНИЙ_КАТАЛОГ</"
+"replaceable>"
+
+#: chfn.1.xml:130(para)
+msgid "Change the user's room number."
+msgstr ""
+
+#: chfn.1.xml:147(term)
+#, fuzzy
+#| msgid "<option>-h</option>, <option>--help</option>"
+msgid "<option>-u</option>, <option>--help</option>"
+msgstr "<option>-h</option>, <option>--help</option>"
+
+#: chfn.1.xml:155(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-w</option>, <option>--work-phone</option><replaceable>WORK_PHONE</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option> <replaceable>ДОМАШНИЙ_КАТАЛОГ</"
+"replaceable>"
+
+#: chfn.1.xml:159(para)
+msgid "Change the user's office phone number."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: chfn.1.xml:163(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 "
 "the fields. Enter the new value to change the field, or leave the line blank "
@@ -9764,7 +10051,7 @@
 "Без параметров, программа <command>chfn</command> изменяет учётную запись "
 "запустившего пользователя."
 
-#: chfn.1.xml:132(para)
+#: chfn.1.xml:208(para)
 msgid ""
 "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -9779,12 +10066,12 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: chage.1.xml:44(refpurpose)
+#: chage.1.xml:47(refpurpose)
 msgid "change user password expiry information"
 msgstr "изменяет информацию об устаревании пароля пользователя"
 
 # type: Content of: <refentry><refsect1><para>
-#: chage.1.xml:60(para)
+#: chage.1.xml:63(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 "
@@ -9796,11 +10083,11 @@
 "сменить свой пароль."
 
 # type: Content of: <refentry><refsect1><para>
-#: chage.1.xml:70(para)
+#: chage.1.xml:73(para)
 msgid "The options which apply to the <command>chage</command> command are:"
 msgstr "Параметры команды <command>chage</command>:"
 
-#: chage.1.xml:75(term)
+#: chage.1.xml:78(term)
 msgid ""
 "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
 "replaceable>"
@@ -9809,7 +10096,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chage.1.xml:79(para)
+#: chage.1.xml:82(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 "
@@ -9819,16 +10106,16 @@
 "смена пароля. Дата может быть также указана в виде ГГГГ-ММ-ДД (или в форме "
 "согласно региональным настройкам)."
 
-#: chage.1.xml:87(term)
+#: chage.1.xml:90(term)
 msgid ""
 "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
 msgstr ""
-"<option>-E</option>, <option>--expiredate</"
-"option> <replaceable>ДАТА_УСТАРЕВАНИЯ</replaceable>"
+"<option>-E</option>, <option>--expiredate</option> "
+"<replaceable>ДАТА_УСТАРЕВАНИЯ</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chage.1.xml:91(para)
+#: chage.1.xml:94(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 "
@@ -9842,7 +10129,7 @@
 "Пользователь, чья учётная запись была заблокирована, должен обратиться к "
 "системному администратору, если хочет в дальнейшем работать с системой."
 
-#: chage.1.xml:99(para)
+#: chage.1.xml:102(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>EXPIRE_DATE</replaceable> will remove an account expiration "
@@ -9852,7 +10139,7 @@
 "<replaceable>ДАТА_УСТАРЕВАНИЯ</replaceable> отменяет устаревание учётной "
 "записи."
 
-#: chage.1.xml:113(term)
+#: chage.1.xml:116(term)
 msgid ""
 "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -9861,7 +10148,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chage.1.xml:117(para)
+#: chage.1.xml:120(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 "
@@ -9874,7 +10161,7 @@
 "запись была заблокирована, должен обратиться к системному администратору, "
 "если хочет в дальнейшем работать с системой."
 
-#: chage.1.xml:124(para)
+#: chage.1.xml:127(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>INACTIVE</replaceable> will remove an account's inactivity."
@@ -9883,11 +10170,11 @@
 "<replaceable>ДНЕЙ</replaceable> отменяет неактивность учётной записи."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chage.1.xml:136(para)
+#: chage.1.xml:139(para)
 msgid "Show account aging information."
 msgstr "Показать информацию об устаревании учётной записи."
 
-#: chage.1.xml:142(term)
+#: chage.1.xml:145(term)
 msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -9895,7 +10182,7 @@
 "<option>-m</option>, <option>--mindays</option> <replaceable>МИН_ДНЕЙ</"
 "replaceable>"
 
-#: chage.1.xml:154(term)
+#: chage.1.xml:157(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -9904,7 +10191,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chage.1.xml:158(para)
+#: chage.1.xml:161(para)
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
@@ -9920,7 +10207,7 @@
 "неожиданностью можно воспользоваться параметром <option>-W</option>, который "
 "активирует выдачу предупреждения о смене пароля пользователя заранее."
 
-#: chage.1.xml:167(para)
+#: chage.1.xml:170(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as "
 "<replaceable>MAX_DAYS</replaceable> will remove checking a password's "
@@ -9929,7 +10216,7 @@
 "Указание значения <emphasis remap=\"I\">-1</emphasis> в параметре "
 "<replaceable>МАКС_ДНЕЙ</replaceable> отменяет проверку пароля."
 
-#: chage.1.xml:175(term)
+#: chage.1.xml:191(term)
 msgid ""
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -9938,7 +10225,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chage.1.xml:179(para)
+#: chage.1.xml:195(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 "
@@ -9951,7 +10238,7 @@
 "пароля, перед тем как это случится."
 
 # type: Content of: <refentry><refsect1><para>
-#: chage.1.xml:188(para)
+#: chage.1.xml:204(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 "
@@ -9966,7 +10253,7 @@
 "Текущее значение показано в скобках <emphasis>[ ]</emphasis>."
 
 # type: Content of: <refentry><refsect1><para>
-#: chage.1.xml:198(para)
+#: chage.1.xml:214(para)
 msgid ""
 "The <command>chage</command> program requires a shadow password file to be "
 "available."
@@ -9974,7 +10261,7 @@
 "Программа <command>chage</command> требует наличия файла теневых паролей."
 
 # type: Content of: <refentry><refsect1><para>
-#: chage.1.xml:202(para)
+#: chage.1.xml:218(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 "
@@ -9986,17 +10273,17 @@
 "устаревания своего пароля."
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: chage.1.xml:267(replaceable)
+#: chage.1.xml:283(replaceable)
 msgid "15"
 msgstr "15"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: chage.1.xml:269(para)
+#: chage.1.xml:285(para)
 msgid "can't find the shadow password file"
 msgstr "не удалось найти файл теневых паролей"
 
 # type: Content of: <refentry><refsect1><para>
-#: chage.1.xml:245(para)
+#: chage.1.xml:261(para)
 msgid ""
 "The <command>chage</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -10009,8 +10296,73 @@
 msgid "translator-credits"
 msgstr "Yuri Kozlov <kozlov.y at gmail.com>, 2005, 2006"
 
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
+#~ msgid "-q"
+#~ msgstr "-q"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
+#~ msgid "-s"
+#~ msgstr "-s"
+
 #, 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>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+#~ "\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+#~ "phrase><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><refentrytitle>usermod</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#~ msgid "new_users"
+#~ msgstr "new_users"
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
+#~ msgid "full_name"
+#~ msgstr "ФИО"
+
+#~ msgid "-f <placeholder-1/>"
+#~ msgstr "-f <placeholder-1/>"
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
+#~ msgid "room_no"
+#~ msgstr "номер комнаты"
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
+#~ msgid "work_ph"
+#~ msgstr "рабочий телефон"
+
+#~ msgid "-w <placeholder-1/>"
+#~ msgstr "-w <placeholder-1/>"
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
+#~ msgid "home_ph"
+#~ msgstr "домашний телефон"
+
+# type: Content of: <refentry><refsect1><para><emphasis>
+#~ msgid "other"
+#~ msgstr "другое"
+
+#~ msgid "-o <placeholder-1/>"
+#~ msgstr "-o <placeholder-1/>"
+
+#, fuzzy
+#~| msgid ""
 #~| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
 #~| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
 #~| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
@@ -10477,12 +10829,6 @@
 #~ "систему."
 
 #~ 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 "

Modified: upstream/trunk/man/po/shadow-man-pages.pot
===================================================================
--- upstream/trunk/man/po/shadow-man-pages.pot	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/man/po/shadow-man-pages.pot	2011-11-13 18:21:43 UTC (rev 3579)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-08-29 17:54+0200\n"
+"POT-Creation-Date: 2011-11-13 18:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -9,99 +9,111 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: vipw.8.xml:39(refentrytitle) vipw.8.xml:44(refname) vipw.8.xml:53(command) login.defs.5.xml:477(term)
+#: vipw.8.xml:40(refentrytitle) vipw.8.xml:47(refname) vipw.8.xml:56(command) login.defs.5.xml:480(term)
 msgid "vipw"
 msgstr ""
 
-#: vipw.8.xml:40(manvolnum) usermod.8.xml:42(manvolnum) userdel.8.xml:44(manvolnum) userdel.8.xml:203(replaceable) useradd.8.xml:53(manvolnum) pwconv.8.xml:44(manvolnum) pwck.8.xml:44(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:130(replaceable) groupadd.8.xml:42(manvolnum) faillog.8.xml:35(manvolnum) faillog.5.xml:86(manvolnum) chpasswd.8.xml:42(manvolnum) chgpasswd.8.xml:43(manvolnum)
+#: vipw.8.xml:41(manvolnum) usermod.8.xml:43(manvolnum) userdel.8.xml:45(manvolnum) userdel.8.xml:219(replaceable) useradd.8.xml:54(manvolnum) pwconv.8.xml:45(manvolnum) pwck.8.xml:45(manvolnum) nologin.8.xml:39(manvolnum) newusers.8.xml:52(manvolnum) logoutd.8.xml:39(manvolnum) lastlog.8.xml:40(manvolnum) grpck.8.xml:40(manvolnum) groupmod.8.xml:40(manvolnum) groupmems.8.xml:40(manvolnum) groupdel.8.xml:40(manvolnum) groupdel.8.xml:163(replaceable) groupadd.8.xml:42(manvolnum) faillog.8.xml:39(manvolnum) faillog.5.xml:92(manvolnum) chpasswd.8.xml:43(manvolnum) chgpasswd.8.xml:44(manvolnum)
 msgid "8"
 msgstr ""
 
-#: vipw.8.xml:41(refmiscinfo) usermod.8.xml:43(refmiscinfo) userdel.8.xml:45(refmiscinfo) useradd.8.xml:54(refmiscinfo) pwconv.8.xml:45(refmiscinfo) pwck.8.xml:45(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:43(refmiscinfo) faillog.8.xml:36(refmiscinfo) chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
+#: vipw.8.xml:42(refmiscinfo) usermod.8.xml:44(refmiscinfo) userdel.8.xml:46(refmiscinfo) useradd.8.xml:55(refmiscinfo) pwconv.8.xml:46(refmiscinfo) pwck.8.xml:46(refmiscinfo) nologin.8.xml:40(refmiscinfo) newusers.8.xml:53(refmiscinfo) logoutd.8.xml:40(refmiscinfo) lastlog.8.xml:41(refmiscinfo) grpck.8.xml:41(refmiscinfo) groupmod.8.xml:41(refmiscinfo) groupmems.8.xml:41(refmiscinfo) groupdel.8.xml:41(refmiscinfo) groupadd.8.xml:43(refmiscinfo) faillog.8.xml:40(refmiscinfo) chpasswd.8.xml:44(refmiscinfo) chgpasswd.8.xml:45(refmiscinfo)
 msgid "System Management Commands"
 msgstr ""
 
-#: vipw.8.xml:45(refname) vipw.8.xml:59(command)
+#: vipw.8.xml:43(refmiscinfo) usermod.8.xml:45(refmiscinfo) userdel.8.xml:47(refmiscinfo) useradd.8.xml:56(refmiscinfo) suauth.5.xml:41(refmiscinfo) su.1.xml:58(refmiscinfo) sg.1.xml:42(refmiscinfo) shadow.5.xml:41(refmiscinfo) shadow.3.xml:41(refmiscinfo) pwconv.8.xml:47(refmiscinfo) pwck.8.xml:47(refmiscinfo) porttime.5.xml:41(refmiscinfo) passwd.5.xml:41(refmiscinfo) passwd.1.xml:48(refmiscinfo) nologin.8.xml:41(refmiscinfo) newusers.8.xml:54(refmiscinfo) newgrp.1.xml:42(refmiscinfo) logoutd.8.xml:41(refmiscinfo) login.defs.5.xml:104(refmiscinfo) login.access.5.xml:42(refmiscinfo) login.1.xml:74(refmiscinfo) limits.5.xml:42(refmiscinfo) lastlog.8.xml:42(refmiscinfo) gshadow.5.xml:40(refmiscinfo) grpck.8.xml:42(refmiscinfo) groups.1.xml:41(refmiscinfo) groupmod.8.xml:42(refmiscinfo) groupmems.8.xml:42(refmiscinfo) groupdel.8.xml:42(refmiscinfo) groupadd.8.xml:44(refmiscinfo) gpasswd.1.xml:46(refmiscinfo) faillog.8.xml:41(refmiscinfo) faillog.5.xml:41(refmiscinfo) expiry.1.xml:45(refmiscinfo) chsh.1.xml:44(refmiscinfo) chpasswd.8.xml:45(refmiscinfo) chgpasswd.8.xml:46(refmiscinfo) chfn.1.xml:44(refmiscinfo) chage.1.xml:42(refmiscinfo)
+msgid "shadow-utils"
+msgstr ""
+
+#: vipw.8.xml:48(refname) vipw.8.xml:62(command)
 msgid "vigr"
 msgstr ""
 
-#: vipw.8.xml:46(refpurpose)
+#: vipw.8.xml:49(refpurpose)
 msgid "edit the password, group, shadow-password or shadow-group file"
 msgstr ""
 
-#: vipw.8.xml:55(replaceable) vipw.8.xml:61(replaceable) usermod.8.xml:54(replaceable) userdel.8.xml:54(arg) useradd.8.xml:64(replaceable) useradd.8.xml:76(replaceable) su.1.xml:66(replaceable) passwd.1.xml:57(replaceable) newusers.8.xml:63(replaceable) lastlog.8.xml:48(replaceable) groupmod.8.xml:51(replaceable) groupadd.8.xml:54(replaceable) faillog.8.xml:47(replaceable) chsh.1.xml:53(replaceable) chpasswd.8.xml:54(replaceable) chgpasswd.8.xml:55(replaceable) chage.1.xml:50(replaceable)
+#: vipw.8.xml:58(replaceable) vipw.8.xml:64(replaceable) usermod.8.xml:57(replaceable) userdel.8.xml:57(arg) useradd.8.xml:67(replaceable) useradd.8.xml:79(replaceable) su.1.xml:69(replaceable) pwconv.8.xml:62(replaceable) pwconv.8.xml:68(replaceable) pwconv.8.xml:74(replaceable) pwconv.8.xml:80(replaceable) pwck.8.xml:58(arg) passwd.1.xml:60(replaceable) newusers.8.xml:66(replaceable) lastlog.8.xml:54(replaceable) grpck.8.xml:53(arg) groupmod.8.xml:54(replaceable) groupdel.8.xml:54(replaceable) groupadd.8.xml:56(replaceable) faillog.8.xml:53(replaceable) chsh.1.xml:56(replaceable) chpasswd.8.xml:57(replaceable) chgpasswd.8.xml:58(replaceable) chfn.1.xml:56(replaceable) chage.1.xml:53(replaceable)
 msgid "options"
 msgstr ""
 
-#: vipw.8.xml:67(title) usermod.8.xml:61(title) userdel.8.xml:62(title) useradd.8.xml:82(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:71(title) pwck.8.xml:86(title) porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title) nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title) logoutd.8.xml:50(title) login.defs.5.xml:110(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:63(title) gpasswd.1.xml:72(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:59(title)
+#: vipw.8.xml:70(title) usermod.8.xml:64(title) userdel.8.xml:65(title) useradd.8.xml:85(title) suauth.5.xml:56(title) su.1.xml:80(title) sg.1.xml:62(title) shadow.5.xml:50(title) shadow.3.xml:99(title) shadow.3.xml:155(title) pwconv.8.xml:86(title) pwck.8.xml:73(title) porttime.5.xml:50(title) passwd.5.xml:50(title) passwd.1.xml:69(title) nologin.8.xml:56(title) newusers.8.xml:75(title) newgrp.1.xml:58(title) logoutd.8.xml:56(title) login.defs.5.xml:113(title) login.access.5.xml:51(title) login.1.xml:106(title) limits.5.xml:52(title) lastlog.8.xml:60(title) gshadow.5.xml:49(title) grpck.8.xml:64(title) groups.1.xml:59(title) groupmod.8.xml:61(title) groupmems.8.xml:63(title) groupdel.8.xml:61(title) groupadd.8.xml:65(title) gpasswd.1.xml:75(title) faillog.8.xml:59(title) faillog.5.xml:50(title) expiry.1.xml:63(title) chsh.1.xml:65(title) chpasswd.8.xml:63(title) chgpasswd.8.xml:64(title) chfn.1.xml:65(title) chage.1.xml:62(title)
 msgid "DESCRIPTION"
 msgstr ""
 
-#: vipw.8.xml:68(para)
+#: vipw.8.xml:71(para)
 msgid "The <command>vipw</command> and <command>vigr</command> commands edits the files <filename>/etc/passwd</filename> and <filename>/etc/group</filename>, respectively. With the <option>-s</option> flag, they will edit the shadow versions of those files, <filename>/etc/shadow</filename> and <filename>/etc/gshadow</filename>, respectively. The programs will set the appropriate locks to prevent file corruption. When looking for an editor, the programs will first try the environment variable <envar>$VISUAL</envar>, then the environment variable <envar>$EDITOR</envar>, and finally the default editor, <citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 msgstr ""
 
-#: vipw.8.xml:85(title) usermod.8.xml:69(title) userdel.8.xml:71(title) useradd.8.xml:100(title) su.1.xml:123(title) pwck.8.xml:170(title) passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title) lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title) groupmems.8.xml:75(title) groupadd.8.xml:72(title) gpasswd.1.xml:112(title) faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:108(title) chgpasswd.8.xml:88(title) chage.1.xml:69(title)
+#: vipw.8.xml:88(title) usermod.8.xml:72(title) userdel.8.xml:74(title) useradd.8.xml:103(title) su.1.xml:126(title) pwconv.8.xml:168(title) pwck.8.xml:157(title) passwd.1.xml:155(title) newusers.8.xml:244(title) login.1.xml:191(title) lastlog.8.xml:72(title) grpck.8.xml:128(title) groupmod.8.xml:70(title) groupmems.8.xml:78(title) groupdel.8.xml:69(title) groupadd.8.xml:74(title) gpasswd.1.xml:115(title) faillog.8.xml:70(title) expiry.1.xml:72(title) chsh.1.xml:76(title) chpasswd.8.xml:111(title) chgpasswd.8.xml:91(title) chfn.1.xml:92(title) chage.1.xml:72(title)
 msgid "OPTIONS"
 msgstr ""
 
-#: vipw.8.xml:86(para)
+#: vipw.8.xml:89(para)
 msgid "The options which apply to the <command>vipw</command> and <command>vigr</command> commands are:"
 msgstr ""
 
-#: vipw.8.xml:92(term)
+#: vipw.8.xml:95(term)
 msgid "<option>-g</option>, <option>--group</option>"
 msgstr ""
 
-#: vipw.8.xml:94(para)
+#: vipw.8.xml:97(para)
 msgid "Edit group database."
 msgstr ""
 
-#: vipw.8.xml:98(term) userdel.8.xml:101(term) useradd.8.xml:250(term) passwd.1.xml:192(term) newusers.8.xml:257(term) lastlog.8.xml:82(term) groupmod.8.xml:98(term) groupmems.8.xml:117(term) groupadd.8.xml:107(term) gpasswd.1.xml:151(term) faillog.8.xml:97(term) chsh.1.xml:79(term) chpasswd.8.xml:150(term) chgpasswd.8.xml:114(term) chage.1.xml:107(term)
+#: vipw.8.xml:101(term) userdel.8.xml:104(term) useradd.8.xml:253(term) pwconv.8.xml:176(term) pwck.8.xml:167(term) passwd.1.xml:195(term) newusers.8.xml:262(term) lastlog.8.xml:88(term) grpck.8.xml:138(term) groupmod.8.xml:105(term) groupmems.8.xml:120(term) groupdel.8.xml:76(term) groupadd.8.xml:109(term) gpasswd.1.xml:154(term) faillog.8.xml:103(term) expiry.1.xml:93(term) chsh.1.xml:82(term) chpasswd.8.xml:153(term) chgpasswd.8.xml:117(term) chage.1.xml:110(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr ""
 
-#: vipw.8.xml:100(para) userdel.8.xml:103(para) useradd.8.xml:252(para) passwd.1.xml:194(para) newusers.8.xml:259(para) lastlog.8.xml:86(para) groupmod.8.xml:100(para) groupmems.8.xml:119(para) groupadd.8.xml:109(para) gpasswd.1.xml:153(para) faillog.8.xml:99(para) chsh.1.xml:81(para) chpasswd.8.xml:152(para) chgpasswd.8.xml:116(para) chage.1.xml:109(para)
+#: vipw.8.xml:103(para) userdel.8.xml:106(para) useradd.8.xml:255(para) pwconv.8.xml:178(para) pwck.8.xml:169(para) passwd.1.xml:197(para) newusers.8.xml:264(para) lastlog.8.xml:92(para) grpck.8.xml:140(para) groupmod.8.xml:107(para) groupmems.8.xml:122(para) groupdel.8.xml:78(para) groupadd.8.xml:111(para) gpasswd.1.xml:156(para) faillog.8.xml:105(para) expiry.1.xml:95(para) chsh.1.xml:84(para) chpasswd.8.xml:155(para) chgpasswd.8.xml:119(para) chfn.1.xml:151(para) chage.1.xml:112(para)
 msgid "Display help message and exit."
 msgstr ""
 
-#: vipw.8.xml:104(term)
+#: vipw.8.xml:107(term)
 msgid "<option>-p</option>, <option>--passwd</option>"
 msgstr ""
 
-#: vipw.8.xml:106(para)
+#: vipw.8.xml:109(para)
 msgid "Edit passwd database."
 msgstr ""
 
-#: vipw.8.xml:110(term) passwd.1.xml:259(term)
+#: vipw.8.xml:113(term) pwck.8.xml:173(term) passwd.1.xml:262(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr ""
 
-#: vipw.8.xml:112(para) passwd.1.xml:263(para)
+#: vipw.8.xml:115(para) passwd.1.xml:266(para)
 msgid "Quiet mode."
 msgstr ""
 
-#: vipw.8.xml:116(term)
+#: vipw.8.xml:119(term) usermod.8.xml:298(term) userdel.8.xml:127(term) useradd.8.xml:438(term) pwconv.8.xml:182(term) pwck.8.xml:190(term) passwd.1.xml:282(term) newusers.8.xml:287(term) lastlog.8.xml:96(term) grpck.8.xml:154(term) groupmod.8.xml:156(term) groupmems.8.xml:143(term) groupdel.8.xml:82(term) groupadd.8.xml:184(term) faillog.8.xml:163(term) chsh.1.xml:88(term) chpasswd.8.xml:170(term) chgpasswd.8.xml:132(term) chfn.1.xml:134(term) chage.1.xml:178(term)
+msgid "<option>-R</option>, <option>--root</option><replaceable>CHROOT_DIR</replaceable>"
+msgstr ""
+
+#: vipw.8.xml:124(para) usermod.8.xml:303(para) userdel.8.xml:132(para) useradd.8.xml:443(para) pwconv.8.xml:187(para) pwck.8.xml:195(para) passwd.1.xml:287(para) newusers.8.xml:292(para) lastlog.8.xml:101(para) grpck.8.xml:159(para) groupmod.8.xml:161(para) groupmems.8.xml:148(para) groupdel.8.xml:87(para) groupadd.8.xml:189(para) gpasswd.1.xml:167(para) faillog.8.xml:168(para) chsh.1.xml:93(para) chpasswd.8.xml:175(para) chgpasswd.8.xml:137(para) chfn.1.xml:139(para) chage.1.xml:183(para)
+msgid "Apply changes in the <replaceable>CHROOT_DIR</replaceable> directory and use the configuration files from the <replaceable>CHROOT_DIR</replaceable> directory."
+msgstr ""
+
+#: vipw.8.xml:132(term)
 msgid "<option>-s</option>, <option>--shadow</option>"
 msgstr ""
 
-#: vipw.8.xml:118(para)
+#: vipw.8.xml:134(para)
 msgid "Edit shadow or gshadow database."
 msgstr ""
 
-#: vipw.8.xml:122(term)
+#: vipw.8.xml:138(term)
 msgid "<option>-u</option>, <option>--user</option>"
 msgstr ""
 
-#: vipw.8.xml:124(para)
+#: vipw.8.xml:140(para)
 msgid "Indicates which user's tcb shadow file to edit."
 msgstr ""
 
-#: vipw.8.xml:131(title) usermod.8.xml:374(title) userdel.8.xml:127(title) useradd.8.xml:629(title) su.1.xml:310(title) sg.1.xml:76(title) pwconv.8.xml:164(title) pwck.8.xml:230(title) passwd.1.xml:356(title) newusers.8.xml:324(title) newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:173(title) groupmod.8.xml:152(title) groupmems.8.xml:162(title) groupdel.8.xml:77(title) groupadd.8.xml:185(title) gpasswd.1.xml:226(title) chsh.1.xml:120(title) chpasswd.8.xml:207(title) chgpasswd.8.xml:169(title) chfn.1.xml:99(title) chage.1.xml:210(title)
+#: vipw.8.xml:147(title) usermod.8.xml:404(title) userdel.8.xml:143(title) useradd.8.xml:645(title) su.1.xml:320(title) sg.1.xml:79(title) pwconv.8.xml:209(title) pwck.8.xml:234(title) passwd.1.xml:372(title) newusers.8.xml:342(title) newgrp.1.xml:90(title) login.1.xml:275(title) grpck.8.xml:191(title) groupmod.8.xml:172(title) groupmems.8.xml:178(title) groupdel.8.xml:110(title) groupadd.8.xml:200(title) gpasswd.1.xml:244(title) chsh.1.xml:136(title) chpasswd.8.xml:223(title) chgpasswd.8.xml:185(title) chfn.1.xml:175(title) chage.1.xml:226(title)
 msgid "CONFIGURATION"
 msgstr ""
 
-#: vipw.8.xml:132(para) usermod.8.xml:375(para) userdel.8.xml:128(para) useradd.8.xml:630(para) su.1.xml:311(para) sg.1.xml:77(para) pwck.8.xml:231(para) passwd.1.xml:357(para) newusers.8.xml:325(para) newgrp.1.xml:88(para) login.1.xml:273(para) grpck.8.xml:174(para) groupmod.8.xml:153(para) groupmems.8.xml:163(para) groupdel.8.xml:78(para) groupadd.8.xml:186(para) gpasswd.1.xml:227(para) chsh.1.xml:121(para) chpasswd.8.xml:208(para) chgpasswd.8.xml:170(para) chfn.1.xml:100(para) chage.1.xml:211(para)
+#: vipw.8.xml:148(para) usermod.8.xml:405(para) userdel.8.xml:144(para) useradd.8.xml:646(para) su.1.xml:321(para) sg.1.xml:80(para) pwck.8.xml:235(para) passwd.1.xml:373(para) newusers.8.xml:343(para) newgrp.1.xml:91(para) login.1.xml:276(para) grpck.8.xml:192(para) groupmod.8.xml:173(para) groupmems.8.xml:179(para) groupdel.8.xml:111(para) groupadd.8.xml:201(para) gpasswd.1.xml:245(para) chsh.1.xml:137(para) chpasswd.8.xml:224(para) chgpasswd.8.xml:186(para) chfn.1.xml:176(para) chage.1.xml:227(para)
 msgid "The following configuration variables in <filename>/etc/login.defs</filename> change the behavior of this tool:"
 msgstr ""
 
@@ -113,291 +125,299 @@
 msgid "If <replaceable>yes</replaceable>, the <citerefentry><refentrytitle>tcb</refentrytitle><manvolnum>5</manvolnum></citerefentry> password shadowing scheme will be used."
 msgstr ""
 
-#: vipw.8.xml:143(title)
+#: vipw.8.xml:159(title)
 msgid "ENVIRONMENT"
 msgstr ""
 
-#: vipw.8.xml:146(option)
+#: vipw.8.xml:162(option)
 msgid "VISUAL"
 msgstr ""
 
-#: vipw.8.xml:148(para)
+#: vipw.8.xml:164(para)
 msgid "Editor to be used."
 msgstr ""
 
-#: vipw.8.xml:152(option)
+#: vipw.8.xml:168(option)
 msgid "EDITOR"
 msgstr ""
 
-#: vipw.8.xml:154(para)
+#: vipw.8.xml:170(para)
 msgid "Editor to be used if <option>VISUAL</option> is not set."
 msgstr ""
 
-#: vipw.8.xml:161(title) usermod.8.xml:389(title) userdel.8.xml:144(title) useradd.8.xml:655(title) suauth.5.xml:168(title) su.1.xml:338(title) sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title) pwconv.8.xml:187(title) pwck.8.xml:247(title) porttime.5.xml:105(title) passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(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:170(title) lastlog.8.xml:147(title) gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title) groupmod.8.xml:164(title) groupmems.8.xml:174(title) groupdel.8.xml:89(title) groupadd.8.xml:199(title) gpasswd.1.xml:241(title) faillog.8.xml:210(title) faillog.5.xml:71(title) expiry.1.xml:68(title) chsh.1.xml:133(title) chpasswd.8.xml:223(title) chgpasswd.8.xml:184(title) chfn.1.xml:113(title) chage.1.xml:222(title)
+#: vipw.8.xml:177(title) usermod.8.xml:419(title) userdel.8.xml:160(title) useradd.8.xml:671(title) suauth.5.xml:174(title) su.1.xml:348(title) sg.1.xml:91(title) shadow.5.xml:236(title) shadow.3.xml:207(title) pwconv.8.xml:232(title) pwck.8.xml:251(title) porttime.5.xml:111(title) passwd.5.xml:122(title) passwd.1.xml:390(title) newusers.8.xml:375(title) newgrp.1.xml:102(title) logoutd.8.xml:70(title) login.access.5.xml:102(title) login.1.xml:319(title) limits.5.xml:176(title) lastlog.8.xml:166(title) gshadow.5.xml:147(title) grpck.8.xml:203(title) groups.1.xml:81(title) groupmod.8.xml:184(title) groupmems.8.xml:190(title) groupdel.8.xml:122(title) groupadd.8.xml:214(title) gpasswd.1.xml:259(title) faillog.8.xml:229(title) faillog.5.xml:77(title) expiry.1.xml:102(title) chsh.1.xml:149(title) chpasswd.8.xml:239(title) chgpasswd.8.xml:200(title) chfn.1.xml:189(title) chage.1.xml:238(title)
 msgid "FILES"
 msgstr ""
 
-#: vipw.8.xml:164(filename) usermod.8.xml:392(filename) userdel.8.xml:147(filename) useradd.8.xml:670(filename) sg.1.xml:103(filename) pwck.8.xml:250(filename) newusers.8.xml:372(filename) newgrp.1.xml:114(filename) gshadow.5.xml:144(filename) grpck.8.xml:188(filename) groups.1.xml:78(filename) groupmod.8.xml:167(filename) groupmems.8.xml:177(filename) groupdel.8.xml:92(filename) groupadd.8.xml:202(filename) gpasswd.1.xml:50(filename) gpasswd.1.xml:53(filename) gpasswd.1.xml:244(filename) chgpasswd.8.xml:187(filename)
+#: vipw.8.xml:180(filename) usermod.8.xml:422(filename) userdel.8.xml:163(filename) useradd.8.xml:686(filename) sg.1.xml:106(filename) pwck.8.xml:254(filename) newusers.8.xml:390(filename) newgrp.1.xml:117(filename) gshadow.5.xml:150(filename) grpck.8.xml:206(filename) groups.1.xml:84(filename) groupmod.8.xml:187(filename) groupmems.8.xml:193(filename) groupdel.8.xml:125(filename) groupadd.8.xml:217(filename) gpasswd.1.xml:53(filename) gpasswd.1.xml:56(filename) gpasswd.1.xml:262(filename) chgpasswd.8.xml:203(filename)
 msgid "/etc/group"
 msgstr ""
 
-#: vipw.8.xml:166(para) usermod.8.xml:394(para) userdel.8.xml:149(para) useradd.8.xml:672(para) sg.1.xml:105(para) pwck.8.xml:252(para) newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para) grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para) groupmems.8.xml:179(para) groupdel.8.xml:94(para) groupadd.8.xml:204(para) gpasswd.1.xml:246(para) chgpasswd.8.xml:189(para)
+#: vipw.8.xml:182(para) usermod.8.xml:424(para) userdel.8.xml:165(para) useradd.8.xml:688(para) sg.1.xml:108(para) pwck.8.xml:256(para) newusers.8.xml:392(para) newgrp.1.xml:119(para) gshadow.5.xml:152(para) grpck.8.xml:208(para) groups.1.xml:86(para) groupmod.8.xml:189(para) groupmems.8.xml:195(para) groupdel.8.xml:127(para) groupadd.8.xml:219(para) gpasswd.1.xml:264(para) chgpasswd.8.xml:205(para)
 msgid "Group account information."
 msgstr ""
 
-#: vipw.8.xml:170(filename) usermod.8.xml:398(filename) useradd.8.xml:676(filename) sg.1.xml:109(filename) newusers.8.xml:378(filename) newgrp.1.xml:120(filename) gshadow.5.xml:150(filename) grpck.8.xml:194(filename) groupmod.8.xml:173(filename) groupmems.8.xml:183(filename) groupdel.8.xml:98(filename) groupadd.8.xml:208(filename) gpasswd.1.xml:54(filename) gpasswd.1.xml:250(filename) chgpasswd.8.xml:193(filename)
+#: vipw.8.xml:186(filename) usermod.8.xml:428(filename) useradd.8.xml:692(filename) sg.1.xml:112(filename) newusers.8.xml:396(filename) newgrp.1.xml:123(filename) gshadow.5.xml:156(filename) grpck.8.xml:212(filename) groupmod.8.xml:193(filename) groupmems.8.xml:199(filename) groupdel.8.xml:131(filename) groupadd.8.xml:223(filename) gpasswd.1.xml:57(filename) gpasswd.1.xml:268(filename) chgpasswd.8.xml:209(filename)
 msgid "/etc/gshadow"
 msgstr ""
 
-#: vipw.8.xml:172(para) usermod.8.xml:400(para) useradd.8.xml:678(para) sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para) gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para) groupdel.8.xml:100(para) groupadd.8.xml:210(para) gpasswd.1.xml:252(para) chgpasswd.8.xml:195(para)
+#: vipw.8.xml:188(para) usermod.8.xml:430(para) useradd.8.xml:694(para) sg.1.xml:114(para) newusers.8.xml:398(para) newgrp.1.xml:125(para) gshadow.5.xml:158(para) grpck.8.xml:214(para) groupmod.8.xml:195(para) groupdel.8.xml:133(para) groupadd.8.xml:225(para) gpasswd.1.xml:270(para) chgpasswd.8.xml:211(para)
 msgid "Secure group account information."
 msgstr ""
 
-#: vipw.8.xml:176(filename) usermod.8.xml:404(filename) userdel.8.xml:159(filename) useradd.8.xml:658(filename) su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename) pwck.8.xml:256(filename) passwd.5.xml:119(filename) passwd.1.xml:377(filename) newusers.8.xml:360(filename) newgrp.1.xml:102(filename) login.1.xml:331(filename) grpck.8.xml:200(filename) expiry.1.xml:71(filename) chsh.1.xml:136(filename) chpasswd.8.xml:226(filename) chfn.1.xml:122(filename) chage.1.xml:226(filename)
+#: vipw.8.xml:192(filename) usermod.8.xml:434(filename) userdel.8.xml:175(filename) useradd.8.xml:674(filename) su.1.xml:351(filename) sg.1.xml:94(filename) shadow.5.xml:239(filename) pwck.8.xml:260(filename) passwd.5.xml:125(filename) passwd.1.xml:393(filename) newusers.8.xml:378(filename) newgrp.1.xml:105(filename) login.1.xml:334(filename) grpck.8.xml:218(filename) groupmod.8.xml:199(filename) expiry.1.xml:105(filename) chsh.1.xml:152(filename) chpasswd.8.xml:242(filename) chfn.1.xml:198(filename) chage.1.xml:242(filename)
 msgid "/etc/passwd"
 msgstr ""
 
-#: vipw.8.xml:178(para) usermod.8.xml:406(para) userdel.8.xml:161(para) useradd.8.xml:660(para) su.1.xml:343(para) sg.1.xml:93(para) shadow.5.xml:235(para) pwck.8.xml:258(para) passwd.5.xml:121(para) passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para) login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para) chsh.1.xml:138(para) chpasswd.8.xml:228(para) chfn.1.xml:124(para) chage.1.xml:229(para)
+#: vipw.8.xml:194(para) usermod.8.xml:436(para) userdel.8.xml:177(para) useradd.8.xml:676(para) su.1.xml:353(para) sg.1.xml:96(para) shadow.5.xml:241(para) pwck.8.xml:262(para) passwd.5.xml:127(para) passwd.1.xml:395(para) newusers.8.xml:380(para) newgrp.1.xml:107(para) login.1.xml:336(para) grpck.8.xml:220(para) groupmod.8.xml:201(para) expiry.1.xml:107(para) chsh.1.xml:154(para) chpasswd.8.xml:244(para) chfn.1.xml:200(para) chage.1.xml:245(para)
 msgid "User account information."
 msgstr ""
 
-#: vipw.8.xml:182(filename) usermod.8.xml:410(filename) userdel.8.xml:165(filename) useradd.8.xml:664(filename) su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename) shadow.3.xml:204(filename) pwck.8.xml:262(filename) passwd.5.xml:125(filename) passwd.1.xml:383(filename) newusers.8.xml:366(filename) newgrp.1.xml:108(filename) login.1.xml:337(filename) expiry.1.xml:77(filename) chpasswd.8.xml:232(filename) chage.1.xml:234(filename)
+#: vipw.8.xml:198(filename) usermod.8.xml:440(filename) userdel.8.xml:181(filename) useradd.8.xml:680(filename) su.1.xml:357(filename) sg.1.xml:100(filename) shadow.5.xml:245(filename) shadow.3.xml:210(filename) pwck.8.xml:266(filename) passwd.5.xml:131(filename) passwd.1.xml:399(filename) newusers.8.xml:384(filename) newgrp.1.xml:111(filename) login.1.xml:340(filename) expiry.1.xml:111(filename) chpasswd.8.xml:248(filename) chage.1.xml:250(filename)
 msgid "/etc/shadow"
 msgstr ""
 
-#: vipw.8.xml:184(para) usermod.8.xml:412(para) userdel.8.xml:167(para) useradd.8.xml:666(para) su.1.xml:349(para) sg.1.xml:99(para) shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:264(para) passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para) login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:234(para) chage.1.xml:237(para)
+#: vipw.8.xml:200(para) usermod.8.xml:442(para) userdel.8.xml:183(para) useradd.8.xml:682(para) su.1.xml:359(para) sg.1.xml:102(para) shadow.5.xml:247(para) shadow.3.xml:212(para) pwck.8.xml:268(para) passwd.1.xml:401(para) newusers.8.xml:386(para) newgrp.1.xml:113(para) login.1.xml:342(para) expiry.1.xml:113(para) chpasswd.8.xml:250(para) chage.1.xml:253(para)
 msgid "Secure user account information."
 msgstr ""
 
-#: vipw.8.xml:191(title) usermod.8.xml:419(title) userdel.8.xml:252(title) useradd.8.xml:772(title) suauth.5.xml:197(title) su.1.xml:409(title) sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title) pwconv.8.xml:199(title) pwck.8.xml:322(title) porttime.5.xml:117(title) passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title) newusers.8.xml:399(title) newgrp.1.xml:129(title) login.defs.5.xml:504(title) login.access.5.xml:108(title) login.1.xml:376(title) limits.5.xml:180(title) gshadow.5.xml:159(title) grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title) groupmems.8.xml:192(title) groupdel.8.xml:146(title) groupadd.8.xml:290(title) gpasswd.1.xml:259(title) faillog.8.xml:222(title) faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title) chpasswd.8.xml:253(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title) chage.1.xml:277(title)
+#: vipw.8.xml:207(title) usermod.8.xml:449(title) userdel.8.xml:268(title) useradd.8.xml:788(title) suauth.5.xml:203(title) su.1.xml:419(title) sg.1.xml:121(title) shadow.5.xml:264(title) shadow.3.xml:219(title) pwconv.8.xml:244(title) pwck.8.xml:326(title) porttime.5.xml:123(title) passwd.5.xml:150(title) passwd.1.xml:471(title) nologin.8.xml:70(title) newusers.8.xml:417(title) newgrp.1.xml:132(title) login.defs.5.xml:507(title) login.access.5.xml:114(title) login.1.xml:379(title) limits.5.xml:186(title) gshadow.5.xml:165(title) grpck.8.xml:272(title) groups.1.xml:93(title) groupmod.8.xml:259(title) groupmems.8.xml:208(title) groupdel.8.xml:179(title) groupadd.8.xml:305(title) gpasswd.1.xml:277(title) faillog.8.xml:241(title) faillog.5.xml:89(title) expiry.1.xml:120(title) chsh.1.xml:173(title) chpasswd.8.xml:269(title) chgpasswd.8.xml:224(title) chfn.1.xml:207(title) chage.1.xml:293(title)
 msgid "SEE ALSO"
 msgstr ""
 
-#: vipw.8.xml:192(para)
+#: vipw.8.xml:208(para)
 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 condition=\"tcb\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry condition=\"tcb\"><refentrytitle>tcb</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: usermod.8.xml:41(refentrytitle) usermod.8.xml:46(refname) usermod.8.xml:52(command) login.defs.5.xml:468(term)
+#: usermod.8.xml:42(refentrytitle) usermod.8.xml:49(refname) usermod.8.xml:55(command) login.defs.5.xml:471(term)
 msgid "usermod"
 msgstr ""
 
-#: usermod.8.xml:47(refpurpose)
+#: usermod.8.xml:50(refpurpose)
 msgid "modify a user account"
 msgstr ""
 
-#: usermod.8.xml:56(replaceable) userdel.8.xml:56(replaceable) useradd.8.xml:66(replaceable) passwd.1.xml:60(replaceable) chsh.1.xml:56(replaceable) chage.1.xml:53(replaceable)
+#: usermod.8.xml:59(replaceable) userdel.8.xml:59(replaceable) useradd.8.xml:69(replaceable) passwd.1.xml:63(replaceable) chsh.1.xml:59(replaceable) chfn.1.xml:59(replaceable) chage.1.xml:56(replaceable)
 msgid "LOGIN"
 msgstr ""
 
-#: usermod.8.xml:62(para)
+#: usermod.8.xml:65(para)
 msgid "The <command>usermod</command> command modifies the system account files to reflect the changes that are specified on the command line."
 msgstr ""
 
-#: usermod.8.xml:70(para)
+#: usermod.8.xml:73(para)
 msgid "The options which apply to the <command>usermod</command> command are:"
 msgstr ""
 
-#: usermod.8.xml:76(term)
+#: usermod.8.xml:79(term)
 msgid "<option>-a</option>, <option>--append</option>"
 msgstr ""
 
-#: usermod.8.xml:80(para)
+#: usermod.8.xml:83(para)
 msgid "Add the user to the supplementary group(s). Use only with the <option>-G</option> option."
 msgstr ""
 
-#: usermod.8.xml:87(term) useradd.8.xml:128(term)
+#: usermod.8.xml:90(term) useradd.8.xml:131(term)
 msgid "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</replaceable>"
 msgstr ""
 
-#: usermod.8.xml:92(para)
+#: usermod.8.xml:95(para)
 msgid "The new value of the user's password file comment field. It is normally modified using the <citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></citerefentry> utility."
 msgstr ""
 
-#: usermod.8.xml:101(term) useradd.8.xml:141(term)
+#: usermod.8.xml:104(term) useradd.8.xml:144(term)
 msgid "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</replaceable>"
 msgstr ""
 
-#: usermod.8.xml:106(para)
+#: usermod.8.xml:109(para)
 msgid "The user's new login directory."
 msgstr ""
 
-#: usermod.8.xml:109(para)
+#: usermod.8.xml:112(para)
 msgid "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:118(term) useradd.8.xml:168(term) useradd.8.xml:526(term)
+#: usermod.8.xml:121(term) useradd.8.xml:171(term) useradd.8.xml:542(term)
 msgid "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</replaceable>"
 msgstr ""
 
-#: usermod.8.xml:123(para) useradd.8.xml:173(para)
+#: usermod.8.xml:126(para) useradd.8.xml:176(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:130(term) useradd.8.xml:186(term) useradd.8.xml:539(term)
+#: usermod.8.xml:130(para)
+msgid "An empty <replaceable>EXPIRE_DATE</replaceable> argument will disable the expiration of the account."
+msgstr ""
+
+#: usermod.8.xml:134(para) usermod.8.xml:156(para)
+msgid "This option requires a <filename>/etc/shadow</filename> file. A <filename>/etc/shadow</filename> entry will be created if there were none."
+msgstr ""
+
+#: usermod.8.xml:142(term) useradd.8.xml:189(term) useradd.8.xml:555(term)
 msgid "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</replaceable>"
 msgstr ""
 
-#: usermod.8.xml:135(para)
+#: usermod.8.xml:147(para)
 msgid "The number of days after a password expires until the account is permanently disabled."
 msgstr ""
 
-#: usermod.8.xml:139(para)
+#: usermod.8.xml:151(para)
 msgid "A value of 0 disables the account as soon as the password has expired, and a value of -1 disables the feature."
 msgstr ""
 
-#: usermod.8.xml:147(term) useradd.8.xml:206(term) useradd.8.xml:555(term)
+#: usermod.8.xml:164(term) useradd.8.xml:209(term) useradd.8.xml:571(term)
 msgid "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
 
-#: usermod.8.xml:152(para)
+#: usermod.8.xml:169(para)
 msgid "The group name or number of the user's new initial login group. The group must exist."
 msgstr ""
 
-#: usermod.8.xml:156(para)
+#: usermod.8.xml:173(para)
 msgid "Any file from the user's home directory owned by the previous primary group of the user will be owned by this new group."
 msgstr ""
 
-#: usermod.8.xml:160(para)
+#: usermod.8.xml:177(para)
 msgid "The group ownership of files outside of the user's home directory must be fixed manually."
 msgstr ""
 
-#: usermod.8.xml:167(term) useradd.8.xml:234(term)
+#: usermod.8.xml:184(term) useradd.8.xml:237(term)
 msgid "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I\">,GROUPN</emphasis>]]]"
 msgstr ""
 
-#: usermod.8.xml:172(para)
+#: usermod.8.xml:189(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."
 msgstr ""
 
-#: usermod.8.xml:179(para)
+#: usermod.8.xml:196(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:188(term)
+#: usermod.8.xml:205(term)
 msgid "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</replaceable>"
 msgstr ""
 
-#: usermod.8.xml:193(para)
-msgid "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."
+#: usermod.8.xml:210(para)
+msgid "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 or mail spool should probably be renamed manually to reflect the new login name."
 msgstr ""
 
-#: usermod.8.xml:203(term)
+#: usermod.8.xml:220(term)
 msgid "<option>-L</option>, <option>--lock</option>"
 msgstr ""
 
-#: usermod.8.xml:207(para)
+#: usermod.8.xml:224(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:213(para)
+#: usermod.8.xml:230(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:222(term)
+#: usermod.8.xml:239(term)
 msgid "<option>-m</option>, <option>--move-home</option>"
 msgstr ""
 
-#: usermod.8.xml:226(para)
+#: usermod.8.xml:243(para)
 msgid "Move the content of the user's home directory to the new location."
 msgstr ""
 
-#: usermod.8.xml:230(para)
+#: usermod.8.xml:247(para)
 msgid "This option is only valid in combination with the <option>-d</option> (or <option>--home</option>) option."
 msgstr ""
 
-#: usermod.8.xml:234(para)
+#: usermod.8.xml:251(para)
 msgid "<command>usermod</command> will try to adapt the ownership of the files and to copy the modes, ACL and extended attributes, but manual changes might be needed afterwards."
 msgstr ""
 
-#: usermod.8.xml:242(term) useradd.8.xml:374(term) groupmod.8.xml:116(term) groupadd.8.xml:134(term)
+#: usermod.8.xml:259(term) useradd.8.xml:377(term) groupmod.8.xml:123(term) groupadd.8.xml:136(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr ""
 
-#: usermod.8.xml:246(para)
+#: usermod.8.xml:263(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:253(term) useradd.8.xml:386(term) groupmod.8.xml:127(term) groupadd.8.xml:144(term)
+#: usermod.8.xml:270(term) useradd.8.xml:389(term) groupmod.8.xml:134(term) groupadd.8.xml:146(term)
 msgid "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</replaceable>"
 msgstr ""
 
-#: usermod.8.xml:258(para) groupmod.8.xml:132(para)
+#: usermod.8.xml:275(para) groupmod.8.xml:139(para)
 msgid "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></citerefentry>."
 msgstr ""
 
-#: usermod.8.xml:263(para) useradd.8.xml:396(para) groupmod.8.xml:137(para) groupadd.8.xml:154(para)
+#: usermod.8.xml:280(para) useradd.8.xml:399(para) groupmod.8.xml:144(para) groupadd.8.xml:156(para)
 msgid "<emphasis role=\"bold\">Note:</emphasis> This option is not recommended because the password (or encrypted password) will be visible by users listing the processes."
 msgstr ""
 
-#: usermod.8.xml:268(para)
+#: usermod.8.xml:285(para)
 msgid "The password will be written in the local <filename>/etc/passwd</filename> or <filename>/etc/shadow</filename> file. This might differ from the password database configured in your PAM configuration."
 msgstr ""
 
-#: usermod.8.xml:274(para) useradd.8.xml:401(para) groupmod.8.xml:142(para) groupadd.8.xml:159(para)
+#: usermod.8.xml:291(para) useradd.8.xml:404(para) groupmod.8.xml:149(para) groupadd.8.xml:161(para)
 msgid "You should make sure the password respects the system's password policy."
 msgstr ""
 
-#: usermod.8.xml:281(term) useradd.8.xml:435(term) useradd.8.xml:576(term) su.1.xml:157(term) chsh.1.xml:85(term)
+#: usermod.8.xml:311(term) useradd.8.xml:451(term) useradd.8.xml:592(term) su.1.xml:167(term) chsh.1.xml:101(term)
 msgid "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 
-#: usermod.8.xml:286(para) chsh.1.xml:89(para)
+#: usermod.8.xml:316(para) chsh.1.xml:105(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:293(term) useradd.8.xml:450(term)
+#: usermod.8.xml:323(term) useradd.8.xml:466(term)
 msgid "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 
-#: usermod.8.xml:298(para)
+#: usermod.8.xml:328(para)
 msgid "The new numerical value of the user's ID."
 msgstr ""
 
-#: usermod.8.xml:301(para)
+#: usermod.8.xml:331(para)
 msgid "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:307(para)
+#: usermod.8.xml:337(para)
 msgid "The user's mailbox, and any files which the user owns and which are located in the user's home directory will have the file user ID changed automatically."
 msgstr ""
 
-#: usermod.8.xml:312(para)
+#: usermod.8.xml:342(para)
 msgid "The ownership of files outside of the user's home directory must be fixed manually."
 msgstr ""
 
-#: usermod.8.xml:319(term)
+#: usermod.8.xml:349(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr ""
 
-#: usermod.8.xml:323(para)
+#: usermod.8.xml:353(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:328(para)
+#: usermod.8.xml:358(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 to <replaceable>99999</replaceable>, or to the <option>EXPIRE</option> value from <filename>/etc/default/useradd</filename>)."
 msgstr ""
 
-#: usermod.8.xml:339(term) useradd.8.xml:482(term)
+#: usermod.8.xml:369(term) useradd.8.xml:498(term)
 msgid "<option>-Z</option>, <option>--selinux-user</option><replaceable>SEUSER</replaceable>"
 msgstr ""
 
-#: usermod.8.xml:344(para)
+#: usermod.8.xml:374(para)
 msgid "The SELinux user for the user's login. The default is to leave this field the blank, which causes the system to select the default SELinux user."
 msgstr ""
 
-#: usermod.8.xml:355(title) userdel.8.xml:225(title) useradd.8.xml:605(title) su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title) newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title) groupdel.8.xml:65(title) groupadd.8.xml:223(title) gpasswd.1.xml:214(title) faillog.8.xml:199(title) chpasswd.8.xml:199(title) chgpasswd.8.xml:157(title)
+#: usermod.8.xml:385(title) userdel.8.xml:241(title) useradd.8.xml:621(title) su.1.xml:312(title) shadow.3.xml:199(title) passwd.1.xml:354(title) newusers.8.xml:330(title) login.1.xml:241(title) lastlog.8.xml:178(title) groupdel.8.xml:98(title) groupadd.8.xml:238(title) gpasswd.1.xml:232(title) faillog.8.xml:218(title) chpasswd.8.xml:215(title) chgpasswd.8.xml:173(title)
 msgid "CAVEATS"
 msgstr ""
 
-#: usermod.8.xml:356(para)
+#: usermod.8.xml:386(para)
 msgid "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, the user's name, or the user's home directory is being changed. <command>usermod</command> checks this on Linux, but only check if the user is logged in according to utmp on other architectures."
 msgstr ""
 
-#: usermod.8.xml:364(para)
+#: usermod.8.xml:394(para)
 msgid "You must change the owner of any <command>crontab</command> files or <command>at</command> jobs manually."
 msgstr ""
 
-#: usermod.8.xml:368(para)
+#: usermod.8.xml:398(para)
 msgid "You must make any changes involving NIS on the NIS server."
 msgstr ""
 
@@ -465,47 +485,47 @@
 msgid "If <replaceable>yes</replaceable>, the location of the user tcb directory to be created will not be automatically set to /etc/tcb/user, but will be computed depending on the UID of the user, according to the following algorithm: <placeholder-1/>"
 msgstr ""
 
-#: usermod.8.xml:420(para)
+#: usermod.8.xml:450(para)
 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>."
 msgstr ""
 
-#: userdel.8.xml:43(refentrytitle) userdel.8.xml:48(refname) userdel.8.xml:53(command) login.defs.5.xml:458(term)
+#: userdel.8.xml:44(refentrytitle) userdel.8.xml:51(refname) userdel.8.xml:56(command) login.defs.5.xml:461(term)
 msgid "userdel"
 msgstr ""
 
-#: userdel.8.xml:49(refpurpose)
+#: userdel.8.xml:52(refpurpose)
 msgid "delete a user account and related files"
 msgstr ""
 
-#: userdel.8.xml:63(para)
+#: userdel.8.xml:66(para)
 msgid "The <command>userdel</command> command modifies the system account files, deleting all entries that refer to the user name <emphasis remap=\"I\">LOGIN</emphasis>. The named user must exist."
 msgstr ""
 
-#: userdel.8.xml:72(para)
+#: userdel.8.xml:75(para)
 msgid "The options which apply to the <command>userdel</command> command are:"
 msgstr ""
 
-#: userdel.8.xml:77(term) groupadd.8.xml:79(term)
+#: userdel.8.xml:80(term) groupadd.8.xml:81(term) expiry.1.xml:84(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr ""
 
-#: userdel.8.xml:81(para)
+#: userdel.8.xml:84(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 user's home directory and mail spool, even if another user uses the same home directory or if the mail spool is not owned by the specified user. If <option>USERGROUPS_ENAB</option> is defined to <emphasis remap=\"I\">yes</emphasis> in <filename>/etc/login.defs</filename> and if a group exists with the same name as the deleted user, then this group will be removed, even if it is still the primary group of another user."
 msgstr ""
 
-#: userdel.8.xml:94(para)
+#: userdel.8.xml:97(para)
 msgid "<emphasis>Note:</emphasis> This option is dangerous and may leave your system in an inconsistent state."
 msgstr ""
 
-#: userdel.8.xml:107(term)
+#: userdel.8.xml:110(term)
 msgid "<option>-r</option>, <option>--remove</option>"
 msgstr ""
 
-#: userdel.8.xml:111(para)
+#: userdel.8.xml:114(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:117(para)
+#: userdel.8.xml:120(para)
 msgid "The mail spool is defined by the <option>MAIL_DIR</option> variable in the <filename>login.defs</filename> file."
 msgstr ""
 
@@ -542,359 +562,359 @@
 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:153(filename) useradd.8.xml:694(filename) su.1.xml:353(filename) pwconv.8.xml:190(filename) passwd.1.xml:389(filename) newusers.8.xml:384(filename) login.access.5.xml:99(filename) login.1.xml:367(filename) groupadd.8.xml:214(filename) chsh.1.xml:148(filename) chpasswd.8.xml:238(filename) chgpasswd.8.xml:199(filename) chfn.1.xml:116(filename)
+#: userdel.8.xml:169(filename) useradd.8.xml:710(filename) su.1.xml:363(filename) pwconv.8.xml:235(filename) passwd.1.xml:405(filename) newusers.8.xml:402(filename) login.access.5.xml:105(filename) login.1.xml:370(filename) groupadd.8.xml:229(filename) chsh.1.xml:164(filename) chpasswd.8.xml:254(filename) chgpasswd.8.xml:215(filename) chfn.1.xml:192(filename)
 msgid "/etc/login.defs"
 msgstr ""
 
-#: userdel.8.xml:155(para) useradd.8.xml:696(para) su.1.xml:355(para) pwconv.8.xml:192(para) passwd.1.xml:391(para) newusers.8.xml:386(para) login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:216(para) chsh.1.xml:150(para) chpasswd.8.xml:240(para) chgpasswd.8.xml:201(para) chfn.1.xml:118(para)
+#: userdel.8.xml:171(para) useradd.8.xml:712(para) su.1.xml:365(para) pwconv.8.xml:237(para) passwd.1.xml:407(para) newusers.8.xml:404(para) login.access.5.xml:107(para) login.1.xml:372(para) groupadd.8.xml:231(para) chsh.1.xml:166(para) chpasswd.8.xml:256(para) chgpasswd.8.xml:217(para) chfn.1.xml:194(para)
 msgid "Shadow password suite configuration."
 msgstr ""
 
-#: userdel.8.xml:174(title) useradd.8.xml:703(title) su.1.xml:362(title) pwck.8.xml:271(title) passwd.1.xml:404(title) grpck.8.xml:209(title) groupmod.8.xml:182(title) groupdel.8.xml:107(title) groupadd.8.xml:245(title) chage.1.xml:244(title)
+#: userdel.8.xml:190(title) useradd.8.xml:719(title) su.1.xml:372(title) pwck.8.xml:275(title) passwd.1.xml:420(title) grpck.8.xml:227(title) groupmod.8.xml:208(title) groupdel.8.xml:140(title) groupadd.8.xml:260(title) chage.1.xml:260(title)
 msgid "EXIT VALUES"
 msgstr ""
 
-#: userdel.8.xml:179(replaceable) useradd.8.xml:708(replaceable) su.1.xml:381(replaceable) pwck.8.xml:276(replaceable) passwd.1.xml:409(replaceable) grpck.8.xml:214(replaceable) groupmod.8.xml:187(replaceable) groupdel.8.xml:112(replaceable) groupadd.8.xml:250(replaceable) chage.1.xml:249(replaceable)
+#: userdel.8.xml:195(replaceable) useradd.8.xml:724(replaceable) su.1.xml:391(replaceable) pwck.8.xml:280(replaceable) passwd.1.xml:425(replaceable) grpck.8.xml:232(replaceable) groupmod.8.xml:213(replaceable) groupdel.8.xml:145(replaceable) groupadd.8.xml:265(replaceable) chage.1.xml:265(replaceable)
 msgid "0"
 msgstr ""
 
-#: userdel.8.xml:181(para) useradd.8.xml:710(para) pwck.8.xml:278(para) passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para) groupdel.8.xml:114(para) groupadd.8.xml:252(para) chage.1.xml:251(para)
+#: userdel.8.xml:197(para) useradd.8.xml:726(para) pwck.8.xml:282(para) passwd.1.xml:427(para) grpck.8.xml:234(para) groupmod.8.xml:215(para) groupdel.8.xml:147(para) groupadd.8.xml:267(para) chage.1.xml:267(para)
 msgid "success"
 msgstr ""
 
-#: userdel.8.xml:185(replaceable) useradd.8.xml:714(replaceable) su.1.xml:55(manvolnum) su.1.xml:387(replaceable) sg.1.xml:39(manvolnum) pwck.8.xml:282(replaceable) passwd.1.xml:45(manvolnum) passwd.1.xml:415(replaceable) newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum) grpck.8.xml:220(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:39(manvolnum) chage.1.xml:255(replaceable)
+#: userdel.8.xml:201(replaceable) useradd.8.xml:730(replaceable) su.1.xml:56(manvolnum) su.1.xml:397(replaceable) sg.1.xml:40(manvolnum) pwck.8.xml:286(replaceable) passwd.1.xml:46(manvolnum) passwd.1.xml:431(replaceable) newgrp.1.xml:40(manvolnum) login.1.xml:72(manvolnum) grpck.8.xml:238(replaceable) groups.1.xml:39(manvolnum) gpasswd.1.xml:44(manvolnum) expiry.1.xml:43(manvolnum) chsh.1.xml:42(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:40(manvolnum) chage.1.xml:271(replaceable)
 msgid "1"
 msgstr ""
 
-#: userdel.8.xml:187(para) useradd.8.xml:716(para)
+#: userdel.8.xml:203(para) useradd.8.xml:732(para)
 msgid "can't update password file"
 msgstr ""
 
-#: userdel.8.xml:191(replaceable) useradd.8.xml:720(replaceable) pwck.8.xml:288(replaceable) passwd.1.xml:421(replaceable) grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable) groupdel.8.xml:118(replaceable) groupadd.8.xml:256(replaceable) chage.1.xml:261(replaceable)
+#: userdel.8.xml:207(replaceable) useradd.8.xml:736(replaceable) pwck.8.xml:292(replaceable) passwd.1.xml:437(replaceable) grpck.8.xml:244(replaceable) groupmod.8.xml:219(replaceable) groupdel.8.xml:151(replaceable) groupadd.8.xml:271(replaceable) chage.1.xml:277(replaceable)
 msgid "2"
 msgstr ""
 
-#: userdel.8.xml:193(para) useradd.8.xml:722(para) pwck.8.xml:284(para) grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para) groupadd.8.xml:258(para) chage.1.xml:263(para)
+#: userdel.8.xml:209(para) useradd.8.xml:738(para) pwck.8.xml:288(para) grpck.8.xml:240(para) groupmod.8.xml:221(para) groupdel.8.xml:153(para) groupadd.8.xml:273(para) chage.1.xml:279(para)
 msgid "invalid command syntax"
 msgstr ""
 
-#: userdel.8.xml:197(replaceable) useradd.8.xml:738(replaceable) pwck.8.xml:312(replaceable) passwd.1.xml:445(replaceable) groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
+#: userdel.8.xml:213(replaceable) useradd.8.xml:754(replaceable) pwck.8.xml:316(replaceable) passwd.1.xml:461(replaceable) groupmod.8.xml:237(replaceable) groupdel.8.xml:157(replaceable)
 msgid "6"
 msgstr ""
 
-#: userdel.8.xml:199(para)
+#: userdel.8.xml:215(para)
 msgid "specified user doesn't exist"
 msgstr ""
 
-#: userdel.8.xml:205(para)
+#: userdel.8.xml:221(para)
 msgid "user currently logged in"
 msgstr ""
 
-#: userdel.8.xml:209(replaceable) useradd.8.xml:750(replaceable) groupmod.8.xml:223(replaceable) groupdel.8.xml:136(replaceable) groupadd.8.xml:280(replaceable)
+#: userdel.8.xml:225(replaceable) useradd.8.xml:766(replaceable) groupmod.8.xml:249(replaceable) groupdel.8.xml:169(replaceable) groupadd.8.xml:295(replaceable)
 msgid "10"
 msgstr ""
 
-#: userdel.8.xml:211(para) useradd.8.xml:752(para) groupmod.8.xml:225(para) groupdel.8.xml:138(para) groupadd.8.xml:282(para)
+#: userdel.8.xml:227(para) useradd.8.xml:768(para) groupmod.8.xml:251(para) groupdel.8.xml:171(para) groupadd.8.xml:297(para)
 msgid "can't update group file"
 msgstr ""
 
-#: userdel.8.xml:215(replaceable) useradd.8.xml:756(replaceable)
+#: userdel.8.xml:231(replaceable) useradd.8.xml:772(replaceable)
 msgid "12"
 msgstr ""
 
-#: userdel.8.xml:217(para)
+#: userdel.8.xml:233(para)
 msgid "can't remove home directory"
 msgstr ""
 
-#: userdel.8.xml:175(para)
+#: userdel.8.xml:191(para)
 msgid "The <command>userdel</command> command exits with the following values: <placeholder-1/>"
 msgstr ""
 
-#: userdel.8.xml:226(para)
+#: userdel.8.xml:242(para)
 msgid "<command>userdel</command> will not allow you to remove an account if there are running processes which belong to this account. In that case, you may have to kill those processes or lock the user's password or account and remove the account later. The <option>-f</option> option can force the deletion of this account."
 msgstr ""
 
-#: userdel.8.xml:233(para)
+#: userdel.8.xml:249(para)
 msgid "You should manually check all file systems to ensure that no files remain owned by this user."
 msgstr ""
 
-#: userdel.8.xml:237(para)
+#: userdel.8.xml:253(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:240(para)
+#: userdel.8.xml:256(para)
 msgid "If <option>USERGROUPS_ENAB</option> is defined to <emphasis remap=\"I\">yes</emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</command> will delete the group with the same name as the user. To avoid inconsistencies in the passwd and group databases, <command>userdel</command> will check that this group is not used as a primary group for another user, and will just warn without deleting the group otherwise. The <option>-f</option> option can force the deletion of this group."
 msgstr ""
 
-#: userdel.8.xml:253(para)
+#: userdel.8.xml:269(para)
 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>login.defs</refentrytitle><manvolnum>5</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>useradd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
-#: useradd.8.xml:52(refentrytitle) useradd.8.xml:57(refname) useradd.8.xml:62(command) useradd.8.xml:69(command) useradd.8.xml:73(command) login.defs.5.xml:444(term)
+#: useradd.8.xml:53(refentrytitle) useradd.8.xml:60(refname) useradd.8.xml:65(command) useradd.8.xml:72(command) useradd.8.xml:76(command) login.defs.5.xml:447(term)
 msgid "useradd"
 msgstr ""
 
-#: useradd.8.xml:58(refpurpose)
+#: useradd.8.xml:61(refpurpose)
 msgid "create a new user or update default new user information"
 msgstr ""
 
-#: useradd.8.xml:70(arg) useradd.8.xml:74(arg)
+#: useradd.8.xml:73(arg) useradd.8.xml:77(arg)
 msgid "-D"
 msgstr ""
 
-#: useradd.8.xml:83(para)
+#: useradd.8.xml:86(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 the command line plus the default values from the system. Depending on command line options, the <command>useradd</command> command will update system files and may also create the new user's home directory and copy initial files."
 msgstr ""
 
-#: useradd.8.xml:92(para)
+#: useradd.8.xml:95(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:101(para)
+#: useradd.8.xml:104(para)
 msgid "The options which apply to the <command>useradd</command> command are:"
 msgstr ""
 
-#: useradd.8.xml:105(term) useradd.8.xml:507(term)
+#: useradd.8.xml:108(term) useradd.8.xml:523(term)
 msgid "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</replaceable>"
 msgstr ""
 
-#: useradd.8.xml:110(para)
+#: useradd.8.xml:113(para)
 msgid "The default base directory for the system if <option>-d</option><replaceable>HOME_DIR</replaceable> is not specified. <replaceable>BASE_DIR</replaceable> is concatenated with the account name to define the home directory. If the <option>-m</option> option is not used, <replaceable>BASE_DIR</replaceable> must exist."
 msgstr ""
 
-#: useradd.8.xml:118(para)
+#: useradd.8.xml:121(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:133(para)
+#: useradd.8.xml:136(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:146(para)
+#: useradd.8.xml:149(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 <replaceable>LOGIN</replaceable> name to <replaceable>BASE_DIR</replaceable> and use that as the login directory name. The directory <replaceable>HOME_DIR</replaceable> does not have to exist but will not be created if it is missing."
 msgstr ""
 
-#: useradd.8.xml:158(term)
+#: useradd.8.xml:161(term)
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr ""
 
-#: useradd.8.xml:162(para)
+#: useradd.8.xml:165(para)
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr ""
 
-#: useradd.8.xml:177(para)
+#: useradd.8.xml:180(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:191(para)
+#: useradd.8.xml:194(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:197(para)
+#: useradd.8.xml:200(para)
 msgid "If not specified, <command>useradd</command> will use the default inactivity period specified by the <option>INACTIVE</option> variable in <filename>/etc/default/useradd</filename>, or -1 by default."
 msgstr ""
 
-#: useradd.8.xml:211(para)
+#: useradd.8.xml:214(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."
 msgstr ""
 
-#: useradd.8.xml:216(para)
+#: useradd.8.xml:219(para)
 msgid "If not specified, the behavior 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:239(para)
+#: useradd.8.xml:242(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. The default is for the user to belong only to the initial group."
 msgstr ""
 
-#: useradd.8.xml:256(term)
+#: useradd.8.xml:259(term)
 msgid "<option>-k</option>, <option>--skel</option><replaceable>SKEL_DIR</replaceable>"
 msgstr ""
 
-#: useradd.8.xml:261(para)
+#: useradd.8.xml:264(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:266(para)
+#: useradd.8.xml:269(para)
 msgid "This option is only valid if the <option>-m</option> (or <option>--create-home</option>) option is specified."
 msgstr ""
 
-#: useradd.8.xml:270(para)
+#: useradd.8.xml:273(para)
 msgid "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:276(para)
+#: useradd.8.xml:279(para)
 msgid "If possible, the ACLs and extended attributes are copied."
 msgstr ""
 
-#: useradd.8.xml:282(term) groupadd.8.xml:113(term)
+#: useradd.8.xml:285(term) groupadd.8.xml:115(term)
 msgid "<option>-K</option>, <option>--key</option><replaceable>KEY</replaceable>=<replaceable>VALUE</replaceable>"
 msgstr ""
 
-#: useradd.8.xml:287(para)
+#: useradd.8.xml:290(para)
 msgid "Overrides <filename>/etc/login.defs</filename> defaults (<option>UID_MIN</option>, <option>UID_MAX</option>, <option>UMASK</option>, <option>PASS_MAX_DAYS</option> 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>"
 msgstr ""
 
-#: useradd.8.xml:311(term)
+#: useradd.8.xml:314(term)
 msgid "<option>-l</option>, <option>--no-log-init</option>"
 msgstr ""
 
-#: useradd.8.xml:313(para)
+#: useradd.8.xml:316(para)
 msgid "Do not add the user to the lastlog and faillog databases."
 msgstr ""
 
-#: useradd.8.xml:316(para)
+#: useradd.8.xml:319(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:324(term)
+#: useradd.8.xml:327(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr ""
 
-#: useradd.8.xml:328(para)
+#: useradd.8.xml:331(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:334(para)
+#: useradd.8.xml:337(para)
 msgid "By default, if this option is not specified and <option>CREATE_HOME</option> is not enabled, no home directories are created."
 msgstr ""
 
-#: useradd.8.xml:343(option)
+#: useradd.8.xml:346(option)
 msgid "-M"
 msgstr ""
 
-#: useradd.8.xml:346(para)
+#: useradd.8.xml:349(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:355(term)
+#: useradd.8.xml:358(term)
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr ""
 
-#: useradd.8.xml:359(para)
+#: useradd.8.xml:362(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 <option>GROUP</option> variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:365(para) useradd.8.xml:473(para)
+#: useradd.8.xml:368(para) useradd.8.xml:489(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>/etc/login.defs</filename>."
 msgstr ""
 
-#: useradd.8.xml:378(para)
+#: useradd.8.xml:381(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr ""
 
-#: useradd.8.xml:379(para)
+#: useradd.8.xml:382(para)
 msgid "This option is only valid in combination with the <option>-u</option> option."
 msgstr ""
 
-#: useradd.8.xml:391(para) groupadd.8.xml:149(para)
+#: useradd.8.xml:394(para) groupadd.8.xml:151(para)
 msgid "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to disable the password."
 msgstr ""
 
-#: useradd.8.xml:408(term) newusers.8.xml:263(term) groupadd.8.xml:166(term)
+#: useradd.8.xml:411(term) newusers.8.xml:268(term) groupadd.8.xml:168(term)
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr ""
 
-#: useradd.8.xml:412(para) newusers.8.xml:267(para)
+#: useradd.8.xml:415(para) newusers.8.xml:272(para)
 msgid "Create a system account."
 msgstr ""
 
-#: useradd.8.xml:415(para)
+#: useradd.8.xml:418(para)
 msgid "System users will be created with no aging information in <filename>/etc/shadow</filename>, and their numeric identifiers are chosen in the <option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in <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:424(para)
+#: useradd.8.xml:427(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:440(para)
+#: useradd.8.xml:456(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 specified by the <option>SHELL</option> variable in <filename>/etc/default/useradd</filename>, or an empty string by default."
 msgstr ""
 
-#: useradd.8.xml:455(para)
+#: useradd.8.xml:471(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 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."
 msgstr ""
 
-#: useradd.8.xml:465(term)
+#: useradd.8.xml:481(term)
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr ""
 
-#: useradd.8.xml:469(para)
+#: useradd.8.xml:485(para)
 msgid "Create a group with the same name as the user, and add the user to this group."
 msgstr ""
 
-#: useradd.8.xml:487(para)
+#: useradd.8.xml:503(para)
 msgid "The SELinux user for the user's login. The default is to leave this field blank, which causes the system to select the default SELinux user."
 msgstr ""
 
-#: useradd.8.xml:497(title)
+#: useradd.8.xml:513(title)
 msgid "Changing the default values"
 msgstr ""
 
-#: useradd.8.xml:498(para)
+#: useradd.8.xml:514(para)
 msgid "When invoked with only the <option>-D</option> option, <command>useradd</command> will display the current default values. When invoked with <option>-D</option> plus other options, <command>useradd</command> will update the default values for the specified options. Valid default-changing options are:"
 msgstr ""
 
-#: useradd.8.xml:512(para)
+#: useradd.8.xml:528(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 user's home directory name, if the <option>-d</option> option is not used when creating a new account."
 msgstr ""
 
-#: useradd.8.xml:519(para)
+#: useradd.8.xml:535(para)
 msgid "This option sets the <option>HOME</option> variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:531(para)
+#: useradd.8.xml:547(para)
 msgid "The date on which the user account is disabled."
 msgstr ""
 
-#: useradd.8.xml:532(para)
+#: useradd.8.xml:548(para)
 msgid "This option sets the <option>EXPIRE</option> variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:544(para)
+#: useradd.8.xml:560(para)
 msgid "The number of days after a password has expired before the account will be disabled."
 msgstr ""
 
-#: useradd.8.xml:548(para)
+#: useradd.8.xml:564(para)
 msgid "This option sets the <option>INACTIVE</option> variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:560(para)
+#: useradd.8.xml:576(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:569(para)
+#: useradd.8.xml:585(para)
 msgid "This option sets the <option>GROUP</option> variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:581(para)
+#: useradd.8.xml:597(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
-#: useradd.8.xml:584(para)
+#: useradd.8.xml:600(para)
 msgid "This option sets the <option>SHELL</option> variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:596(title)
+#: useradd.8.xml:612(title)
 msgid "NOTES"
 msgstr ""
 
-#: useradd.8.xml:597(para)
+#: useradd.8.xml:613(para)
 msgid "The system administrator is responsible for placing the default user files 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:606(para)
+#: useradd.8.xml:622(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:611(para)
+#: useradd.8.xml:627(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:617(para)
+#: useradd.8.xml:633(para)
 msgid "Usernames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes. They can end with a dollar sign. In regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 
-#: useradd.8.xml:623(para)
+#: useradd.8.xml:639(para)
 msgid "Usernames may only be up to 32 characters long."
 msgstr ""
 
@@ -1010,332 +1030,336 @@
 msgid "It is also used by <command>pam_umask</command> as the default umask value."
 msgstr ""
 
-#: useradd.8.xml:682(filename)
+#: useradd.8.xml:698(filename)
 msgid "/etc/default/useradd"
 msgstr ""
 
-#: useradd.8.xml:684(para)
+#: useradd.8.xml:700(para)
 msgid "Default values for account creation."
 msgstr ""
 
-#: useradd.8.xml:688(filename)
+#: useradd.8.xml:704(filename)
 msgid "/etc/skel/"
 msgstr ""
 
-#: useradd.8.xml:690(para)
+#: useradd.8.xml:706(para)
 msgid "Directory containing default files."
 msgstr ""
 
-#: useradd.8.xml:726(replaceable) shadow.3.xml:35(manvolnum) pwck.8.xml:294(replaceable) passwd.1.xml:427(replaceable) grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable) groupadd.8.xml:262(replaceable)
+#: useradd.8.xml:742(replaceable) shadow.3.xml:39(manvolnum) pwck.8.xml:298(replaceable) passwd.1.xml:443(replaceable) grpck.8.xml:250(replaceable) groupmod.8.xml:225(replaceable) groupadd.8.xml:277(replaceable)
 msgid "3"
 msgstr ""
 
-#: useradd.8.xml:728(para) passwd.1.xml:447(para) groupmod.8.xml:201(para) groupadd.8.xml:264(para)
+#: useradd.8.xml:744(para) passwd.1.xml:463(para) groupmod.8.xml:227(para) groupadd.8.xml:279(para)
 msgid "invalid argument to option"
 msgstr ""
 
-#: useradd.8.xml:732(replaceable) pwck.8.xml:300(replaceable) passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable) groupmod.8.xml:205(replaceable) groupadd.8.xml:268(replaceable)
+#: useradd.8.xml:748(replaceable) pwck.8.xml:304(replaceable) passwd.1.xml:449(replaceable) grpck.8.xml:256(replaceable) groupmod.8.xml:231(replaceable) groupadd.8.xml:283(replaceable)
 msgid "4"
 msgstr ""
 
-#: useradd.8.xml:734(para)
+#: useradd.8.xml:750(para)
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr ""
 
-#: useradd.8.xml:740(para) groupmod.8.xml:207(para) groupmod.8.xml:213(para) groupdel.8.xml:126(para)
+#: useradd.8.xml:756(para) groupmod.8.xml:233(para) groupmod.8.xml:239(para) groupdel.8.xml:159(para)
 msgid "specified group doesn't exist"
 msgstr ""
 
-#: useradd.8.xml:744(replaceable) groupmod.8.xml:217(replaceable) groupadd.8.xml:274(replaceable)
+#: useradd.8.xml:760(replaceable) groupmod.8.xml:243(replaceable) groupadd.8.xml:289(replaceable)
 msgid "9"
 msgstr ""
 
-#: useradd.8.xml:746(para)
+#: useradd.8.xml:762(para)
 msgid "username already in use"
 msgstr ""
 
-#: useradd.8.xml:758(para)
+#: useradd.8.xml:774(para)
 msgid "can't create home directory"
 msgstr ""
 
-#: useradd.8.xml:762(replaceable)
+#: useradd.8.xml:778(replaceable)
 msgid "13"
 msgstr ""
 
-#: useradd.8.xml:764(para)
+#: useradd.8.xml:780(para)
 msgid "can't create mail spool"
 msgstr ""
 
-#: useradd.8.xml:704(para)
+#: useradd.8.xml:720(para)
 msgid "The <command>useradd</command> command exits with the following values: <placeholder-1/>"
 msgstr ""
 
-#: useradd.8.xml:773(para)
+#: useradd.8.xml:789(para)
 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>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>newusers</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
-#: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
+#: suauth.5.xml:38(refentrytitle) suauth.5.xml:45(refname)
 msgid "suauth"
 msgstr ""
 
-#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum) pwck.8.xml:306(replaceable) porttime.5.xml:35(manvolnum) passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable) login.defs.5.xml:101(manvolnum) login.access.5.xml:36(manvolnum) limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum) grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
+#: suauth.5.xml:39(manvolnum) shadow.5.xml:39(manvolnum) pwck.8.xml:310(replaceable) porttime.5.xml:39(manvolnum) passwd.5.xml:39(manvolnum) passwd.1.xml:455(replaceable) login.defs.5.xml:102(manvolnum) login.access.5.xml:40(manvolnum) limits.5.xml:40(manvolnum) gshadow.5.xml:38(manvolnum) grpck.8.xml:262(replaceable) faillog.5.xml:39(manvolnum)
 msgid "5"
 msgstr ""
 
-#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo) porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo) login.defs.5.xml:102(refmiscinfo) login.access.5.xml:37(refmiscinfo) limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo) faillog.5.xml:36(refmiscinfo)
+#: suauth.5.xml:40(refmiscinfo) shadow.5.xml:40(refmiscinfo) porttime.5.xml:40(refmiscinfo) passwd.5.xml:40(refmiscinfo) login.defs.5.xml:103(refmiscinfo) login.access.5.xml:41(refmiscinfo) limits.5.xml:41(refmiscinfo) gshadow.5.xml:39(refmiscinfo) faillog.5.xml:40(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr ""
 
-#: suauth.5.xml:40(refpurpose)
+#: suauth.5.xml:46(refpurpose)
 msgid "detailed su control file"
 msgstr ""
 
-#: suauth.5.xml:45(command) suauth.5.xml:171(filename)
+#: suauth.5.xml:51(command) suauth.5.xml:177(filename)
 msgid "/etc/suauth"
 msgstr ""
 
-#: suauth.5.xml:51(para)
+#: suauth.5.xml:57(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:58(literallayout)
+#: suauth.5.xml:64(literallayout)
 #, no-wrap
 msgid "\n      1) the user su is targetting\n    "
 msgstr ""
 
 #. .fi
-#: suauth.5.xml:62(para)
+#: suauth.5.xml:68(para)
 msgid "2) the user executing the su command (or any groups he might be a member of)"
 msgstr ""
 
-#: suauth.5.xml:67(para)
+#: suauth.5.xml:73(para)
 msgid "The file is formatted like this, with lines starting with a # being treated as comment lines and ignored;"
 msgstr ""
 
-#: suauth.5.xml:72(literallayout)
+#: suauth.5.xml:78(literallayout)
 #, no-wrap
 msgid "\n      to-id:from-id:ACTION\n    "
 msgstr ""
 
-#: 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 \",\""
+#: suauth.5.xml:82(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:82(para)
+#: suauth.5.xml:88(para)
 msgid "from-id is formatted the same as to-id except the extra word <emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</emphasis> is perfectly valid too. Following <emphasis>GROUP</emphasis> appears one or more group names, delimited by \",\". It is not sufficient to have primary group id of the relevant group, an entry in <citerefentry><refentrytitle>/etc/group</refentrytitle><manvolnum>5</manvolnum></citerefentry> is neccessary."
 msgstr ""
 
-#: suauth.5.xml:93(para)
+#: suauth.5.xml:99(para)
 msgid "Action can be one only of the following currently supported options."
 msgstr ""
 
-#: suauth.5.xml:99(emphasis)
+#: suauth.5.xml:105(emphasis)
 msgid "DENY"
 msgstr ""
 
-#: suauth.5.xml:102(para)
+#: suauth.5.xml:108(para)
 msgid "The attempt to su is stopped before a password is even asked for."
 msgstr ""
 
-#: suauth.5.xml:109(emphasis)
+#: suauth.5.xml:115(emphasis)
 msgid "NOPASS"
 msgstr ""
 
-#: suauth.5.xml:112(para)
+#: suauth.5.xml:118(para)
 msgid "The attempt to su is automatically successful; no password is asked for."
 msgstr ""
 
-#: suauth.5.xml:120(emphasis)
+#: suauth.5.xml:126(emphasis)
 msgid "OWNPASS"
 msgstr ""
 
-#: suauth.5.xml:123(para)
+#: suauth.5.xml:129(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:131(para)
+#: suauth.5.xml:137(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 line by line, and the first applicable rule is used without examining the file further. This makes it possible for a system administrator to exercise as fine control as he or she wishes."
 msgstr ""
 
-#: suauth.5.xml:141(title)
+#: suauth.5.xml:147(title)
 msgid "EXAMPLE"
 msgstr ""
 
-#: suauth.5.xml:142(literallayout)
+#: suauth.5.xml:148(literallayout)
 #, no-wrap
 msgid "\n      # sample /etc/suauth file\n      #\n      # A couple of privileged usernames may\n      # su to root with their own password.\n      #\n      root:chris,birddog:OWNPASS\n      #\n      # Anyone else may not su to root unless in\n      # group wheel. This is how BSD does things.\n      #\n      root:ALL EXCEPT GROUP wheel:DENY\n      #\n      # Perhaps terry and birddog are accounts\n      # owned by the same person.\n      # Access can be arranged between them\n      # with no password.\n      #\n      terry:birddog:NOPASS\n      birddog:terry:NOPASS\n      #\n    "
 msgstr ""
 
-#: suauth.5.xml:178(title) pwconv.8.xml:153(title) login.defs.5.xml:488(title)
+#: suauth.5.xml:184(title) pwconv.8.xml:198(title) login.defs.5.xml:491(title)
 msgid "BUGS"
 msgstr ""
 
-#: suauth.5.xml:179(para)
+#: suauth.5.xml:185(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:188(title) shadow.3.xml:183(title)
+#: suauth.5.xml:194(title) shadow.3.xml:189(title)
 msgid "DIAGNOSTICS"
 msgstr ""
 
-#: suauth.5.xml:189(para)
+#: suauth.5.xml:195(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:198(para)
+#: suauth.5.xml:204(para)
 msgid "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 msgstr ""
 
-#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command) login.defs.5.xml:418(term)
+#: su.1.xml:55(refentrytitle) su.1.xml:62(refname) su.1.xml:67(command) login.defs.5.xml:421(term)
 msgid "su"
 msgstr ""
 
-#: 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:40(refmiscinfo)
+#: su.1.xml:57(refmiscinfo) sg.1.xml:41(refmiscinfo) passwd.1.xml:47(refmiscinfo) newgrp.1.xml:41(refmiscinfo) login.1.xml:73(refmiscinfo) groups.1.xml:40(refmiscinfo) gpasswd.1.xml:45(refmiscinfo) expiry.1.xml:44(refmiscinfo) chsh.1.xml:43(refmiscinfo) chfn.1.xml:43(refmiscinfo) chage.1.xml:41(refmiscinfo)
 msgid "User Commands"
 msgstr ""
 
-#: su.1.xml:60(refpurpose)
+#: su.1.xml:63(refpurpose)
 msgid "change user ID or become superuser"
 msgstr ""
 
-#: su.1.xml:70(replaceable) login.1.xml:85(replaceable) login.1.xml:93(replaceable)
+#: su.1.xml:73(replaceable) login.1.xml:88(replaceable) login.1.xml:96(replaceable)
 msgid "username"
 msgstr ""
 
-#: su.1.xml:78(para)
+#: su.1.xml:81(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</command> defaults to becoming the superuser. The optional argument <option>-</option> may be used to provide an environment similar to what the user would expect had the user logged in directly."
 msgstr ""
 
-#: su.1.xml:87(para)
+#: su.1.xml:90(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 <option>-c</option> will cause the next argument to be treated as a command by most command interpreters. The command will be executed by the shell specified in <filename>/etc/passwd</filename> for the target user."
 msgstr ""
 
-#: su.1.xml:96(para)
+#: su.1.xml:99(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:101(para)
+#: su.1.xml:104(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:106(para)
+#: su.1.xml:109(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 users, or <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the superuser. This may be changed with the <option>ENV_PATH</option> and <option>ENV_SUPATH</option> definitions in <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: su.1.xml:115(para) login.1.xml:166(para)
+#: su.1.xml:118(para) login.1.xml:169(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:124(para)
+#: su.1.xml:127(para)
 msgid "The options which apply to the <command>su</command> command are:"
 msgstr ""
 
-#: su.1.xml:128(term)
+#: su.1.xml:131(term)
 msgid "<option>-c</option>, <option>--command</option><replaceable>COMMAND</replaceable>"
 msgstr ""
 
-#: su.1.xml:133(para)
+#: su.1.xml:136(para)
 msgid "Specify a command that will be invoked by the shell using its <option>-c</option>."
 msgstr ""
 
-#: su.1.xml:140(term)
+#: su.1.xml:140(para)
+msgid "The executed command will have no controlling terminal. This option cannot be used to execute interractive programs which need a controlling TTY."
+msgstr ""
+
+#: su.1.xml:150(term)
 msgid "<option>-</option>, <option>-l</option>, <option>--login</option>"
 msgstr ""
 
-#: su.1.xml:144(para)
+#: su.1.xml:154(para)
 msgid "Provide an environment similar to what the user would expect had the user logged in directly."
 msgstr ""
 
-#: su.1.xml:148(para)
+#: su.1.xml:158(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:162(para)
+#: su.1.xml:172(para)
 msgid "The shell that will be invoked."
 msgstr ""
 
-#: su.1.xml:170(para)
+#: su.1.xml:180(para)
 msgid "The shell specified with --shell."
 msgstr ""
 
-#: su.1.xml:173(para)
+#: su.1.xml:183(para)
 msgid "If <option>--preserve-environment</option> is used, the shell specified by the <envar>$SHELL</envar> environment variable."
 msgstr ""
 
-#: su.1.xml:180(para)
+#: su.1.xml:190(para)
 msgid "The shell indicated in the <filename>/etc/passwd</filename> entry for the target user."
 msgstr ""
 
-#: su.1.xml:186(para)
+#: su.1.xml:196(para)
 msgid "<filename>/bin/sh</filename> if a shell could not be found by any above method."
 msgstr ""
 
-#: su.1.xml:163(para)
+#: su.1.xml:173(para)
 msgid "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:191(para)
+#: su.1.xml:201(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>/etc/shell</filename>), then the <option>--shell</option> option or the <envar>$SHELL</envar> environment variable won't be taken into account, unless <command>su</command> is called by root."
 msgstr ""
 
-#: su.1.xml:202(term)
+#: su.1.xml:212(term)
 msgid "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</option>"
 msgstr ""
 
-#: su.1.xml:211(envar)
+#: su.1.xml:221(envar)
 msgid "$PATH"
 msgstr ""
 
-#: su.1.xml:213(para)
+#: su.1.xml:223(para)
 msgid "reset according to the <filename>/etc/login.defs</filename> options <option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
 msgstr ""
 
-#: su.1.xml:222(envar)
+#: su.1.xml:232(envar)
 msgid "$IFS"
 msgstr ""
 
-#: su.1.xml:224(para)
+#: su.1.xml:234(para)
 msgid "reset to <quote><space><tab><newline></quote>, if it was set."
 msgstr ""
 
-#: su.1.xml:207(para)
+#: su.1.xml:217(para)
 msgid "Preserve the current environment, except for: <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:233(para)
+#: su.1.xml:243(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:242(para)
+#: su.1.xml:252(para)
 msgid "The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, <envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> environment variables are reset."
 msgstr ""
 
-#: su.1.xml:251(para)
+#: su.1.xml:261(para)
 msgid "If <option>--login</option> is not used, the environment is copied, except for the variables above."
 msgstr ""
 
-#: su.1.xml:258(para)
+#: su.1.xml:268(para)
 msgid "If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> environment variables are copied if they were set."
 msgstr ""
 
-#: su.1.xml:268(para)
+#: su.1.xml:278(para)
 msgid "If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</envar>, and <envar>$MAIL</envar> environment variables are set according to the <filename>/etc/login.defs</filename> options <option>ENV_TZ</option>, <option>ENV_HZ</option>, <option>MAIL_DIR</option>, and <option>MAIL_FILE</option> (see below)."
 msgstr ""
 
-#: su.1.xml:281(para)
+#: su.1.xml:291(para)
 msgid "If <option>--login</option> is used, other environment variables might be set by the <option>ENVIRON_FILE</option> file (see below)."
 msgstr ""
 
-#: su.1.xml:289(para)
+#: su.1.xml:299(para)
 msgid "Other environments might be set by PAM modules."
 msgstr ""
 
-#: su.1.xml:237(para)
+#: su.1.xml:247(para)
 msgid "Note that the default behavior for the environment is the following: <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:303(para)
+#: su.1.xml:313(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 ""
 
@@ -1368,7 +1392,7 @@
 msgstr ""
 
 #: 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."
+msgid "Indicate if login is allowed if we can't cd to the home directory. Default is no."
 msgstr ""
 
 #: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
@@ -1434,7 +1458,7 @@
 msgstr ""
 
 #: 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."
+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 not be translated."
 msgstr ""
 
 #: 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)
@@ -1458,7 +1482,7 @@
 msgstr ""
 
 #: 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."
+msgid "Enable setting of resource limits from <filename>/etc/limits</filename> and ulimit, umask, and niceness from the user's passwd gecos field."
 msgstr ""
 
 #: su.1.xml:32(term) login.defs.5.xml:32(term)
@@ -1493,71 +1517,71 @@
 msgid "Enable \"syslog\" logging of <command>su</command> activity - in addition to sulog file logging."
 msgstr ""
 
-#: su.1.xml:363(para)
+#: su.1.xml:373(para)
 msgid "On success, <command>su</command> returns the exit value of the command it executed."
 msgstr ""
 
-#: su.1.xml:367(para)
+#: su.1.xml:377(para)
 msgid "If this command was terminated by a signal, <command>su</command> returns the number of this signal plus 128."
 msgstr ""
 
-#: su.1.xml:371(para)
+#: su.1.xml:381(para)
 msgid "If su has to kill the command (because it was asked to terminate, and the command did not terminate in time), <command>su</command> returns 255."
 msgstr ""
 
-#: su.1.xml:383(para)
+#: su.1.xml:393(para)
 msgid "success (<option>--help</option> only)"
 msgstr ""
 
-#: su.1.xml:389(para)
+#: su.1.xml:399(para)
 msgid "System or authentication failure"
 msgstr ""
 
-#: su.1.xml:393(replaceable)
+#: su.1.xml:403(replaceable)
 msgid "126"
 msgstr ""
 
-#: su.1.xml:395(para)
+#: su.1.xml:405(para)
 msgid "The requested command was not found"
 msgstr ""
 
-#: su.1.xml:399(replaceable)
+#: su.1.xml:409(replaceable)
 msgid "127"
 msgstr ""
 
-#: su.1.xml:401(para)
+#: su.1.xml:411(para)
 msgid "The requested command could not be executed"
 msgstr ""
 
-#: su.1.xml:376(para)
+#: su.1.xml:386(para)
 msgid "Some exit values from <command>su</command> are independent from the executed command: <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:410(para)
+#: su.1.xml:420(para)
 msgid "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 msgstr ""
 
-#: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command)
+#: sg.1.xml:39(refentrytitle) sg.1.xml:46(refname) sg.1.xml:52(command)
 msgid "sg"
 msgstr ""
 
-#: sg.1.xml:44(refpurpose)
+#: sg.1.xml:47(refpurpose)
 msgid "execute command as different group ID"
 msgstr ""
 
-#: sg.1.xml:50(arg) newgrp.1.xml:49(arg)
+#: sg.1.xml:53(arg) newgrp.1.xml:52(arg)
 msgid "-"
 msgstr ""
 
-#: sg.1.xml:52(arg) expiry.1.xml:53(arg)
+#: sg.1.xml:55(arg)
 msgid "-c"
 msgstr ""
 
-#: sg.1.xml:51(arg)
+#: sg.1.xml:54(arg)
 msgid "group <placeholder-1/> command"
 msgstr ""
 
-#: sg.1.xml:60(para)
+#: sg.1.xml:63(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/sh</filename> shell. With most shells you may run <command>sg</command> from, you need to enclose multi-word commands in quotes. Another difference between <command>newgrp</command> and <command>sg</command> is that some shells treat <command>newgrp</command> specially, replacing themselves with a new instance of a shell that <command>newgrp</command> creates. This doesn't happen with <command>sg</command>, so upon exit from a <command>sg</command> command you are returned to your previous group ID."
 msgstr ""
 
@@ -1569,857 +1593,861 @@
 msgid "Enable \"syslog\" logging of <command>sg</command> activity."
 msgstr ""
 
-#: sg.1.xml:119(para)
+#: sg.1.xml:122(para)
 msgid "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>newgrp</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><phrase condition=\"gshadow\">, <citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></citerefentry></phrase>."
 msgstr ""
 
-#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname) shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname) pwck.8.xml:63(replaceable) pwck.8.xml:78(replaceable) grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
+#: shadow.5.xml:38(refentrytitle) shadow.5.xml:45(refname) shadow.3.xml:38(refentrytitle) shadow.3.xml:45(refname) pwck.8.xml:65(replaceable) grpck.8.xml:57(replaceable)
 msgid "shadow"
 msgstr ""
 
-#: shadow.5.xml:40(refpurpose)
+#: shadow.5.xml:46(refpurpose)
 msgid "shadowed password file"
 msgstr ""
 
-#: shadow.5.xml:45(para)
+#: shadow.5.xml:51(para)
 msgid "<filename>shadow</filename> is a file which contains the password information for the system's accounts and optional aging information."
 msgstr ""
 
-#: shadow.5.xml:51(para) gshadow.5.xml:49(para)
+#: shadow.5.xml:57(para) gshadow.5.xml:55(para)
 msgid "This file must not be readable by regular users if password security is to be maintained."
 msgstr ""
 
-#: shadow.5.xml:56(para)
+#: shadow.5.xml:62(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)
+#: shadow.5.xml:69(emphasis) passwd.5.xml:59(para)
 msgid "login name"
 msgstr ""
 
-#: shadow.5.xml:65(para)
+#: shadow.5.xml:71(para)
 msgid "It must be a valid account name, which exist on the system."
 msgstr ""
 
-#: shadow.5.xml:71(emphasis) gshadow.5.xml:68(emphasis)
+#: shadow.5.xml:77(emphasis) gshadow.5.xml:74(emphasis)
 msgid "encrypted password"
 msgstr ""
 
-#: shadow.5.xml:73(para) gshadow.5.xml:70(para)
+#: shadow.5.xml:79(para) gshadow.5.xml:76(para)
 msgid "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></citerefentry> for details on how this string is interpreted."
 msgstr ""
 
-#: shadow.5.xml:78(para)
+#: shadow.5.xml:84(para)
 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 ""
 
-#: shadow.5.xml:85(para)
+#: shadow.5.xml:91(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) gshadow.5.xml:92(para)
+#: shadow.5.xml:98(para) gshadow.5.xml:98(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)
+#: shadow.5.xml:108(emphasis)
 msgid "date of last password change"
 msgstr ""
 
-#: shadow.5.xml:105(para)
+#: shadow.5.xml:111(para)
 msgid "The date of the last password change, expressed as the number of days since Jan 1, 1970."
 msgstr ""
 
-#: shadow.5.xml:109(para)
+#: shadow.5.xml:115(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:114(para)
+#: shadow.5.xml:120(para)
 msgid "An empty field means that password aging features are disabled."
 msgstr ""
 
-#: shadow.5.xml:121(emphasis)
+#: shadow.5.xml:127(emphasis)
 msgid "minimum password age"
 msgstr ""
 
-#: shadow.5.xml:123(para)
+#: shadow.5.xml:129(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)
+#: shadow.5.xml:134(para)
 msgid "An empty field and value 0 mean that there are no minimum password age."
 msgstr ""
 
-#: shadow.5.xml:135(emphasis)
+#: shadow.5.xml:141(emphasis)
 msgid "maximum password age"
 msgstr ""
 
-#: shadow.5.xml:137(para)
+#: shadow.5.xml:143(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)
+#: shadow.5.xml:147(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)
+#: shadow.5.xml:152(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)
+#: shadow.5.xml:157(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)
+#: shadow.5.xml:165(emphasis)
 msgid "password warning period"
 msgstr ""
 
-#: shadow.5.xml:162(para)
+#: shadow.5.xml:168(para)
 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 ""
 
-#: shadow.5.xml:167(para)
+#: shadow.5.xml:173(para)
 msgid "An empty field and value 0 mean that there are no password warning period."
 msgstr ""
 
-#: shadow.5.xml:175(emphasis)
+#: shadow.5.xml:181(emphasis)
 msgid "password inactivity period"
 msgstr ""
 
-#: shadow.5.xml:178(para)
+#: shadow.5.xml:184(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)
+#: shadow.5.xml:190(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)
+#: shadow.5.xml:195(para)
 msgid "An empty field means that there are no enforcement of an inactivity period."
 msgstr ""
 
-#: shadow.5.xml:197(emphasis)
+#: shadow.5.xml:203(emphasis)
 msgid "account expiration date"
 msgstr ""
 
-#: shadow.5.xml:200(para)
+#: shadow.5.xml:206(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)
+#: shadow.5.xml:210(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)
+#: shadow.5.xml:216(para)
 msgid "An empty field means that the account will never expire."
 msgstr ""
 
-#: shadow.5.xml:213(para)
+#: shadow.5.xml:219(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)
+#: shadow.5.xml:227(emphasis)
 msgid "reserved field"
 msgstr ""
 
-#: shadow.5.xml:223(para)
+#: shadow.5.xml:229(para)
 msgid "This field is reserved for future use."
 msgstr ""
 
-#: shadow.5.xml:245(filename)
+#: shadow.5.xml:251(filename)
 msgid "/etc/shadow-"
 msgstr ""
 
-#: shadow.5.xml:247(para)
+#: shadow.5.xml:253(para)
 msgid "Backup file for /etc/shadow."
 msgstr ""
 
-#: shadow.5.xml:248(para) passwd.5.xml:134(para)
+#: shadow.5.xml:254(para) passwd.5.xml:140(para)
 msgid "Note that this file is used by the tools of the shadow toolsuite, but not by all user and password management tools."
 msgstr ""
 
-#: shadow.5.xml:259(para)
+#: shadow.5.xml:265(para)
 msgid "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</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>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
-#: shadow.3.xml:36(refmiscinfo)
+#: shadow.3.xml:40(refmiscinfo)
 msgid "Library Calls"
 msgstr ""
 
-#: shadow.3.xml:40(refname)
+#: shadow.3.xml:46(refname)
 msgid "getspnam"
 msgstr ""
 
-#: shadow.3.xml:41(refpurpose)
+#: shadow.3.xml:47(refpurpose)
 msgid "encrypted password file routines"
 msgstr ""
 
-#: shadow.3.xml:45(title)
+#: shadow.3.xml:51(title)
 msgid "SYNTAX"
 msgstr ""
 
-#: shadow.3.xml:47(emphasis)
+#: shadow.3.xml:53(emphasis)
 msgid "#include <shadow.h>"
 msgstr ""
 
-#: shadow.3.xml:51(emphasis)
+#: shadow.3.xml:57(emphasis)
 msgid "struct spwd *getspent();"
 msgstr ""
 
-#: shadow.3.xml:55(emphasis)
+#: shadow.3.xml:61(emphasis)
 msgid "struct spwd *getspnam(char"
 msgstr ""
 
-#: shadow.3.xml:56(emphasis)
+#: shadow.3.xml:62(emphasis)
 msgid "*name"
 msgstr ""
 
-#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis) shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:62(emphasis) shadow.3.xml:75(emphasis) shadow.3.xml:80(emphasis) shadow.3.xml:86(emphasis)
 msgid ");"
 msgstr ""
 
-#: shadow.3.xml:60(emphasis)
+#: shadow.3.xml:66(emphasis)
 msgid "void setspent();"
 msgstr ""
 
-#: shadow.3.xml:64(emphasis)
+#: shadow.3.xml:70(emphasis)
 msgid "void endspent();"
 msgstr ""
 
-#: shadow.3.xml:68(emphasis)
+#: shadow.3.xml:74(emphasis)
 msgid "struct spwd *fgetspent(FILE"
 msgstr ""
 
-#: shadow.3.xml:69(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:75(emphasis) shadow.3.xml:86(emphasis)
 msgid "*fp"
 msgstr ""
 
-#: shadow.3.xml:73(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "struct spwd *sgetspent(char"
 msgstr ""
 
-#: shadow.3.xml:74(emphasis)
+#: shadow.3.xml:80(emphasis)
 msgid "*cp"
 msgstr ""
 
-#: shadow.3.xml:78(emphasis)
+#: shadow.3.xml:84(emphasis)
 msgid "int putspent(struct spwd"
 msgstr ""
 
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "*p,"
 msgstr ""
 
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "FILE"
 msgstr ""
 
-#: shadow.3.xml:84(emphasis)
+#: shadow.3.xml:90(emphasis)
 msgid "int lckpwdf();"
 msgstr ""
 
-#: shadow.3.xml:88(emphasis)
+#: shadow.3.xml:94(emphasis)
 msgid "int ulckpwdf();"
 msgstr ""
 
-#: shadow.3.xml:94(para)
+#: shadow.3.xml:100(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:99(programlisting)
+#: shadow.3.xml:105(programlisting)
 #, no-wrap
 msgid "struct spwd {\n      char\t\t*sp_namp; /* user login name */\n      char\t\t*sp_pwdp; /* encrypted password */\n      long int\t\tsp_lstchg; /* last password change */\n      long int\t\tsp_min; /* days until change allowed. */\n      long int\t\tsp_max; /* days before change required */\n      long int\t\tsp_warn; /* days warning for expiration */\n      long int\t\tsp_inact; /* days before account inactive */\n      long int\t\tsp_expire; /* date when account expires */\n      unsigned long int\tsp_flag; /* reserved for future use */\n}\n    "
 msgstr ""
 
-#: shadow.3.xml:111(para)
+#: shadow.3.xml:117(para)
 msgid "The meanings of each field are:"
 msgstr ""
 
-#: shadow.3.xml:114(para)
+#: shadow.3.xml:120(para)
 msgid "sp_namp - pointer to null-terminated user name"
 msgstr ""
 
-#: shadow.3.xml:117(para)
+#: shadow.3.xml:123(para)
 msgid "sp_pwdp - pointer to null-terminated password"
 msgstr ""
 
-#: shadow.3.xml:120(para)
+#: shadow.3.xml:126(para)
 msgid "sp_lstchg - days since Jan 1, 1970 password was last changed"
 msgstr ""
 
-#: shadow.3.xml:123(para)
+#: shadow.3.xml:129(para)
 msgid "sp_min - days before which password may not be changed"
 msgstr ""
 
-#: shadow.3.xml:126(para)
+#: shadow.3.xml:132(para)
 msgid "sp_max - days after which password must be changed"
 msgstr ""
 
-#: shadow.3.xml:129(para)
+#: shadow.3.xml:135(para)
 msgid "sp_warn - days before password is to expire that user is warned of pending password expiration"
 msgstr ""
 
-#: shadow.3.xml:134(para)
+#: shadow.3.xml:140(para)
 msgid "sp_inact - days after password expires that account is considered inactive and disabled"
 msgstr ""
 
-#: shadow.3.xml:139(para)
+#: shadow.3.xml:145(para)
 msgid "sp_expire - days since Jan 1, 1970 when account will be disabled"
 msgstr ""
 
-#: shadow.3.xml:142(para)
+#: shadow.3.xml:148(para)
 msgid "sp_flag - reserved for future use"
 msgstr ""
 
-#: shadow.3.xml:150(para)
+#: shadow.3.xml:156(para)
 msgid "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, <emphasis>fgetspent</emphasis>, and <emphasis>sgetspent</emphasis> each return a pointer to a <emphasis>struct spwd</emphasis>. <emphasis>getspent</emphasis> returns the next entry from the file, and <emphasis>fgetspent</emphasis> returns the next entry from the given stream, which is assumed to be a file of the proper format. <emphasis>sgetspent</emphasis> returns a pointer to a <emphasis>struct spwd</emphasis> using the provided string as input. <emphasis>getspnam</emphasis> searches from the current position in the file for an entry matching <emphasis>name</emphasis>."
 msgstr ""
 
-#: shadow.3.xml:163(para)
+#: shadow.3.xml:169(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:169(para)
+#: shadow.3.xml:175(para)
 msgid "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines should be used to insure exclusive access to the <filename>/etc/shadow</filename> file. <emphasis>lckpwdf</emphasis> attempts to acquire a lock using <emphasis>pw_lock</emphasis> for up to 15 seconds. It continues by attempting to acquire a second lock using <emphasis>spw_lock</emphasis> for the remainder of the initial 15 seconds. Should either attempt fail after a total of 15 seconds, <emphasis>lckpwdf</emphasis> returns -1. When both locks are acquired 0 is returned."
 msgstr ""
 
-#: shadow.3.xml:184(para)
+#: shadow.3.xml:190(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:194(para)
+#: shadow.3.xml:200(para)
 msgid "These routines may only be used by the superuser as access to the shadow password file is restricted."
 msgstr ""
 
-#: shadow.3.xml:214(para)
+#: shadow.3.xml:220(para)
 msgid "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: pwconv.8.xml:43(refentrytitle) pwconv.8.xml:48(refname) pwconv.8.xml:57(command) login.defs.5.xml:401(term)
+#: pwconv.8.xml:44(refentrytitle) pwconv.8.xml:51(refname) pwconv.8.xml:60(command) login.defs.5.xml:404(term)
 msgid "pwconv"
 msgstr ""
 
-#: pwconv.8.xml:49(refname) pwconv.8.xml:60(command) login.defs.5.xml:410(term)
+#: pwconv.8.xml:52(refname) pwconv.8.xml:66(command) login.defs.5.xml:413(term)
 msgid "pwunconv"
 msgstr ""
 
-#: pwconv.8.xml:50(refname) pwconv.8.xml:63(command) login.defs.5.xml:314(term)
+#: pwconv.8.xml:53(refname) pwconv.8.xml:72(command) login.defs.5.xml:317(term)
 msgid "grpconv"
 msgstr ""
 
-#: pwconv.8.xml:51(refname) pwconv.8.xml:66(command) login.defs.5.xml:320(term)
+#: pwconv.8.xml:54(refname) pwconv.8.xml:78(command) login.defs.5.xml:323(term)
 msgid "grpunconv"
 msgstr ""
 
-#: pwconv.8.xml:52(refpurpose)
+#: pwconv.8.xml:55(refpurpose)
 msgid "convert to and from shadow passwords and groups"
 msgstr ""
 
-#: pwconv.8.xml:72(para)
+#: pwconv.8.xml:87(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:77(para)
+#: pwconv.8.xml:92(para)
 msgid "<command>pwconv</command> does not work with <option>USE_TCB</option> enabled. To convert to tcb passwords, you should first use <command>pwconv</command> to convert to shadowed passwords by disabling <option>USE_TCB</option> in <filename>login.defs</filename> and then convert to tcb password using <command>tcb_convert</command> (and re-enable <option>USE_TCB</option> in <filename>login.defs</filename>.)"
 msgstr ""
 
-#: pwconv.8.xml:87(para)
+#: pwconv.8.xml:102(para)
 msgid "The <command>pwunconv</command> command creates <emphasis remap=\"I\">passwd</emphasis> from <emphasis remap=\"I\">passwd</emphasis> and <emphasis remap=\"I\">shadow</emphasis> and then removes <emphasis remap=\"I\">shadow</emphasis>."
 msgstr ""
 
-#: pwconv.8.xml:93(para)
+#: pwconv.8.xml:108(para)
 msgid "<command>pwunconv</command> does not work with <option>USE_TCB</option> enabled. You should first switch back from tcb to shadowed passwords using <command>tcb_unconvert</command>, and then disable <option>USE_TCB</option> in <filename>login.defs</filename> before using <command>pwunconv</command>."
 msgstr ""
 
-#: pwconv.8.xml:102(para)
+#: pwconv.8.xml:117(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:108(para)
+#: pwconv.8.xml:123(para)
 msgid "The <command>grpunconv</command> command creates <emphasis remap=\"I\">group</emphasis> from <emphasis remap=\"I\">group</emphasis> and <emphasis remap=\"I\">gshadow</emphasis> and then removes <emphasis remap=\"I\">gshadow</emphasis>."
 msgstr ""
 
-#: pwconv.8.xml:115(para)
+#: pwconv.8.xml:130(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:122(para)
+#: pwconv.8.xml:137(para)
 msgid "Each program acquires the necessary locks before conversion. <command>pwconv</command> and <command>grpconv</command> are similar. First, entries in the shadowed file which don't exist in the main file are removed. Then, shadowed entries which don't have `x' as the password in the main file are updated. Any missing shadowed entries are added. Finally, passwords in the main file are replaced with `x'. These programs can be used for initial conversion as well to update the shadowed file if the main file is edited by hand."
 msgstr ""
 
-#: pwconv.8.xml:133(para)
+#: pwconv.8.xml:148(para)
 msgid "<command>pwconv</command> will use the values of <emphasis remap=\"I\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis>, and <emphasis remap=\"I\">PASS_WARN_AGE</emphasis> from <filename>/etc/login.defs</filename> when adding new entries to <filename>/etc/shadow</filename>."
 msgstr ""
 
-#: pwconv.8.xml:142(para)
+#: pwconv.8.xml:157(para)
 msgid "Likewise <command>pwunconv</command> and <command>grpunconv</command> are similar. Passwords in the main file are updated from the shadowed file. Entries which exist in the main file but not in the shadowed file are left alone. Finally, the shadowed file is removed. Some password aging information is lost by <command>pwunconv</command>. It will convert what it can."
 msgstr ""
 
-#: pwconv.8.xml:154(para)
+#: pwconv.8.xml:169(para)
+msgid "The options which apply to the <command>pwconv</command>, <command>pwunconv</command>, <command>grpconv</command>, and <command>grpunconv</command> commands are:"
+msgstr ""
+
+#: pwconv.8.xml:199(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. Please run <command>pwck</command> and <command>grpck</command> to correct any such errors before converting to or from shadow passwords or groups."
 msgstr ""
 
-#: pwconv.8.xml:165(para)
+#: pwconv.8.xml:210(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:173(para)
+#: pwconv.8.xml:218(para)
 msgid "The following configuration variables in <filename>/etc/login.defs</filename> change the behavior of <command>pwconv</command>:"
 msgstr ""
 
-#: pwconv.8.xml:200(para)
+#: pwconv.8.xml:245(para)
 msgid "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></citerefentry><phrase condition=\"tcb\">, <citerefentry><refentrytitle>tcb_convert</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>tcb_unconvert</refentrytitle><manvolnum>8</manvolnum></citerefentry></phrase>."
 msgstr ""
 
-#: pwck.8.xml:43(refentrytitle) pwck.8.xml:48(refname) pwck.8.xml:54(command) pwck.8.xml:69(command) login.defs.5.xml:392(term)
+#: pwck.8.xml:44(refentrytitle) pwck.8.xml:51(refname) pwck.8.xml:57(command) login.defs.5.xml:395(term)
 msgid "pwck"
 msgstr ""
 
-#: pwck.8.xml:49(refpurpose)
+#: pwck.8.xml:52(refpurpose)
 msgid "verify integrity of password files"
 msgstr ""
 
-#: pwck.8.xml:55(arg) pwck.8.xml:70(arg) pwck.8.xml:177(option)
-msgid "-q"
-msgstr ""
-
-#: pwck.8.xml:56(arg) pwck.8.xml:198(option) grpck.8.xml:58(arg) grpck.8.xml:149(option)
-msgid "-s"
-msgstr ""
-
-#: pwck.8.xml:59(replaceable) pwck.8.xml:74(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:381(term)
+#: pwck.8.xml:61(replaceable) passwd.5.xml:38(refentrytitle) passwd.5.xml:45(refname) passwd.1.xml:45(refentrytitle) passwd.1.xml:52(refname) passwd.1.xml:58(command) login.defs.5.xml:384(term)
 msgid "passwd"
 msgstr ""
 
-#: pwck.8.xml:71(arg) pwck.8.xml:188(option) login.1.xml:222(option) grpck.8.xml:49(arg) grpck.8.xml:139(option)
-msgid "-r"
-msgstr ""
-
-#: pwck.8.xml:87(para)
+#: pwck.8.xml:74(para)
 msgid "The <command>pwck</command> command verifies the integrity of the users and authentication information. It checks that all entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</filename><phrase condition=\"tcb\">(or the files in <filename>/etc/tcb</filename>, when <option>USE_TCB</option> is enabled)</phrase> have the proper format and contain valid data. The user is prompted to delete entries that are improperly formatted or which have other uncorrectable errors."
 msgstr ""
 
-#: pwck.8.xml:99(para) grpck.8.xml:80(para)
+#: pwck.8.xml:86(para) grpck.8.xml:75(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr ""
 
-#: pwck.8.xml:102(para) grpck.8.xml:84(para)
+#: pwck.8.xml:89(para) grpck.8.xml:79(para)
 msgid "the correct number of fields"
 msgstr ""
 
-#: pwck.8.xml:105(para)
+#: pwck.8.xml:92(para)
 msgid "a unique and valid user name"
 msgstr ""
 
-#: pwck.8.xml:108(para)
+#: pwck.8.xml:95(para)
 msgid "a valid user and group identifier"
 msgstr ""
 
-#: pwck.8.xml:111(para)
+#: pwck.8.xml:98(para)
 msgid "a valid primary group"
 msgstr ""
 
-#: pwck.8.xml:114(para)
+#: pwck.8.xml:101(para)
 msgid "a valid home directory"
 msgstr ""
 
-#: pwck.8.xml:117(para)
+#: pwck.8.xml:104(para)
 msgid "a valid login shell"
 msgstr ""
 
-#: pwck.8.xml:121(para)
+#: pwck.8.xml:108(para)
 msgid "<filename>shadow</filename> checks are enabled when a second file parameter is specified or when <filename>/etc/shadow</filename> exists on the system."
 msgstr ""
 
-#: pwck.8.xml:126(para)
+#: pwck.8.xml:113(para)
 msgid "These checks are the following:"
 msgstr ""
 
-#: pwck.8.xml:131(para)
+#: pwck.8.xml:118(para)
 msgid "every passwd entry has a matching shadow entry, and every shadow entry has a matching passwd entry"
 msgstr ""
 
-#: pwck.8.xml:137(para)
+#: pwck.8.xml:124(para)
 msgid "passwords are specified in the shadowed file"
 msgstr ""
 
-#: pwck.8.xml:140(para)
+#: pwck.8.xml:127(para)
 msgid "shadow entries have the correct number of fields"
 msgstr ""
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:130(para)
 msgid "shadow entries are unique in shadow"
 msgstr ""
 
-#: pwck.8.xml:146(para)
+#: pwck.8.xml:133(para)
 msgid "the last password changes are not in the future"
 msgstr ""
 
-#: pwck.8.xml:150(para)
+#: pwck.8.xml:137(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 delete the entire line. If the user does not answer affirmatively, all further checks are bypassed. An entry with a duplicated user name is prompted for deletion, but the remaining checks will still be made. All other errors are warning and the user is encouraged to run the <command>usermod</command> command to correct the error."
 msgstr ""
 
-#: pwck.8.xml:161(para)
+#: pwck.8.xml:148(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:171(para)
+#: pwck.8.xml:158(para) grpck.8.xml:129(para)
+msgid "The <option>-r</option> and <option>-s</option> options cannot be combined."
+msgstr ""
+
+#: pwck.8.xml:162(para)
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr ""
 
-#: pwck.8.xml:180(para)
+#: pwck.8.xml:175(para)
 msgid "Report errors only. The warnings which do not require any action from the user won't be displayed."
 msgstr ""
 
-#: pwck.8.xml:191(para)
+#: pwck.8.xml:182(term) grpck.8.xml:144(term)
+msgid "<option>-r</option>, <option>--read-only</option>"
+msgstr ""
+
+#: pwck.8.xml:184(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr ""
 
-#: pwck.8.xml:201(para)
+#: pwck.8.xml:203(term) grpck.8.xml:167(term)
+msgid "<option>-s</option>, <option>--sort</option>"
+msgstr ""
+
+#: pwck.8.xml:205(para)
 msgid "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</filename> by UID."
 msgstr ""
 
-#: pwck.8.xml:205(para)
+#: pwck.8.xml:209(para)
 msgid "This option has no effect when <option>USE_TCB</option> is enabled."
 msgstr ""
 
-#: pwck.8.xml:212(para)
+#: pwck.8.xml:216(para)
 msgid "By default, <command>pwck</command> operates on the files <filename>/etc/passwd</filename> and <filename>/etc/shadow</filename><phrase condition=\"tcb\"> (or the files in <filename>/etc/tcb</filename>)</phrase>. The user may select alternate files with the <replaceable>passwd</replaceable> and <replaceable>shadow</replaceable> parameters."
 msgstr ""
 
-#: pwck.8.xml:221(para)
+#: pwck.8.xml:225(para)
 msgid "Note that when <option>USE_TCB</option> is enabled, you cannot specify an alternative <replaceable>shadow</replaceable> file. In future releases, this paramater could be replaced by an alternate TCB directory."
 msgstr ""
 
-#: pwck.8.xml:290(para)
+#: pwck.8.xml:294(para)
 msgid "one or more bad password entries"
 msgstr ""
 
-#: pwck.8.xml:296(para)
+#: pwck.8.xml:300(para)
 msgid "can't open password files"
 msgstr ""
 
-#: pwck.8.xml:302(para)
+#: pwck.8.xml:306(para)
 msgid "can't lock password files"
 msgstr ""
 
-#: pwck.8.xml:308(para)
+#: pwck.8.xml:312(para)
 msgid "can't update password files"
 msgstr ""
 
-#: pwck.8.xml:314(para)
+#: pwck.8.xml:318(para)
 msgid "can't sort password files"
 msgstr ""
 
-#: pwck.8.xml:272(para)
+#: pwck.8.xml:276(para)
 msgid "The <command>pwck</command> command exits with the following values: <placeholder-1/>"
 msgstr ""
 
-#: pwck.8.xml:323(para)
+#: pwck.8.xml:327(para)
 msgid "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></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>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
-#: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
+#: porttime.5.xml:38(refentrytitle) porttime.5.xml:45(refname)
 msgid "porttime"
 msgstr ""
 
-#: porttime.5.xml:40(refpurpose)
+#: porttime.5.xml:46(refpurpose)
 msgid "port access time file"
 msgstr ""
 
-#: porttime.5.xml:45(para)
+#: porttime.5.xml:51(para)
 msgid "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, user names, and permitted login times."
 msgstr ""
 
-#: porttime.5.xml:50(para)
+#: porttime.5.xml:56(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 devices are matched by this entry. The second field is a comma separated list of user names, or an asterisk to indicated that all user names are matched by this entry. The third field is a comma separated list of permitted access times."
 msgstr ""
 
-#: porttime.5.xml:59(para)
+#: porttime.5.xml:65(para)
 msgid "Each access time entry consists of zero or more days of the week, abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</emphasis>, <emphasis>We</emphasis>, <emphasis>Th</emphasis>, <emphasis>Fr</emphasis>, and <emphasis>Sa</emphasis>, followed by a pair of times separated by a hyphen. The abbreviation <emphasis>Wk</emphasis> may be used to represent Monday thru Friday, and <emphasis>Al</emphasis> may be used to indicate every day. If no days are given, <emphasis>Al</emphasis> is assumed."
 msgstr ""
 
-#: porttime.5.xml:73(title)
+#: porttime.5.xml:79(title)
 msgid "EXAMPLES"
 msgstr ""
 
-#: porttime.5.xml:74(para)
+#: porttime.5.xml:80(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:80(para)
+#: porttime.5.xml:86(para)
 msgid "*:jfh:Wk0900-1700"
 msgstr ""
 
-#: porttime.5.xml:82(para)
+#: porttime.5.xml:88(para)
 msgid "The following entries allow access only to the users <emphasis>root</emphasis> and <emphasis>oper</emphasis> on <filename>/dev/console</filename> at any time. This illustrates how the <filename>/etc/porttime</filename> file is an ordered list of access times. Any other user would match the second entry which does not permit access at any time."
 msgstr ""
 
-#: porttime.5.xml:91(programlisting)
+#: porttime.5.xml:97(programlisting)
 #, no-wrap
 msgid "\n      console:root,oper:Al0000-2400\n      console:*:\n    "
 msgstr ""
 
-#: porttime.5.xml:96(para)
+#: porttime.5.xml:102(para)
 msgid "The following entry allows access for the user <emphasis>games</emphasis> on any port during non-working hours."
 msgstr ""
 
-#: porttime.5.xml:101(para)
+#: porttime.5.xml:107(para)
 msgid "*:games:Wk1700-0900,SaSu0000-2400"
 msgstr ""
 
-#: porttime.5.xml:108(filename) logoutd.8.xml:67(filename)
+#: porttime.5.xml:114(filename) logoutd.8.xml:73(filename)
 msgid "/etc/porttime"
 msgstr ""
 
-#: porttime.5.xml:110(para) logoutd.8.xml:69(para)
+#: porttime.5.xml:116(para) logoutd.8.xml:75(para)
 msgid "File containing port access."
 msgstr ""
 
-#: porttime.5.xml:118(para) login.access.5.xml:109(para)
+#: porttime.5.xml:124(para) login.access.5.xml:115(para)
 msgid "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 msgstr ""
 
-#: passwd.5.xml:40(refpurpose)
+#: passwd.5.xml:46(refpurpose)
 msgid "the password file"
 msgstr ""
 
-#: passwd.5.xml:45(para)
+#: passwd.5.xml:51(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:56(para)
+#: passwd.5.xml:62(para)
 msgid "optional encrypted password"
 msgstr ""
 
-#: passwd.5.xml:59(para)
+#: passwd.5.xml:65(para)
 msgid "numerical user ID"
 msgstr ""
 
-#: passwd.5.xml:62(para)
+#: passwd.5.xml:68(para)
 msgid "numerical group ID"
 msgstr ""
 
-#: passwd.5.xml:65(para)
+#: passwd.5.xml:71(para)
 msgid "user name or comment field"
 msgstr ""
 
-#: passwd.5.xml:68(para)
+#: passwd.5.xml:74(para)
 msgid "user home directory"
 msgstr ""
 
-#: passwd.5.xml:71(para)
+#: passwd.5.xml:77(para)
 msgid "optional user command interpreter"
 msgstr ""
 
-#: passwd.5.xml:75(para)
+#: passwd.5.xml:81(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 applications which read the <filename>/etc/passwd</filename> file may decide not to permit <emphasis>any</emphasis> access at all if the <emphasis>password</emphasis> field is blank. If the <emphasis>password</emphasis> field is a lower-case <quote>x</quote>, then the encrypted password is actually stored in the <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry> file instead; there <emphasis>must</emphasis> be a corresponding line in the <filename>/etc/shadow</filename> file, or else the user account is invalid. If the <emphasis>password</emphasis> field is any other string, then it will be treated as an encrypted password, as specified by <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></citerefentry>."
 msgstr ""
 
-#: passwd.5.xml:94(para)
+#: passwd.5.xml:100(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:100(para)
+#: passwd.5.xml:106(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:106(para)
+#: passwd.5.xml:112(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 <command>login</command> program uses this information to set the value of the <envar>$SHELL</envar> environmental variable. If this field is empty, it defaults to the value <filename>/bin/sh</filename>."
 msgstr ""
 
-#: passwd.5.xml:127(para)
+#: passwd.5.xml:133(para)
 msgid "optional encrypted password file"
 msgstr ""
 
-#: passwd.5.xml:131(filename)
+#: passwd.5.xml:137(filename)
 msgid "/etc/passwd-"
 msgstr ""
 
-#: passwd.5.xml:133(para)
+#: passwd.5.xml:139(para)
 msgid "Backup file for /etc/passwd."
 msgstr ""
 
-#: passwd.5.xml:145(para)
+#: passwd.5.xml:151(para)
 msgid "<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>pwck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>pwunconv</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 ""
 
-#: passwd.1.xml:50(refpurpose)
+#: passwd.1.xml:53(refpurpose)
 msgid "change user password"
 msgstr ""
 
-#: passwd.1.xml:67(para)
+#: passwd.1.xml:70(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 the account or associated password validity period."
 msgstr ""
 
-#: passwd.1.xml:76(title)
+#: passwd.1.xml:79(title)
 msgid "Password Changes"
 msgstr ""
 
-#: passwd.1.xml:77(para)
+#: passwd.1.xml:80(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 user has only one chance to enter the correct password. The superuser is permitted to bypass this step so that forgotten passwords may be changed."
 msgstr ""
 
-#: passwd.1.xml:85(para)
+#: passwd.1.xml:88(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:92(para)
+#: passwd.1.xml:95(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:98(para)
+#: passwd.1.xml:101(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:106(para)
+#: passwd.1.xml:109(para)
 msgid "lower case alphabetics"
 msgstr ""
 
-#: passwd.1.xml:109(para)
+#: passwd.1.xml:112(para)
 msgid "digits 0 thru 9"
 msgstr ""
 
-#: passwd.1.xml:112(para)
+#: passwd.1.xml:115(para)
 msgid "punctuation marks"
 msgstr ""
 
-#: passwd.1.xml:116(para)
+#: passwd.1.xml:119(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:125(title)
+#: passwd.1.xml:128(title)
 msgid "Hints for user passwords"
 msgstr ""
 
-#: passwd.1.xml:126(para)
+#: passwd.1.xml:129(para)
 msgid "The security of a password depends upon the strength of the encryption algorithm and the size of the key space. The legacy <emphasis>UNIX</emphasis> System encryption method is based on the NBS DES algorithm. More recent methods are now recommended (see <option>ENCRYPT_METHOD</option>). The size of the key space depends upon the randomness of the password which is selected."
 msgstr ""
 
-#: passwd.1.xml:135(para)
+#: passwd.1.xml:138(para)
 msgid "Compromises in password security normally result from careless password selection or handling. For this reason, you should not select a password which appears in a dictionary or which must be written down. The password should also not be a proper name, your license number, birth date, or street address. Any of these may be used as guesses to violate system security."
 msgstr ""
 
-#: passwd.1.xml:144(para)
+#: passwd.1.xml:147(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:153(para)
+#: passwd.1.xml:156(para)
 msgid "The options which apply to the <command>passwd</command> command are:"
 msgstr ""
 
-#: passwd.1.xml:158(term) faillog.8.xml:71(term)
+#: passwd.1.xml:161(term) faillog.8.xml:77(term)
 msgid "<option>-a</option>, <option>--all</option>"
 msgstr ""
 
-#: passwd.1.xml:162(para)
+#: passwd.1.xml:165(para)
 msgid "This option can be used only with <option>-S</option> and causes show status for all users."
 msgstr ""
 
-#: passwd.1.xml:169(term)
+#: passwd.1.xml:172(term)
 msgid "<option>-d</option>, <option>--delete</option>"
 msgstr ""
 
-#: passwd.1.xml:173(para)
+#: passwd.1.xml:176(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:181(term)
+#: passwd.1.xml:184(term)
 msgid "<option>-e</option>, <option>--expire</option>"
 msgstr ""
 
-#: passwd.1.xml:185(para)
+#: passwd.1.xml:188(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:198(term)
+#: passwd.1.xml:201(term)
 msgid "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</replaceable>"
 msgstr ""
 
-#: passwd.1.xml:202(para)
+#: passwd.1.xml:205(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 password for <replaceable>INACTIVE</replaceable> days, the user may no longer sign on to the account."
 msgstr ""
 
-#: passwd.1.xml:211(term)
+#: passwd.1.xml:214(term)
 msgid "<option>-k</option>, <option>--keep-tokens</option>"
 msgstr ""
 
-#: passwd.1.xml:215(para)
+#: passwd.1.xml:218(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:223(term)
+#: passwd.1.xml:226(term)
 msgid "<option>-l</option>, <option>--lock</option>"
 msgstr ""
 
-#: passwd.1.xml:227(para)
+#: passwd.1.xml:230(para)
 msgid "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:233(para)
+#: passwd.1.xml:236(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:240(para)
+#: passwd.1.xml:243(para)
 msgid "Users with a locked password are not allowed to change their password."
 msgstr ""
 
-#: passwd.1.xml:247(term)
+#: passwd.1.xml:250(term)
 msgid "<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</replaceable>"
 msgstr ""
 
-#: passwd.1.xml:251(para) chage.1.xml:146(para)
+#: passwd.1.xml:254(para) chage.1.xml:149(para)
 msgid "Set the minimum number of days between password changes to <replaceable>MIN_DAYS</replaceable>. A value of zero for this field indicates that the user may change his/her password at any time."
 msgstr ""
 
-#: passwd.1.xml:269(term)
+#: passwd.1.xml:272(term)
 msgid "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</replaceable>"
 msgstr ""
 
-#: passwd.1.xml:273(para)
+#: passwd.1.xml:276(para)
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr ""
 
-#: passwd.1.xml:279(term)
+#: passwd.1.xml:295(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr ""
 
-#: passwd.1.xml:283(para)
+#: passwd.1.xml:299(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 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:297(term)
+#: passwd.1.xml:313(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr ""
 
-#: passwd.1.xml:301(para)
+#: passwd.1.xml:317(para)
 msgid "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)."
 msgstr ""
 
-#: passwd.1.xml:310(term)
+#: passwd.1.xml:326(term)
 msgid "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</replaceable>"
 msgstr ""
 
-#: passwd.1.xml:314(para)
+#: passwd.1.xml:330(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 the password expiring that a user will be warned that his/her password is about to expire."
 msgstr ""
 
-#: passwd.1.xml:323(term)
+#: passwd.1.xml:339(term)
 msgid "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</replaceable>"
 msgstr ""
 
-#: passwd.1.xml:327(para)
+#: passwd.1.xml:343(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:339(para)
+#: passwd.1.xml:355(para)
 msgid "Password complexity checking may vary from site to site. The user is urged to select a password as complex as he or she feels comfortable with."
 msgstr ""
 
-#: passwd.1.xml:344(para)
+#: passwd.1.xml:360(para)
 msgid "Users may not be able to change their password on a system if NIS is enabled and they are not logged into the NIS server."
 msgstr ""
 
-#: passwd.1.xml:349(para)
+#: passwd.1.xml:365(para)
 msgid "<command>passwd</command> uses PAM to authenticate users and to change their passwords."
 msgstr ""
 
@@ -2452,7 +2480,7 @@
 msgstr ""
 
 #: 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."
+msgid "This variable is superseded by the <option>ENCRYPT_METHOD</option> variable or by any command line option used to configure the encryption algorithm."
 msgstr ""
 
 #: 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)
@@ -2516,7 +2544,7 @@
 msgstr ""
 
 #: 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."
+msgid "The values must be inside the 1000-999,999,999 range."
 msgstr ""
 
 #: 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)
@@ -2527,335 +2555,335 @@
 msgid "If <option>SHA_CRYPT_MIN_ROUNDS</option> > <option>SHA_CRYPT_MAX_ROUNDS</option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:395(filename)
+#: passwd.1.xml:411(filename)
 msgid "/etc/pam.d/passwd"
 msgstr ""
 
-#: passwd.1.xml:397(para)
+#: passwd.1.xml:413(para)
 msgid "PAM configuration for <command>passwd</command>."
 msgstr ""
 
-#: passwd.1.xml:417(para) chage.1.xml:257(para)
+#: passwd.1.xml:433(para) chage.1.xml:273(para)
 msgid "permission denied"
 msgstr ""
 
-#: passwd.1.xml:423(para)
+#: passwd.1.xml:439(para)
 msgid "invalid combination of options"
 msgstr ""
 
-#: passwd.1.xml:429(para)
+#: passwd.1.xml:445(para)
 msgid "unexpected failure, nothing done"
 msgstr ""
 
-#: passwd.1.xml:435(para)
+#: passwd.1.xml:451(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr ""
 
-#: passwd.1.xml:441(para)
+#: passwd.1.xml:457(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 
-#: passwd.1.xml:405(para)
+#: passwd.1.xml:421(para)
 msgid "The <command>passwd</command> command exits with the following values: <placeholder-1/>"
 msgstr ""
 
-#: passwd.1.xml:456(para)
-msgid "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition=\"no_pam\"><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, </phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#: passwd.1.xml:472(para)
+msgid "<citerefentry><refentrytitle>chpasswd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition=\"no_pam\"><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, </phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
-#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname) nologin.8.xml:45(command)
+#: nologin.8.xml:38(refentrytitle) nologin.8.xml:45(refname) nologin.8.xml:51(command)
 msgid "nologin"
 msgstr ""
 
-#: nologin.8.xml:40(refpurpose)
+#: nologin.8.xml:46(refpurpose)
 msgid "politely refuse a login"
 msgstr ""
 
-#: nologin.8.xml:51(para)
+#: nologin.8.xml:57(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:56(para)
+#: nologin.8.xml:62(para)
 msgid "To disable all logins, investigate <citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: nologin.8.xml:65(para)
+#: nologin.8.xml:71(para)
 msgid "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: nologin.8.xml:76(title)
+#: nologin.8.xml:82(title)
 msgid "HISTORY"
 msgstr ""
 
-#: nologin.8.xml:77(para)
+#: nologin.8.xml:83(para)
 msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr ""
 
-#: newusers.8.xml:50(refentrytitle) newusers.8.xml:55(refname) newusers.8.xml:61(command) login.defs.5.xml:365(term)
+#: newusers.8.xml:51(refentrytitle) newusers.8.xml:58(refname) newusers.8.xml:64(command) login.defs.5.xml:368(term)
 msgid "newusers"
 msgstr ""
 
-#: newusers.8.xml:56(refpurpose)
+#: newusers.8.xml:59(refpurpose)
 msgid "update and create new users in batch"
 msgstr ""
 
-#: newusers.8.xml:64(replaceable)
-msgid "new_users"
+#: newusers.8.xml:69(replaceable)
+msgid "file"
 msgstr ""
 
-#: newusers.8.xml:71(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 exceptions explained below:"
+#: newusers.8.xml:76(para)
+msgid "The <command>newusers</command> command reads a <replaceable>file</replaceable> (or the standard input by default) and uses this information to update a set 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 exceptions explained below:"
 msgstr ""
 
-#: newusers.8.xml:79(para)
+#: newusers.8.xml:84(para)
 msgid "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
 msgstr ""
 
-#: newusers.8.xml:84(emphasis)
+#: newusers.8.xml:89(emphasis)
 msgid "pw_name"
 msgstr ""
 
-#: newusers.8.xml:87(para)
+#: newusers.8.xml:92(para)
 msgid "This is the name of the user."
 msgstr ""
 
-#: newusers.8.xml:90(para)
+#: newusers.8.xml:95(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:101(emphasis)
+#: newusers.8.xml:106(emphasis)
 msgid "pw_passwd"
 msgstr ""
 
-#: newusers.8.xml:104(para)
+#: newusers.8.xml:109(para)
 msgid "This field will be encrypted and used as the new value of the encrypted password."
 msgstr ""
 
-#: newusers.8.xml:112(emphasis)
+#: newusers.8.xml:117(emphasis)
 msgid "pw_uid"
 msgstr ""
 
-#: newusers.8.xml:115(para)
+#: newusers.8.xml:120(para)
 msgid "This field is used to define the UID of the user."
 msgstr ""
 
-#: newusers.8.xml:118(para)
+#: newusers.8.xml:123(para)
 msgid "If the field is empty, an new (unused) UID will be defined automatically by <command>newusers</command>."
 msgstr ""
 
-#: newusers.8.xml:122(para)
+#: newusers.8.xml:127(para)
 msgid "If this field contains a number, this number will be used as the UID."
 msgstr ""
 
-#: newusers.8.xml:126(para)
+#: newusers.8.xml:131(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:132(para)
+#: newusers.8.xml:137(para)
 msgid "If the UID of an existing user is changed, the files ownership of the user's file should be fixed manually."
 msgstr ""
 
-#: newusers.8.xml:140(emphasis)
+#: newusers.8.xml:145(emphasis)
 msgid "pw_gid"
 msgstr ""
 
-#: newusers.8.xml:143(para)
+#: newusers.8.xml:148(para)
 msgid "This field is used to define the primary group ID for the user."
 msgstr ""
 
-#: newusers.8.xml:146(para)
+#: newusers.8.xml:151(para)
 msgid "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:152(para)
+#: newusers.8.xml:157(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:158(para)
+#: newusers.8.xml:163(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:164(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."
+#: newusers.8.xml:169(para)
+msgid "If this field contains the name of a group which does not exist (and was not created before 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 GID for the new group."
 msgstr ""
 
-#: newusers.8.xml:176(emphasis)
+#: newusers.8.xml:181(emphasis)
 msgid "pw_gecos"
 msgstr ""
 
-#: newusers.8.xml:179(para)
+#: newusers.8.xml:184(para)
 msgid "This field is copied in the GECOS field of the user."
 msgstr ""
 
-#: newusers.8.xml:186(emphasis)
+#: newusers.8.xml:191(emphasis)
 msgid "pw_dir"
 msgstr ""
 
-#: newusers.8.xml:189(para)
+#: newusers.8.xml:194(para)
 msgid "This field is used to define the home directory of the user."
 msgstr ""
 
-#: newusers.8.xml:192(para)
+#: newusers.8.xml:197(para)
 msgid "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:197(para)
+#: newusers.8.xml:202(para)
 msgid "If the home directory of an existing user is changed, <command>newusers</command> does not move or copy the content of the old directory to the new location. This should be done manually."
 msgstr ""
 
-#: newusers.8.xml:207(emphasis)
+#: newusers.8.xml:212(emphasis)
 msgid "pw_shell"
 msgstr ""
 
-#: newusers.8.xml:210(para)
+#: newusers.8.xml:215(para)
 msgid "This field defines the shell of the user. No checks are performed on this field."
 msgstr ""
 
-#: newusers.8.xml:218(para)
+#: newusers.8.xml:223(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:224(para)
+#: newusers.8.xml:229(para)
 msgid "During this first pass, users are created with a locked password (and passwords are not changed for the users which are not created). A second pass is used to update the passwords using PAM. Failures to update a password are reported, but will not stop the other password updates."
 msgstr ""
 
-#: newusers.8.xml:232(para)
+#: newusers.8.xml:237(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:240(para)
+#: newusers.8.xml:245(para)
 msgid "The options which apply to the <command>newusers</command> command are:"
 msgstr ""
 
-#: newusers.8.xml:245(term) chgpasswd.8.xml:95(term)
+#: newusers.8.xml:250(term) chgpasswd.8.xml:98(term)
 msgid "<option>-c</option>, <option>--crypt-method</option>"
 msgstr ""
 
-#: newusers.8.xml:247(para) chpasswd.8.xml:120(para) chgpasswd.8.xml:97(para)
+#: newusers.8.xml:252(para) chpasswd.8.xml:123(para) chgpasswd.8.xml:100(para)
 msgid "Use the specified method to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:248(para) chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
+#: newusers.8.xml:253(para) chpasswd.8.xml:127(para) chgpasswd.8.xml:104(para)
 msgid "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc support these methods."
 msgstr ""
 
-#: newusers.8.xml:270(para)
+#: newusers.8.xml:275(para)
 msgid "System users will be created with no aging information in <filename>/etc/shadow</filename>, and their numeric identifiers are chosen 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:284(term) chgpasswd.8.xml:129(term)
+#: newusers.8.xml:302(term) chgpasswd.8.xml:145(term)
 msgid "<option>-s</option>, <option>--sha-rounds</option>"
 msgstr ""
 
-#: newusers.8.xml:286(para) chpasswd.8.xml:172(para) chgpasswd.8.xml:131(para)
+#: newusers.8.xml:304(para) chpasswd.8.xml:188(para) chgpasswd.8.xml:147(para)
 msgid "Use the specified number of rounds to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:289(para) chpasswd.8.xml:175(para) chgpasswd.8.xml:134(para)
+#: newusers.8.xml:307(para) chpasswd.8.xml:191(para) chgpasswd.8.xml:150(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:293(para) chpasswd.8.xml:179(para) chgpasswd.8.xml:138(para)
+#: newusers.8.xml:311(para) chpasswd.8.xml:195(para) chgpasswd.8.xml:154(para)
 msgid "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr ""
 
-#: newusers.8.xml:297(para) chpasswd.8.xml:183(para) chgpasswd.8.xml:142(para)
+#: newusers.8.xml:315(para) chpasswd.8.xml:199(para) chgpasswd.8.xml:158(para)
 msgid "You can only use this option with the SHA256 or SHA512 crypt method."
 msgstr ""
 
-#: newusers.8.xml:301(para) chgpasswd.8.xml:146(para)
+#: newusers.8.xml:319(para) chgpasswd.8.xml:162(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:313(para)
+#: newusers.8.xml:331(para)
 msgid "The input file must be protected since it contains unencrypted passwords."
 msgstr ""
 
-#: newusers.8.xml:317(para) chgpasswd.8.xml:162(para)
+#: newusers.8.xml:335(para) chgpasswd.8.xml:178(para)
 msgid "You should make sure the passwords and the encryption method respect the system's password policy."
 msgstr ""
 
-#: newusers.8.xml:390(filename)
+#: newusers.8.xml:408(filename)
 msgid "/etc/pam.d/newusers"
 msgstr ""
 
-#: newusers.8.xml:392(para)
+#: newusers.8.xml:410(para)
 msgid "PAM configuration for <command>newusers</command>."
 msgstr ""
 
-#: newusers.8.xml:400(para)
+#: newusers.8.xml:418(para)
 msgid "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
-#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname) newgrp.1.xml:49(command)
+#: newgrp.1.xml:39(refentrytitle) newgrp.1.xml:46(refname) newgrp.1.xml:52(command)
 msgid "newgrp"
 msgstr ""
 
-#: newgrp.1.xml:44(refpurpose)
+#: newgrp.1.xml:47(refpurpose)
 msgid "log in to a new group"
 msgstr ""
 
-#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable) grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable) groupadd.8.xml:57(replaceable) gpasswd.1.xml:66(replaceable)
+#: newgrp.1.xml:53(replaceable) grpck.8.xml:55(replaceable) groupadd.8.xml:59(replaceable) gpasswd.1.xml:69(replaceable)
 msgid "group"
 msgstr ""
 
-#: newgrp.1.xml:56(para)
+#: newgrp.1.xml:59(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, the user's environment will be reinitialized as though the user had logged in, otherwise the current environment, including current working directory, remains unchanged."
 msgstr ""
 
-#: newgrp.1.xml:64(para)
+#: newgrp.1.xml:67(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 no group name is given. <command>newgrp</command> also tries to add the group to the user groupset. If not root, the user will be prompted for a password if she does not have a password (in <filename>/etc/shadow</filename> if this user has an entry in the shadowed password file, or in <filename>/etc/passwd</filename> otherwise) and the group does, or if the user is not listed as a member and the group has a password. The user will be denied access if the group password is empty and the user is not listed as a member."
 msgstr ""
 
-#: newgrp.1.xml:78(para)
+#: newgrp.1.xml:81(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 this file, otherwise, the entry in <filename>/etc/group</filename> is considered."
 msgstr ""
 
-#: newgrp.1.xml:130(para)
+#: newgrp.1.xml:133(para)
 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>sg</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry><phrase condition=\"gshadow\">, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></citerefentry></phrase>."
 msgstr ""
 
-#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname) logoutd.8.xml:45(command)
+#: logoutd.8.xml:38(refentrytitle) logoutd.8.xml:45(refname) logoutd.8.xml:51(command)
 msgid "logoutd"
 msgstr ""
 
-#: logoutd.8.xml:40(refpurpose)
-msgid "Enforce login time restrictions"
+#: logoutd.8.xml:46(refpurpose)
+msgid "enforce login time restrictions"
 msgstr ""
 
-#: logoutd.8.xml:51(para)
+#: logoutd.8.xml:57(para)
 msgid "<command>logoutd</command> enforces the login time and port restrictions specified in <filename>/etc/porttime</filename>. <command>logoutd</command> should be started from <filename>/etc/rc</filename>. The <filename>/var/run/utmp</filename> file is scanned periodically and each user name is checked to see if the named user is permitted on the named port at the current time. Any login session which is violating the restrictions in <filename>/etc/porttime</filename> is terminated."
 msgstr ""
 
-#: logoutd.8.xml:73(filename) login.1.xml:319(filename)
+#: logoutd.8.xml:79(filename) login.1.xml:322(filename)
 msgid "/var/run/utmp"
 msgstr ""
 
-#: logoutd.8.xml:75(para) login.1.xml:321(para)
+#: logoutd.8.xml:81(para) login.1.xml:324(para)
 msgid "List of current login sessions."
 msgstr ""
 
-#: login.defs.5.xml:100(refentrytitle) login.defs.5.xml:105(refname)
+#: login.defs.5.xml:101(refentrytitle) login.defs.5.xml:108(refname)
 msgid "login.defs"
 msgstr ""
 
-#: login.defs.5.xml:106(refpurpose)
+#: login.defs.5.xml:109(refpurpose)
 msgid "shadow password suite configuration"
 msgstr ""
 
-#: login.defs.5.xml:111(para)
+#: login.defs.5.xml:114(para)
 msgid "The <filename>/etc/login.defs</filename> file defines the site-specific configuration for the shadow password suite. This file is required. Absence of this file will not prevent system operation, but will probably result in undesirable operation."
 msgstr ""
 
-#: login.defs.5.xml:118(para)
+#: login.defs.5.xml:121(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 value, separated by whitespace. Blank lines and comment lines are ignored. Comments are introduced with a \"#\" pound sign and the pound sign must be the first non-white character of the line."
 msgstr ""
 
-#: login.defs.5.xml:126(para)
+#: login.defs.5.xml:129(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 be either the value <replaceable>yes</replaceable> or <replaceable>no</replaceable>. An undefined boolean parameter or one with a value other than these will be given a <replaceable>no</replaceable> value. Numbers (both regular and long) may be either decimal values, octal values (precede the value with <replaceable>0</replaceable>) or hexadecimal values (precede the value with <replaceable>0x</replaceable>). The maximum value of the regular and long numeric parameters is machine-dependent."
 msgstr ""
 
-#: login.defs.5.xml:141(para)
+#: login.defs.5.xml:144(para)
 msgid "The following configuration items are provided:"
 msgstr ""
 
@@ -2988,7 +3016,7 @@
 msgstr ""
 
 #: login.defs.5.xml:37(para) login.1.xml:37(para)
-msgid "This will most likely be overridden 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."
+msgid "This will most likely be overridden by PAM, since the default pam_unix module has its 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:32(term) login.1.xml:32(term)
@@ -3015,7 +3043,7 @@
 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:184(para)
+#: login.defs.5.xml:187(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 ""
 
@@ -3024,7 +3052,7 @@
 msgstr ""
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "Enable checking of time restrictions specified in /etc/porttime."
+msgid "Enable checking of time restrictions specified in <filename>/etc/porttime</filename>."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -3067,1530 +3095,1578 @@
 msgid "Default <command>ulimit</command> value."
 msgstr ""
 
-#: login.defs.5.xml:215(title)
+#: login.defs.5.xml:218(title)
 msgid "CROSS REFERENCES"
 msgstr ""
 
-#: login.defs.5.xml:216(para)
+#: login.defs.5.xml:219(para)
 msgid "The following cross references show which programs in the shadow password suite use which parameters."
 msgstr ""
 
-#: login.defs.5.xml:223(term) chage.1.xml:38(refentrytitle) chage.1.xml:43(refname) chage.1.xml:48(command)
+#: login.defs.5.xml:226(term) chage.1.xml:39(refentrytitle) chage.1.xml:46(refname) chage.1.xml:51(command)
 msgid "chage"
 msgstr ""
 
-#: login.defs.5.xml:225(para) login.defs.5.xml:413(phrase) login.defs.5.xml:480(phrase)
+#: login.defs.5.xml:228(para) login.defs.5.xml:416(phrase) login.defs.5.xml:483(phrase)
 msgid "USE_TCB"
 msgstr ""
 
-#: login.defs.5.xml:229(term) chfn.1.xml:41(refentrytitle) chfn.1.xml:46(refname) chfn.1.xml:52(command)
+#: login.defs.5.xml:232(term) chfn.1.xml:41(refentrytitle) chfn.1.xml:48(refname) chfn.1.xml:54(command)
 msgid "chfn"
 msgstr ""
 
-#: login.defs.5.xml:231(para)
+#: login.defs.5.xml:234(para)
 msgid "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase condition=\"no_pam\">LOGIN_STRING</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:239(term) chgpasswd.8.xml:42(refentrytitle) chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
+#: login.defs.5.xml:242(term) chgpasswd.8.xml:43(refentrytitle) chgpasswd.8.xml:50(refname) chgpasswd.8.xml:56(command)
 msgid "chgpasswd"
 msgstr ""
 
-#: login.defs.5.xml:241(para) login.defs.5.xml:272(para)
+#: login.defs.5.xml:244(para) login.defs.5.xml:275(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:249(term) chpasswd.8.xml:41(refentrytitle) chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
+#: login.defs.5.xml:252(term) chpasswd.8.xml:42(refentrytitle) chpasswd.8.xml:49(refname) chpasswd.8.xml:55(command)
 msgid "chpasswd"
 msgstr ""
 
-#: login.defs.5.xml:252(phrase)
+#: login.defs.5.xml:255(phrase)
 msgid "ENCRYPT_METHOD MD5_CRYPT_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:254(phrase)
+#: login.defs.5.xml:257(phrase)
 msgid "SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS"
 msgstr ""
 
-#: login.defs.5.xml:260(term) chsh.1.xml:40(refentrytitle) chsh.1.xml:45(refname) chsh.1.xml:51(command)
+#: login.defs.5.xml:263(term) chsh.1.xml:41(refentrytitle) chsh.1.xml:48(refname) chsh.1.xml:54(command)
 msgid "chsh"
 msgstr ""
 
-#: login.defs.5.xml:262(para)
+#: login.defs.5.xml:265(para)
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr ""
 
-#: login.defs.5.xml:270(term) gpasswd.1.xml:42(refentrytitle) gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
+#: login.defs.5.xml:273(term) gpasswd.1.xml:43(refentrytitle) gpasswd.1.xml:50(refname) gpasswd.1.xml:64(command)
 msgid "gpasswd"
 msgstr ""
 
-#: login.defs.5.xml:280(term) groupadd.8.xml:41(refentrytitle) groupadd.8.xml:46(refname) groupadd.8.xml:52(command)
+#: login.defs.5.xml:283(term) groupadd.8.xml:41(refentrytitle) groupadd.8.xml:48(refname) groupadd.8.xml:54(command)
 msgid "groupadd"
 msgstr ""
 
-#: login.defs.5.xml:282(para)
+#: login.defs.5.xml:285(para)
 msgid "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 msgstr ""
 
-#: login.defs.5.xml:289(term) groupdel.8.xml:38(refentrytitle) groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
+#: login.defs.5.xml:292(term) groupdel.8.xml:39(refentrytitle) groupdel.8.xml:46(refname) groupdel.8.xml:52(command)
 msgid "groupdel"
 msgstr ""
 
-#: login.defs.5.xml:291(para) login.defs.5.xml:297(para) login.defs.5.xml:303(para) login.defs.5.xml:310(para) login.defs.5.xml:316(para) login.defs.5.xml:322(para)
+#: login.defs.5.xml:294(para) login.defs.5.xml:300(para) login.defs.5.xml:306(para) login.defs.5.xml:313(para) login.defs.5.xml:319(para) login.defs.5.xml:325(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:295(term) groupmems.8.xml:38(refentrytitle) groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
+#: login.defs.5.xml:298(term) groupmems.8.xml:39(refentrytitle) groupmems.8.xml:46(refname) groupmems.8.xml:52(command)
 msgid "groupmems"
 msgstr ""
 
-#: login.defs.5.xml:301(term) groupmod.8.xml:38(refentrytitle) groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
+#: login.defs.5.xml:304(term) groupmod.8.xml:39(refentrytitle) groupmod.8.xml:46(refname) groupmod.8.xml:52(command)
 msgid "groupmod"
 msgstr ""
 
-#: login.defs.5.xml:308(term) grpck.8.xml:38(refentrytitle) grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
+#: login.defs.5.xml:311(term) grpck.8.xml:39(refentrytitle) grpck.8.xml:46(refname) grpck.8.xml:52(command)
 msgid "grpck"
 msgstr ""
 
-#: login.defs.5.xml:328(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)
+#: login.defs.5.xml:331(term) login.1.xml:71(refentrytitle) login.1.xml:78(refname) login.1.xml:84(command) login.1.xml:92(command) login.1.xml:99(command)
 msgid "login"
 msgstr ""
 
-#: login.defs.5.xml:330(para)
+#: login.defs.5.xml:333(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</phrase> ERASECHAR FAIL_DELAY <phrase condition=\"no_pam\">FAILLOG_ENAB</phrase> FAKE_SHELL <phrase condition=\"no_pam\">FTMP_FILE</phrase> HUSHLOGIN_FILE <phrase condition=\"no_pam\">ISSUE_FILE</phrase> KILLCHAR <phrase condition=\"no_pam\">LASTLOG_ENAB</phrase> LOGIN_RETRIES <phrase condition=\"no_pam\">LOGIN_STRING</phrase> LOGIN_TIMEOUT LOG_OK_LOGINS LOG_UNKFAIL_ENAB <phrase condition=\"no_pam\">MAIL_CHECK_ENAB MAIL_DIR MAIL_FILE MOTD_FILE NOLOGINS_FILE PORTTIME_CHECKS_ENAB QUOTAS_ENAB</phrase> TTYGROUP TTYPERM TTYTYPE_FILE <phrase condition=\"no_pam\">ULIMIT UMASK</phrase> USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:357(term)
+#: login.defs.5.xml:360(term)
 msgid "newgrp / sg"
 msgstr ""
 
-#: login.defs.5.xml:359(para)
+#: login.defs.5.xml:362(para)
 msgid "SYSLOG_SG_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:367(para)
+#: login.defs.5.xml:370(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\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase> SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX UID_MIN UMASK"
 msgstr ""
 
-#: login.defs.5.xml:383(para)
+#: login.defs.5.xml:386(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:394(para)
+#: login.defs.5.xml:397(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">TCB_AUTH_GROUP TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:403(para)
+#: login.defs.5.xml:406(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:420(para)
+#: login.defs.5.xml:423(para)
 msgid "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME <phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH ENV_SUPATH <phrase condition=\"no_pam\">ENV_TZ LOGIN_STRING MAIL_CHECK_ENAB MAIL_DIR MAIL_FILE QUOTAS_ENAB</phrase> SULOG_FILE SU_NAME <phrase condition=\"no_pam\">SU_WHEEL_ONLY</phrase> SYSLOG_SU_ENAB <phrase condition=\"no_pam\">USERGROUPS_ENAB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:435(term)
+#: login.defs.5.xml:438(term)
 msgid "sulogin"
 msgstr ""
 
-#: login.defs.5.xml:437(para)
+#: login.defs.5.xml:440(para)
 msgid "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:446(para)
+#: login.defs.5.xml:449(para)
 msgid "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 <phrase condition=\"tcb\">TCB_AUTH_GROUP TCB_SYMLINK USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:460(para)
+#: login.defs.5.xml:463(para)
 msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB <phrase condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:470(para)
+#: login.defs.5.xml:473(para)
 msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP <phrase condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:489(para)
+#: login.defs.5.xml:492(para)
 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 <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 ""
 
-#: login.defs.5.xml:505(para)
+#: login.defs.5.xml:508(para)
 msgid "<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>."
 msgstr ""
 
-#: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
+#: login.access.5.xml:39(refentrytitle) login.access.5.xml:46(refname)
 msgid "login.access"
 msgstr ""
 
-#: login.access.5.xml:41(refpurpose)
+#: login.access.5.xml:47(refpurpose)
 msgid "login access control table"
 msgstr ""
 
-#: login.access.5.xml:46(para)
+#: login.access.5.xml:52(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:52(para)
+#: login.access.5.xml:58(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, in case of non-networked logins, the first entry that matches the (user, tty) combination. The permissions field of that table entry determines whether the login will be accepted or refused."
 msgstr ""
 
-#: login.access.5.xml:60(para)
+#: login.access.5.xml:66(para)
 msgid "Each line of the login access control table has three fields separated by a \":\" character:"
 msgstr ""
 
-#: login.access.5.xml:65(para)
+#: login.access.5.xml:71(para)
 msgid "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</emphasis>:<emphasis remap=\"I\">origins</emphasis>"
 msgstr ""
 
-#: login.access.5.xml:69(para)
+#: login.access.5.xml:75(para)
 msgid "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or \"<emphasis>-</emphasis>\" (access denied) character. The second field should be a list of one or more login names, group names, or <emphasis>ALL</emphasis> (always matches). The third field should be a list of one or more tty names (for non-networked logins), host names, domain names (begin with \"<literal>.</literal>\"), host addresses, internet network numbers (end with \"<literal>.</literal>\"), <emphasis>ALL</emphasis> (always matches) or <emphasis>LOCAL</emphasis> (matches any string that does not contain a \"<literal>.</literal>\" character). If you run NIS you can use @netgroupname in host or user patterns."
 msgstr ""
 
-#: login.access.5.xml:83(para)
+#: login.access.5.xml:89(para)
 msgid "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very compact rules."
 msgstr ""
 
-#: login.access.5.xml:88(para)
+#: login.access.5.xml:94(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:76(refpurpose)
+#: login.1.xml:79(refpurpose)
 msgid "begin session on the system"
 msgstr ""
 
-#: 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)
+#: login.1.xml:85(arg) login.1.xml:93(arg) login.1.xml:100(arg) login.1.xml:217(option) groupmems.8.xml:57(arg)
 msgid "-p"
 msgstr ""
 
-#: login.1.xml:83(replaceable) login.1.xml:91(replaceable) login.1.xml:98(replaceable)
+#: login.1.xml:86(replaceable) login.1.xml:94(replaceable) login.1.xml:101(replaceable)
 msgid "host"
 msgstr ""
 
-#: login.1.xml:83(arg) login.1.xml:91(arg) chfn.1.xml:56(arg)
+#: login.1.xml:86(arg) login.1.xml:94(arg)
 msgid "-h <placeholder-1/>"
 msgstr ""
 
-#: login.1.xml:86(replaceable)
+#: login.1.xml:89(replaceable)
 msgid "ENV=VAR"
 msgstr ""
 
-#: login.1.xml:92(arg) login.1.xml:192(option) expiry.1.xml:54(arg)
+#: login.1.xml:95(arg) login.1.xml:195(option)
 msgid "-f"
 msgstr ""
 
-#: login.1.xml:98(arg) chfn.1.xml:54(arg)
+#: login.1.xml:101(arg)
 msgid "-r <placeholder-1/>"
 msgstr ""
 
-#: login.1.xml:104(para)
+#: login.1.xml:107(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 <emphasis remap=\"I\">login:</emphasis> prompt on the user's terminal. <command>login</command> may be special to the shell and may not be invoked as a sub-process. When called from a shell, <command>login</command> should be executed as <emphasis remap=\"B\">exec login</emphasis> which will cause the user to exit from the current shell (and thus will prevent the new logged in user to return to the session of the caller). Attempting to execute <command>login</command> from any shell but the login shell will produce an error message."
 msgstr ""
 
-#: login.1.xml:118(para)
+#: login.1.xml:121(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 failures are permitted before <command>login</command> exits and the communications link is severed."
 msgstr ""
 
-#: login.1.xml:125(para)
+#: login.1.xml:128(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 password and the new password before continuing. Please refer to <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry> for more information."
 msgstr ""
 
-#: login.1.xml:134(para)
+#: login.1.xml:137(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 file, <filename>/etc/motd</filename>, by creating a zero-length file <filename>.hushlogin</filename> in your login directory. The mail message will be one of \"<emphasis>You have new mail.</emphasis>\", \"<emphasis>You have mail.</emphasis>\", or \"<emphasis>No Mail.</emphasis>\" according to the condition of your mailbox."
 msgstr ""
 
-#: login.1.xml:145(para)
+#: login.1.xml:148(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>, <envar>$SHELL</envar>, <envar>$PATH</envar>, <envar>$LOGNAME</envar>, and <envar>$MAIL</envar> are set according to the appropriate fields in the password entry. Ulimit, umask and nice values may also be set according to entries in the GECOS field."
 msgstr ""
 
-#: login.1.xml:154(para)
+#: login.1.xml:157(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:160(para)
+#: login.1.xml:163(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:172(para) login.1.xml:248(para)
+#: login.1.xml:175(para) login.1.xml:251(para)
 msgid "The <command>login</command> program is NOT responsible for removing users from the utmp file. It is the responsibility of <citerefentry><refentrytitle>getty</refentrytitle><manvolnum>8</manvolnum></citerefentry> and <citerefentry><refentrytitle>init</refentrytitle><manvolnum>8</manvolnum></citerefentry> to clean up apparent ownership of a terminal session. If you use <command>login</command> from the shell prompt without <command>exec</command>, the user you use will continue to appear to be logged in even after you log out of the \"subsession\"."
 msgstr ""
 
-#: login.1.xml:195(para)
+#: login.1.xml:198(para)
 msgid "Do not perform authentication, user is preauthenticated."
 msgstr ""
 
-#: login.1.xml:198(para)
+#: login.1.xml:201(para)
 msgid "Note: In that case, <replaceable>username</replaceable> is mandatory."
 msgstr ""
 
-#: login.1.xml:206(option)
+#: login.1.xml:209(option)
 msgid "-h"
 msgstr ""
 
-#: login.1.xml:209(para)
+#: login.1.xml:212(para)
 msgid "Name of the remote host for this login."
 msgstr ""
 
-#: login.1.xml:217(para)
+#: login.1.xml:220(para)
 msgid "Preserve environment."
 msgstr ""
 
-#: login.1.xml:225(para)
+#: login.1.xml:225(option)
+msgid "-r"
+msgstr ""
+
+#: login.1.xml:228(para)
 msgid "Perform autologin protocol for rlogin."
 msgstr ""
 
-#: login.1.xml:230(para)
+#: login.1.xml:233(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:239(para)
+#: login.1.xml:242(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:244(para)
+#: login.1.xml:247(para)
 msgid "The location of files is subject to differences in system configuration."
 msgstr ""
 
-#: login.1.xml:260(para)
+#: login.1.xml:263(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 this to obtain the password of the next person coming to sit in front of the machine. Under Linux, the SAK mechanism can be used by users to initiate a trusted path and prevent this kind of attack."
 msgstr ""
 
-#: login.1.xml:325(filename)
+#: login.1.xml:328(filename)
 msgid "/var/log/wtmp"
 msgstr ""
 
-#: login.1.xml:327(para)
+#: login.1.xml:330(para)
 msgid "List of previous login sessions."
 msgstr ""
 
-#: login.1.xml:343(filename)
+#: login.1.xml:346(filename)
 msgid "/etc/motd"
 msgstr ""
 
-#: login.1.xml:345(para)
+#: login.1.xml:348(para)
 msgid "System message of the day file."
 msgstr ""
 
-#: login.1.xml:349(filename)
+#: login.1.xml:352(filename)
 msgid "/etc/nologin"
 msgstr ""
 
-#: login.1.xml:351(para)
+#: login.1.xml:354(para)
 msgid "Prevent non-root users from logging in."
 msgstr ""
 
-#: login.1.xml:355(filename)
+#: login.1.xml:358(filename)
 msgid "/etc/ttytype"
 msgstr ""
 
-#: login.1.xml:357(para)
+#: login.1.xml:360(para)
 msgid "List of terminal types."
 msgstr ""
 
-#: login.1.xml:361(filename)
+#: login.1.xml:364(filename)
 msgid "$HOME/.hushlogin"
 msgstr ""
 
-#: login.1.xml:363(para)
+#: login.1.xml:366(para)
 msgid "Suppress printing of system messages."
 msgstr ""
 
-#: login.1.xml:377(para)
+#: login.1.xml:380(para)
 msgid "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>securetty</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>getty</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
-#: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
+#: limits.5.xml:39(refentrytitle) limits.5.xml:46(refname)
 msgid "limits"
 msgstr ""
 
-#: limits.5.xml:41(refpurpose)
+#: limits.5.xml:47(refpurpose)
 msgid "resource limits definition"
 msgstr ""
 
-#: limits.5.xml:47(para)
+#: limits.5.xml:53(para)
 msgid "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</filename> by default or LIMITS_FILE defined <filename>config.h</filename>) describes the resource limits you wish to impose. It should be owned by root and readable by root account only."
 msgstr ""
 
-#: limits.5.xml:55(para)
+#: limits.5.xml:61(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:61(para)
+#: limits.5.xml:67(para)
 msgid "Each line describes a limit for a user in the form:"
 msgstr ""
 
-#: limits.5.xml:64(emphasis)
+#: limits.5.xml:70(emphasis)
 msgid "user LIMITS_STRING"
 msgstr ""
 
-#: limits.5.xml:67(para)
+#: limits.5.xml:73(para)
 msgid "or in the form:"
 msgstr ""
 
-#: limits.5.xml:70(emphasis)
+#: limits.5.xml:76(emphasis)
 msgid "@group LIMITS_STRING"
 msgstr ""
 
-#: limits.5.xml:73(para)
+#: limits.5.xml:79(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:79(para)
+#: limits.5.xml:85(para)
 msgid "The valid identifiers are:"
 msgstr ""
 
-#: limits.5.xml:82(para)
+#: limits.5.xml:88(para)
 msgid "A: max address space (KB)"
 msgstr ""
 
-#: limits.5.xml:83(para)
+#: limits.5.xml:89(para)
 msgid "C: max core file size (KB)"
 msgstr ""
 
-#: limits.5.xml:84(para)
+#: limits.5.xml:90(para)
 msgid "D: max data size (KB)"
 msgstr ""
 
-#: limits.5.xml:85(para)
+#: limits.5.xml:91(para)
 msgid "F: maximum filesize (KB)"
 msgstr ""
 
-#: limits.5.xml:86(para)
-msgid "M: max locked-in-memory address space (KB)"
+#: limits.5.xml:92(para)
+msgid "K: file creation mask, set by <citerefentry><refentrytitle>umask</refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
-#: limits.5.xml:87(para)
-msgid "N: max number of open files"
+#: limits.5.xml:97(para)
+msgid "I: max nice value (0..39 which translates to 20..-19)"
 msgstr ""
 
-#: limits.5.xml:88(para)
-msgid "R: max resident set size (KB)"
+#: limits.5.xml:99(para)
+msgid "L: max number of logins for this user"
 msgstr ""
 
-#: limits.5.xml:89(para)
-msgid "S: max stack size (KB)"
+#: limits.5.xml:100(para)
+msgid "M: max locked-in-memory address space (KB)"
 msgstr ""
 
-#: limits.5.xml:90(para)
-msgid "T: max CPU time (MIN)"
+#: limits.5.xml:101(para)
+msgid "N: max number of open files"
 msgstr ""
 
-#: limits.5.xml:91(para)
-msgid "U: max number of processes"
+#: limits.5.xml:102(para)
+msgid "O: max real time priority"
 msgstr ""
 
-#: limits.5.xml:92(para)
-msgid "K: file creation mask, set by <citerefentry><refentrytitle>umask</refentrytitle><manvolnum>2</manvolnum></citerefentry>."
+#: limits.5.xml:103(para)
+msgid "P: process priority, set by <citerefentry><refentrytitle>setpriority</refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
-#: limits.5.xml:97(para)
-msgid "L: max number of logins for this user"
+#: limits.5.xml:108(para)
+msgid "R: max resident set size (KB)"
 msgstr ""
 
-#: limits.5.xml:98(para)
-msgid "P: process priority, set by <citerefentry><refentrytitle>setpriority</refentrytitle><manvolnum>2</manvolnum></citerefentry>."
+#: limits.5.xml:109(para)
+msgid "S: max stack size (KB)"
 msgstr ""
 
-#: limits.5.xml:103(para)
-msgid "I: max nice value (0..39 which translates to 20..-19)"
+#: limits.5.xml:110(para)
+msgid "T: max CPU time (MIN)"
 msgstr ""
 
-#: limits.5.xml:105(para)
-msgid "O: max real time priority"
+#: limits.5.xml:111(para)
+msgid "U: max number of processes"
 msgstr ""
 
-#: limits.5.xml:108(para)
+#: limits.5.xml:114(para)
 msgid "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid <emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following entries are equivalent:"
 msgstr ""
 
-#: limits.5.xml:114(programlisting)
+#: limits.5.xml:120(programlisting)
 #, no-wrap
 msgid "\n      username L2D2048N5\n      username L2 D2048 N5\n    "
 msgstr ""
 
-#: limits.5.xml:119(para)
+#: limits.5.xml:125(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 invalid limits string will be rejected (not considered) by the <command>login</command> program."
 msgstr ""
 
-#: limits.5.xml:126(para)
+#: limits.5.xml:132(para)
 msgid "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you have multiple <emphasis remap=\"I\">default</emphasis> entries in your <emphasis>LIMITS_FILE</emphasis>, then the last one will be used as the default entry."
 msgstr ""
 
-#: limits.5.xml:133(para)
+#: limits.5.xml:139(para)
 msgid "The limits specified in the form \"<replaceable>@group</replaceable>\" apply to the members of the specified <replaceable>group</replaceable>."
 msgstr ""
 
-#: limits.5.xml:139(para)
-msgid "If a line with limits for an user exist, only the first line for this user will be considered."
+#: limits.5.xml:145(para)
+msgid "If more than one line with limits for an user exist, only the first line for this user will be considered."
 msgstr ""
 
-#: limits.5.xml:144(para)
-msgid "If no lines are specified for an user, the last <replaceable>@group</replaceable> line matching a group whose the user is a member of will be conisdered, or the last line with default limits if no groups contain the user)."
+#: limits.5.xml:150(para)
+msgid "If no lines are specified for an user, the last <replaceable>@group</replaceable> line matching a group whose the user is a member of will be considered, or the last line with default limits if no groups contain the user."
 msgstr ""
 
-#: limits.5.xml:151(para)
+#: limits.5.xml:157(para)
 msgid "To completely disable limits for a user, a single dash \"<emphasis>-</emphasis>\" will do."
 msgstr ""
 
-#: limits.5.xml:156(para)
+#: limits.5.xml:162(para)
 msgid "To disable a limit for a user, a single dash \"<replaceable>-</replaceable>\" can be used instead of the numerical value for this limit."
 msgstr ""
 
-#: limits.5.xml:162(para)
+#: limits.5.xml:168(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:173(filename)
+#: limits.5.xml:179(filename)
 msgid "/etc/limits"
 msgstr ""
 
-#: limits.5.xml:181(para)
+#: limits.5.xml:187(para)
 msgid "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>setpriority</refentrytitle><manvolnum>2</manvolnum></citerefentry>, <citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
-#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname) lastlog.8.xml:46(command)
+#: lastlog.8.xml:39(refentrytitle) lastlog.8.xml:46(refname) lastlog.8.xml:52(command)
 msgid "lastlog"
 msgstr ""
 
-#: lastlog.8.xml:41(refpurpose)
+#: lastlog.8.xml:47(refpurpose)
 msgid "reports the most recent login of all users or of a given user"
 msgstr ""
 
-#: lastlog.8.xml:55(para)
+#: lastlog.8.xml:61(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</emphasis>, <emphasis>port</emphasis>, and <emphasis>last login time</emphasis> will be printed. The default (no flags) causes lastlog entries to be printed, sorted by their order in <filename>/etc/passwd</filename>."
 msgstr ""
 
-#: lastlog.8.xml:67(para)
+#: lastlog.8.xml:73(para)
 msgid "The options which apply to the <command>lastlog</command> command are:"
 msgstr ""
 
-#: lastlog.8.xml:72(term)
+#: lastlog.8.xml:78(term)
 msgid "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
 
-#: lastlog.8.xml:76(para)
+#: lastlog.8.xml:82(para)
 msgid "Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
 msgstr ""
 
-#: lastlog.8.xml:90(term) faillog.8.xml:157(term)
+#: lastlog.8.xml:109(term) faillog.8.xml:176(term)
 msgid "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
 msgstr ""
 
-#: lastlog.8.xml:95(para)
+#: lastlog.8.xml:114(para)
 msgid "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</emphasis>."
 msgstr ""
 
-#: lastlog.8.xml:102(term) faillog.8.xml:168(term)
+#: lastlog.8.xml:121(term) faillog.8.xml:187(term)
 msgid "<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>|<replaceable>RANGE</replaceable>"
 msgstr ""
 
-#: lastlog.8.xml:107(para)
+#: lastlog.8.xml:126(para)
 msgid "Print the lastlog record of the specified user(s)."
 msgstr ""
 
-#: lastlog.8.xml:110(para) faillog.8.xml:178(para)
+#: lastlog.8.xml:129(para) faillog.8.xml:197(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</replaceable> of users can be specified with a min and max values (<replaceable>UID_MIN-UID_MAX</replaceable>), a max value (<replaceable>-UID_MAX</replaceable>), or a min value (<replaceable>UID_MIN-</replaceable>)."
 msgstr ""
 
-#: lastlog.8.xml:122(para)
+#: lastlog.8.xml:141(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:127(para)
+#: lastlog.8.xml:146(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:197(title)
+#: lastlog.8.xml:154(title) groups.1.xml:71(title) chsh.1.xml:122(title) chage.1.xml:213(title)
 msgid "NOTE"
 msgstr ""
 
-#: lastlog.8.xml:136(para)
+#: lastlog.8.xml:155(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, so its size on the disk is usually much smaller than the one shown by \"<command>ls -l</command>\" (which can indicate a really big file if you have in <filename>passwd</filename> users with a high UID). You can display its real size with \"<command>ls -s</command>\"."
 msgstr ""
 
-#: lastlog.8.xml:150(filename)
+#: lastlog.8.xml:169(filename)
 msgid "/var/log/lastlog"
 msgstr ""
 
-#: lastlog.8.xml:152(para)
+#: lastlog.8.xml:171(para)
 msgid "Database times of previous user logins."
 msgstr ""
 
-#: lastlog.8.xml:160(para)
+#: lastlog.8.xml:179(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 users with UID between 170 and 800 lastlog will appear to hang as it processes entries with UIDs 171-799)."
 msgstr ""
 
-#: gshadow.5.xml:33(refentrytitle) gshadow.5.xml:38(refname)
+#: gshadow.5.xml:37(refentrytitle) gshadow.5.xml:44(refname)
 msgid "gshadow"
 msgstr ""
 
-#: gshadow.5.xml:39(refpurpose)
+#: gshadow.5.xml:45(refpurpose)
 msgid "shadowed group file"
 msgstr ""
 
-#: gshadow.5.xml:44(para)
+#: gshadow.5.xml:50(para)
 msgid "<filename>/etc/gshadow</filename> contains the shadowed information for group accounts."
 msgstr ""
 
-#: gshadow.5.xml:54(para)
+#: gshadow.5.xml:60(para)
 msgid "Each line of this file contains the following colon-separated fields:"
 msgstr ""
 
-#: gshadow.5.xml:60(emphasis)
+#: gshadow.5.xml:66(emphasis)
 msgid "group name"
 msgstr ""
 
-#: gshadow.5.xml:62(para)
+#: gshadow.5.xml:68(para)
 msgid "It must be a valid group name, which exist on the system."
 msgstr ""
 
-#: gshadow.5.xml:75(para)
+#: gshadow.5.xml:81(para)
 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 *, users will not be able to use a unix password to access the group (but group members do not need the password)."
 msgstr ""
 
-#: gshadow.5.xml:82(para)
+#: gshadow.5.xml:88(para)
 msgid "The password is used when an user who is not a member of the group wants to gain the permissions of this group (see <citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></citerefentry>)."
 msgstr ""
 
-#: gshadow.5.xml:88(para)
+#: gshadow.5.xml:94(para)
 msgid "This field may be empty, in which case only the group members can gain the group permissions."
 msgstr ""
 
-#: gshadow.5.xml:98(para)
+#: gshadow.5.xml:104(para)
 msgid "This password supersedes any password specified in <filename>/etc/group</filename>."
 msgstr ""
 
-#: gshadow.5.xml:106(emphasis)
+#: gshadow.5.xml:112(emphasis)
 msgid "administrators"
 msgstr ""
 
-#: gshadow.5.xml:108(para) gshadow.5.xml:124(para)
+#: gshadow.5.xml:114(para) gshadow.5.xml:130(para)
 msgid "It must be a comma-separated list of user names."
 msgstr ""
 
-#: gshadow.5.xml:111(para)
+#: gshadow.5.xml:117(para)
 msgid "Administrators can change the password or the members of the group."
 msgstr ""
 
-#: gshadow.5.xml:115(para)
+#: gshadow.5.xml:121(para)
 msgid "Administrators also have the same permissions as the members (see below)."
 msgstr ""
 
-#: gshadow.5.xml:122(emphasis)
+#: gshadow.5.xml:128(emphasis)
 msgid "members"
 msgstr ""
 
-#: gshadow.5.xml:127(para)
+#: gshadow.5.xml:133(para)
 msgid "Members can access the group without being prompted for a password."
 msgstr ""
 
-#: gshadow.5.xml:131(para)
+#: gshadow.5.xml:137(para)
 msgid "You should use the same list of users as in <filename>/etc/group</filename>."
 msgstr ""
 
-#: gshadow.5.xml:160(para)
+#: gshadow.5.xml:166(para)
 msgid "<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 ""
 
-#: grpck.8.xml:44(refpurpose)
+#: grpck.8.xml:47(refpurpose)
 msgid "verify integrity of group files"
 msgstr ""
 
-#: grpck.8.xml:70(para)
+#: grpck.8.xml:65(para)
 msgid "The <command>grpck</command> command verifies the integrity of the groups information. It checks that all entries in <filename>/etc/group</filename><phrase condition=\"gshadow\">and <filename>/etc/gshadow</filename></phrase> have the proper format and contain valid data. The user is prompted to delete entries that are improperly formatted or which have other uncorrectable errors."
 msgstr ""
 
-#: grpck.8.xml:87(para)
+#: grpck.8.xml:82(para)
 msgid "a unique and valid group name"
 msgstr ""
 
-#: grpck.8.xml:90(para)
+#: grpck.8.xml:85(para)
 msgid "a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/group</filename> only)</phrase>"
 msgstr ""
 
-#: grpck.8.xml:97(para)
+#: grpck.8.xml:92(para)
 msgid "a valid list of members <phrase condition=\"gshadow\"> and administrators</phrase>"
 msgstr ""
 
-#: grpck.8.xml:103(para)
+#: grpck.8.xml:98(para)
 msgid "a corresponding entry in the <filename>/etc/gshadow</filename> file (respectively <filename>/etc/group</filename> for the <filename>gshadow</filename> checks)"
 msgstr ""
 
-#: grpck.8.xml:111(para)
+#: grpck.8.xml:106(para)
 msgid "The checks for correct number of fields and unique group name are fatal. If an entry has the wrong number of fields, the user will be prompted to delete the entire line. If the user does not answer affirmatively, all further checks are bypassed. An entry with a duplicated group name is prompted for deletion, but the remaining checks will still be made. All other errors are warnings and the user is encouraged to run the <command>groupmod</command> command to correct the error."
 msgstr ""
 
-#: grpck.8.xml:122(para)
+#: grpck.8.xml:117(para)
 msgid "The commands which operate on the <filename>/etc/group</filename><phrase condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and <filename>/etc/gshadow</filename> files</phrase> are not able to alter corrupted or duplicated entries. <command>grpck</command> should be used in those circumstances to remove the offending entries."
 msgstr ""
 
-#: grpck.8.xml:134(para)
+#: grpck.8.xml:133(para)
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr ""
 
-#: grpck.8.xml:141(para)
+#: grpck.8.xml:146(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:151(para)
+#: grpck.8.xml:169(para)
 msgid "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow\">and <filename>/etc/gshadow</filename></phrase> by GID."
 msgstr ""
 
-#: grpck.8.xml:160(para)
+#: grpck.8.xml:178(para)
 msgid "By default, <command>grpck</command> operates on <filename>/etc/group</filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</filename></phrase>. The user may select alternate files with the <emphasis remap=\"I\">group</emphasis><phrase condition=\"no_gshadow\">parameter.</phrase><phrase condition=\"gshadow\">and <emphasis remap=\"I\">shadow</emphasis> parameters.</phrase>"
 msgstr ""
 
-#: grpck.8.xml:228(para)
+#: grpck.8.xml:246(para)
 msgid "one or more bad group entries"
 msgstr ""
 
-#: grpck.8.xml:234(para)
+#: grpck.8.xml:252(para)
 msgid "can't open group files"
 msgstr ""
 
-#: grpck.8.xml:240(para)
+#: grpck.8.xml:258(para)
 msgid "can't lock group files"
 msgstr ""
 
-#: grpck.8.xml:246(para)
+#: grpck.8.xml:264(para)
 msgid "can't update group files"
 msgstr ""
 
-#: grpck.8.xml:210(para)
+#: grpck.8.xml:228(para)
 msgid "The <command>grpck</command> command exits with the following values: <placeholder-1/>"
 msgstr ""
 
-#: grpck.8.xml:255(para)
+#: grpck.8.xml:273(para)
 msgid "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition=\"gshadow\"><citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum>, </citerefentry>, </phrase><citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname) groups.1.xml:45(command)
+#: groups.1.xml:38(refentrytitle) groups.1.xml:45(refname) groups.1.xml:51(command)
 msgid "groups"
 msgstr ""
 
-#: groups.1.xml:40(refpurpose)
+#: groups.1.xml:46(refpurpose)
 msgid "display current group names"
 msgstr ""
 
-#: groups.1.xml:47(replaceable) chfn.1.xml:58(replaceable)
+#: groups.1.xml:53(replaceable)
 msgid "user"
 msgstr ""
 
-#: groups.1.xml:54(para)
+#: groups.1.xml:60(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/group</filename>, the value will be displayed as the numerical group value. The optional <emphasis remap=\"I\">user</emphasis> parameter will display the groups for the named <emphasis remap=\"I\">user</emphasis>."
 msgstr ""
 
-#: 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 <command>newgrp</command> or <command>sg</command> to change their current real and effective group ID."
+#: groups.1.xml:72(para)
+msgid "Systems which do not support concurrent group sets will have the information from <filename>/etc/group</filename> reported. The user must use <command>newgrp</command> or <command>sg</command> to change his current real and effective group ID."
 msgstr ""
 
-#: groups.1.xml:88(para)
+#: groups.1.xml:94(para)
 msgid "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>getgid</refentrytitle><manvolnum>2</manvolnum></citerefentry>, <citerefentry><refentrytitle>getgroups</refentrytitle><manvolnum>2</manvolnum></citerefentry>, <citerefentry><refentrytitle>getuid</refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
-#: groupmod.8.xml:44(refpurpose)
+#: groupmod.8.xml:47(refpurpose)
 msgid "modify a group definition on the system"
 msgstr ""
 
-#: groupmod.8.xml:53(replaceable)
+#: groupmod.8.xml:56(replaceable) groupdel.8.xml:56(replaceable)
 msgid "GROUP"
 msgstr ""
 
-#: groupmod.8.xml:59(para)
+#: groupmod.8.xml:62(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:68(para)
+#: groupmod.8.xml:71(para)
 msgid "The options which apply to the <command>groupmod</command> command are:"
 msgstr ""
 
-#: groupmod.8.xml:74(term) groupadd.8.xml:93(term)
+#: groupmod.8.xml:77(term) groupadd.8.xml:95(term)
 msgid "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 
-#: groupmod.8.xml:78(para)
+#: groupmod.8.xml:81(para)
 msgid "The group ID of the given <replaceable>GROUP</replaceable> will be changed to <replaceable>GID</replaceable>."
 msgstr ""
 
-#: groupmod.8.xml:82(para)
+#: groupmod.8.xml:85(para)
 msgid "The value of <replaceable>GID</replaceable> must be a non-negative decimal integer. This value must be unique, unless the <option>-o</option> option is used. Values between 0 and 999 are typically reserved for system groups."
 msgstr ""
 
-#: groupmod.8.xml:89(para)
+#: groupmod.8.xml:92(para)
+msgid "Users who use the group as primary group will be updated to keep the group as their primary group."
+msgstr ""
+
+#: groupmod.8.xml:96(para)
 msgid "Any files that have the old group ID and must continue to belong to <replaceable>GROUP</replaceable>, must have their group ID changed manually."
 msgstr ""
 
-#: groupmod.8.xml:104(term)
+#: groupmod.8.xml:111(term)
 msgid "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</replaceable>"
 msgstr ""
 
-#: groupmod.8.xml:109(para)
+#: groupmod.8.xml:116(para)
 msgid "The name of the group will be changed from <replaceable>GROUP</replaceable> to <replaceable>NEW_GROUP</replaceable> name."
 msgstr ""
 
-#: groupmod.8.xml:120(para)
+#: groupmod.8.xml:127(para)
 msgid "When used with the <option>-g</option> option, allow to change the group <replaceable>GID</replaceable> to a non-unique value."
 msgstr ""
 
-#: groupmod.8.xml:219(para)
+#: groupmod.8.xml:245(para)
 msgid "group name already in use"
 msgstr ""
 
-#: groupmod.8.xml:183(para)
+#: groupmod.8.xml:209(para)
 msgid "The <command>groupmod</command> command exits with the following values: <placeholder-1/>"
 msgstr ""
 
-#: groupmod.8.xml:234(para)
+#: groupmod.8.xml:260(para)
 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>groupdel</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>."
 msgstr ""
 
-#: groupmems.8.xml:44(refpurpose)
+#: groupmems.8.xml:47(refpurpose)
 msgid "administer members of a user's primary group"
 msgstr ""
 
-#: groupmems.8.xml:51(replaceable) groupmems.8.xml:52(replaceable)
+#: groupmems.8.xml:54(replaceable) groupmems.8.xml:55(replaceable)
 msgid "user_name"
 msgstr ""
 
-#: groupmems.8.xml:51(arg)
+#: groupmems.8.xml:54(arg)
 msgid "-a <placeholder-1/>"
 msgstr ""
 
-#: groupmems.8.xml:52(arg)
+#: groupmems.8.xml:55(arg)
 msgid "-d <placeholder-1/>"
 msgstr ""
 
-#: groupmems.8.xml:53(replaceable)
+#: groupmems.8.xml:56(replaceable)
 msgid "group_name"
 msgstr ""
 
-#: groupmems.8.xml:53(arg)
+#: groupmems.8.xml:56(arg)
 msgid "-g <placeholder-1/>"
 msgstr ""
 
-#: groupmems.8.xml:54(arg)
+#: groupmems.8.xml:57(arg)
 msgid "-l"
 msgstr ""
 
-#: groupmems.8.xml:61(para)
+#: groupmems.8.xml:64(para)
 msgid "The <command>groupmems</command> command allows a user to administer his/her own group membership list without the requirement of superuser privileges. The <command>groupmems</command> utility is for systems that configure its users to be in their own name sake primary group (i.e., guest / guest)."
 msgstr ""
 
-#: groupmems.8.xml:69(para)
+#: groupmems.8.xml:72(para)
 msgid "Only the superuser, as administrator, can use <command>groupmems</command> to alter the memberships of other groups."
 msgstr ""
 
-#: groupmems.8.xml:76(para)
+#: groupmems.8.xml:79(para)
 msgid "The options which apply to the <command>groupmems</command> command are:"
 msgstr ""
 
-#: groupmems.8.xml:82(term)
+#: groupmems.8.xml:85(term)
 msgid "<option>-a</option>, <option>--add</option><replaceable>user_name</replaceable>"
 msgstr ""
 
-#: groupmems.8.xml:84(para)
+#: groupmems.8.xml:87(para)
 msgid "Add an user to the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:85(para) groupmems.8.xml:101(para) groupmems.8.xml:132(para)
+#: groupmems.8.xml:88(para) groupmems.8.xml:104(para) groupmems.8.xml:135(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)
+#: groupmems.8.xml:96(term)
 msgid "<option>-d</option>, <option>--delete</option><replaceable>user_name</replaceable>"
 msgstr ""
 
-#: groupmems.8.xml:95(para)
+#: groupmems.8.xml:98(para)
 msgid "Delete a user from the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:96(para)
+#: groupmems.8.xml:99(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:109(term)
+#: groupmems.8.xml:112(term)
 msgid "<option>-g</option>, <option>--group</option><replaceable>group_name</replaceable>"
 msgstr ""
 
-#: groupmems.8.xml:111(para)
+#: groupmems.8.xml:114(para)
 msgid "The superuser can specify which group membership list to modify."
 msgstr ""
 
-#: groupmems.8.xml:123(term) chage.1.xml:132(term)
+#: groupmems.8.xml:126(term) chage.1.xml:135(term)
 msgid "<option>-l</option>, <option>--list</option>"
 msgstr ""
 
-#: groupmems.8.xml:125(para)
+#: groupmems.8.xml:128(para)
 msgid "List the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:129(term)
+#: groupmems.8.xml:132(term)
 msgid "<option>-p</option>, <option>--purge</option>"
 msgstr ""
 
-#: groupmems.8.xml:131(para)
+#: groupmems.8.xml:134(para)
 msgid "Purge all users from the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:143(title)
+#: groupmems.8.xml:159(title)
 msgid "SETUP"
 msgstr ""
 
-#: groupmems.8.xml:144(para)
+#: groupmems.8.xml:160(para)
 msgid "The <command>groupmems</command> executable should be in mode <literal>2770</literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</emphasis>. The system administrator can add users to group <emphasis>groups</emphasis> to allow or disallow them using the <command>groupmems</command> utility to manage their own group membership list."
 msgstr ""
 
-#: groupmems.8.xml:153(programlisting)
+#: groupmems.8.xml:169(programlisting)
 #, no-wrap
 msgid "\n\t$ groupadd -r groups\n\t$ chmod 2770 groupmems\n\t$ chown root.groups groupmems\n\t$ groupmems -g groups -a gk4\n    "
 msgstr ""
 
-#: groupmems.8.xml:185(para)
+#: groupmems.8.xml:201(para)
 msgid "secure group account information"
 msgstr ""
 
-#: groupmems.8.xml:193(para)
+#: groupmems.8.xml:209(para)
 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>groupadd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</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>."
 msgstr ""
 
-#: groupdel.8.xml:44(refpurpose)
+#: groupdel.8.xml:47(refpurpose)
 msgid "delete a group"
 msgstr ""
 
-#: 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."
+#: groupdel.8.xml:62(para)
+msgid "The <command>groupdel</command> command modifies the system account files, deleting all entries that refer to <replaceable>GROUP</replaceable>. The named group must exist."
 msgstr ""
 
-#: groupdel.8.xml:66(para)
+#: groupdel.8.xml:70(para)
+msgid "The options which apply to the <command>groupdel</command> command are:"
+msgstr ""
+
+#: groupdel.8.xml:99(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:70(para)
+#: groupdel.8.xml:103(para)
 msgid "You should manually check all file systems to ensure that no files remain owned by this group."
 msgstr ""
 
-#: groupdel.8.xml:132(para)
+#: groupdel.8.xml:165(para)
 msgid "can't remove user's primary group"
 msgstr ""
 
-#: groupdel.8.xml:108(para)
+#: groupdel.8.xml:141(para)
 msgid "The <command>groupdel</command> command exits with the following values: <placeholder-1/>"
 msgstr ""
 
-#: groupdel.8.xml:147(para)
-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>"
+#: groupdel.8.xml:180(para)
+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>."
 msgstr ""
 
-#: groupadd.8.xml:47(refpurpose)
+#: groupadd.8.xml:49(refpurpose)
 msgid "create a new group"
 msgstr ""
 
-#: groupadd.8.xml:64(para)
+#: groupadd.8.xml:66(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:73(para)
+#: groupadd.8.xml:75(para)
 msgid "The options which apply to the <command>groupadd</command> command are:"
 msgstr ""
 
-#: groupadd.8.xml:83(para)
+#: groupadd.8.xml:85(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 specified GID already exists, another (unique) GID is chosen (i.e. <option>-g</option> is turned off)."
 msgstr ""
 
-#: groupadd.8.xml:97(para)
+#: groupadd.8.xml:99(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 default is to use the smallest ID value greater than 999 and greater than every other group. Values between 0 and 999 are typically reserved for system accounts."
 msgstr ""
 
-#: groupadd.8.xml:117(para)
+#: groupadd.8.xml:119(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:122(para)
+#: groupadd.8.xml:124(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:126(para)
+#: groupadd.8.xml:128(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:138(para)
+#: groupadd.8.xml:140(para)
 msgid "This option permits to add a group with a non-unique GID."
 msgstr ""
 
-#: groupadd.8.xml:170(para)
+#: groupadd.8.xml:172(para)
 msgid "Create a system group."
 msgstr ""
 
-#: groupadd.8.xml:173(para)
+#: groupadd.8.xml:175(para)
 msgid "The numeric identifiers of new system groups are chosen in the <option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in <filename>login.defs</filename>, instead of <option>GID_MIN</option>-<option>GID_MAX</option>."
 msgstr ""
 
-#: groupadd.8.xml:224(para)
+#: groupadd.8.xml:239(para)
 msgid "Groupnames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes. They can end with a dollar sign. In regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 
-#: groupadd.8.xml:230(para)
+#: groupadd.8.xml:245(para)
 msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr ""
 
-#: groupadd.8.xml:233(para)
+#: groupadd.8.xml:248(para)
 msgid "You may not add a NIS or LDAP group. This must be performed on the corresponding server."
 msgstr ""
 
-#: groupadd.8.xml:237(para)
+#: groupadd.8.xml:252(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:270(para)
+#: groupadd.8.xml:285(para)
 msgid "GID not unique (when <option>-o</option> not used)"
 msgstr ""
 
-#: groupadd.8.xml:276(para)
+#: groupadd.8.xml:291(para)
 msgid "group name not unique"
 msgstr ""
 
-#: groupadd.8.xml:246(para)
+#: groupadd.8.xml:261(para)
 msgid "The <command>groupadd</command> command exits with the following values: <placeholder-1/>"
 msgstr ""
 
-#: groupadd.8.xml:291(para)
+#: groupadd.8.xml:306(para)
 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>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>, <citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
-#: gpasswd.1.xml:49(phrase)
+#: gpasswd.1.xml:52(phrase)
 msgid "administer <placeholder-1/>"
 msgstr ""
 
-#: gpasswd.1.xml:52(phrase)
+#: gpasswd.1.xml:55(phrase)
 msgid "administer <placeholder-1/> and <placeholder-2/>"
 msgstr ""
 
-#: gpasswd.1.xml:63(replaceable)
+#: gpasswd.1.xml:66(replaceable) expiry.1.xml:57(replaceable)
 msgid "option"
 msgstr ""
 
-#: gpasswd.1.xml:73(para)
+#: gpasswd.1.xml:76(para)
 msgid "The <command>gpasswd</command> command is used to administer <filename>/etc/group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</filename></phrase>. Every group can have <phrase condition=\"gshadow\">administrators,</phrase> members and a password."
 msgstr ""
 
-#: gpasswd.1.xml:81(para)
+#: gpasswd.1.xml:84(para)
 msgid "System administrators can use the <option>-A</option> option to define group administrator(s) and the <option>-M</option> option to define members. They have all rights of group administrators and members."
 msgstr ""
 
-#: gpasswd.1.xml:86(para)
+#: gpasswd.1.xml:89(para)
 msgid "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group administrator</phrase><phrase condition=\"no_gshadow\">a system administrator</phrase> with a group name only prompts for the new password of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:93(para)
+#: gpasswd.1.xml:96(para)
 msgid "If a password is set the members can still use <citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></citerefentry> without a password, and non-members must supply the password."
 msgstr ""
 
-#: gpasswd.1.xml:101(title)
+#: gpasswd.1.xml:104(title)
 msgid "Notes about group passwords"
 msgstr ""
 
-#: gpasswd.1.xml:102(para)
+#: gpasswd.1.xml:105(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:113(para)
+#: gpasswd.1.xml:116(para)
 msgid "Except for the <option>-A</option> and <option>-M</option> options, the options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:117(para)
+#: gpasswd.1.xml:120(para)
 msgid "The options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:120(para)
+#: gpasswd.1.xml:123(para)
 msgid "The options which apply to the <command>gpasswd</command> command are:"
 msgstr ""
 
-#: gpasswd.1.xml:125(term)
+#: gpasswd.1.xml:128(term)
 msgid "<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
 msgstr ""
 
-#: gpasswd.1.xml:129(para)
+#: gpasswd.1.xml:132(para)
 msgid "Add the <replaceable>user</replaceable> to the named <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:138(term)
+#: gpasswd.1.xml:141(term)
 msgid "<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
 msgstr ""
 
-#: gpasswd.1.xml:142(para)
+#: gpasswd.1.xml:145(para)
 msgid "Remove the <replaceable>user</replaceable> from the named <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:159(term)
+#: gpasswd.1.xml:162(term)
+msgid "<option>-Q</option>, <option>--root</option><replaceable>CHROOT_DIR</replaceable>"
+msgstr ""
+
+#: gpasswd.1.xml:177(term)
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr ""
 
-#: gpasswd.1.xml:163(para)
+#: gpasswd.1.xml:181(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:174(term)
+#: gpasswd.1.xml:192(term)
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr ""
 
-#: gpasswd.1.xml:178(para)
+#: gpasswd.1.xml:196(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:189(term)
+#: gpasswd.1.xml:207(term)
 msgid "<option>-A</option>, <option>--administrators</option><replaceable>user</replaceable>,..."
 msgstr ""
 
-#: gpasswd.1.xml:193(para)
+#: gpasswd.1.xml:211(para)
 msgid "Set the list of administrative users."
 msgstr ""
 
-#: gpasswd.1.xml:201(term)
+#: gpasswd.1.xml:219(term)
 msgid "<option>-M</option>, <option>--members</option><replaceable>user</replaceable>,..."
 msgstr ""
 
-#: gpasswd.1.xml:205(para)
+#: gpasswd.1.xml:223(para)
 msgid "Set the list of group members."
 msgstr ""
 
-#: gpasswd.1.xml:215(para)
+#: gpasswd.1.xml:233(para)
 msgid "This tool only operates on the <filename>/etc/group</filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</phrase><phrase condition=\"no_gshadow\">file.</phrase> Thus you cannot change any NIS or LDAP group. This must be performed on the corresponding server."
 msgstr ""
 
-#: gpasswd.1.xml:260(para)
+#: gpasswd.1.xml:278(para)
 msgid "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</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>grpck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry><phrase condition=\"gshadow\">, <citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></citerefentry></phrase>."
 msgstr ""
 
-#: 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:86(refentrytitle)
+#: faillog.8.xml:38(refentrytitle) faillog.8.xml:45(refname) faillog.8.xml:51(command) faillog.5.xml:38(refentrytitle) faillog.5.xml:45(refname) faillog.5.xml:92(refentrytitle)
 msgid "faillog"
 msgstr ""
 
-#: faillog.8.xml:40(refpurpose)
+#: faillog.8.xml:46(refpurpose)
 msgid "display faillog records or set login failure limits"
 msgstr ""
 
-#: faillog.8.xml:54(para)
+#: faillog.8.xml:60(para)
 msgid "<command>faillog</command> displays the contents of the failure log database (<filename>/var/log/faillog</filename>). It can also set the failure counters and limits. When <command>faillog</command> is run without arguments, it only displays the faillog records of the users who had a login failure."
 msgstr ""
 
-#: faillog.8.xml:65(para)
+#: faillog.8.xml:71(para)
 msgid "The options which apply to the <command>faillog</command> command are:"
 msgstr ""
 
-#: faillog.8.xml:73(para)
+#: faillog.8.xml:79(para)
 msgid "Display (or act on) faillog records for all users having an entry in the <filename>faillog</filename> database."
 msgstr ""
 
-#: faillog.8.xml:77(para)
+#: faillog.8.xml:83(para)
 msgid "The range of users can be restricted with the <option>-u</option> option."
 msgstr ""
 
-#: faillog.8.xml:81(para)
+#: faillog.8.xml:87(para)
 msgid "In display mode, this is still restricted to existing users but forces the display of the faillog entries even if they are empty."
 msgstr ""
 
-#: faillog.8.xml:86(para)
+#: faillog.8.xml:92(para)
 msgid "With the <option>-l</option>, <option>-m</option>, <option>-r</option>, <option>-t</option> options, the users' records are changed, even if the user does not exist on the system. This is useful to reset records of users that have been deleted or to set a policy in advance for a range of users."
 msgstr ""
 
-#: faillog.8.xml:103(term)
+#: faillog.8.xml:109(term)
 msgid "<option>-l</option>, <option>--lock-secs</option><replaceable>SEC</replaceable>"
 msgstr ""
 
-#: faillog.8.xml:108(para)
+#: faillog.8.xml:114(para)
 msgid "Lock account for <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
 
-#: faillog.8.xml:112(para) faillog.8.xml:138(para) faillog.8.xml:150(para)
+#: faillog.8.xml:118(para) faillog.8.xml:144(para) faillog.8.xml:156(para)
 msgid "Write access to <filename>/var/log/faillog</filename> is required for this option."
 msgstr ""
 
-#: faillog.8.xml:119(term)
+#: faillog.8.xml:125(term)
 msgid "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 
-#: faillog.8.xml:124(para)
+#: faillog.8.xml:130(para)
 msgid "Set the maximum number of login failures after the account is disabled to <replaceable>MAX</replaceable>."
 msgstr ""
 
-#: faillog.8.xml:128(para)
+#: faillog.8.xml:134(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:133(para)
+#: faillog.8.xml:139(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:145(term)
+#: faillog.8.xml:151(term)
 msgid "<option>-r</option>, <option>--reset</option>"
 msgstr ""
 
-#: faillog.8.xml:147(para)
+#: faillog.8.xml:153(para)
 msgid "Reset the counters of login failures."
 msgstr ""
 
-#: faillog.8.xml:161(para)
+#: faillog.8.xml:180(para)
 msgid "Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr ""
 
-#: faillog.8.xml:173(para)
+#: faillog.8.xml:192(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 the specified user(s)."
 msgstr ""
 
-#: faillog.8.xml:191(para)
+#: faillog.8.xml:210(para)
 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 ""
 
-#: faillog.8.xml:200(para)
+#: faillog.8.xml:219(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 <option>-u</option> flag, or print out all users with the <option>-a</option> flag."
 msgstr ""
 
-#: faillog.8.xml:213(filename) faillog.5.xml:74(filename)
+#: faillog.8.xml:232(filename) faillog.5.xml:80(filename)
 msgid "/var/log/faillog"
 msgstr ""
 
-#: faillog.8.xml:215(para) faillog.5.xml:76(para)
+#: faillog.8.xml:234(para) faillog.5.xml:82(para)
 msgid "Failure logging file."
 msgstr ""
 
-#: faillog.8.xml:223(para)
+#: faillog.8.xml:242(para)
 msgid "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>faillog</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: faillog.5.xml:40(refpurpose)
+#: faillog.5.xml:46(refpurpose)
 msgid "login failure logging file"
 msgstr ""
 
-#: faillog.5.xml:45(para)
+#: faillog.5.xml:51(para)
 msgid "<filename>/var/log/faillog</filename> maintains a count of login failures and the limits for each account."
 msgstr ""
 
-#: faillog.5.xml:49(para)
-msgid "The file contains fixed length records, indexed by numerical UID. Each record contains the count of login failures since the last successful login; the maximum number of failures before the account is disabled; the line on whiche the last login failure occurred; the date of the last login failure; and the duration (in seconds) during which the account will be locked after a failure."
+#: faillog.5.xml:55(para)
+msgid "The file contains fixed length records, indexed by numerical UID. Each record contains the count of login failures since the last successful login; the maximum number of failures before the account is disabled; the line on which the last login failure occurred; the date of the last login failure; and the duration (in seconds) during which the account will be locked after a failure."
 msgstr ""
 
-#: faillog.5.xml:59(para)
+#: faillog.5.xml:65(para)
 msgid "The structure of the file is:"
 msgstr ""
 
-#: faillog.5.xml:60(programlisting)
+#: faillog.5.xml:66(programlisting)
 #, no-wrap
 msgid "\nstruct\tfaillog {\n\tshort   fail_cnt;\n\tshort   fail_max;\n\tchar    fail_line[12];\n\ttime_t  fail_time;\n\tlong    fail_locktime;\n};"
 msgstr ""
 
-#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname) expiry.1.xml:52(command)
+#: expiry.1.xml:42(refentrytitle) expiry.1.xml:49(refname) expiry.1.xml:55(command)
 msgid "expiry"
 msgstr ""
 
-#: expiry.1.xml:47(refpurpose)
+#: expiry.1.xml:50(refpurpose)
 msgid "check and enforce password expiration policy"
 msgstr ""
 
-#: expiry.1.xml:60(para)
+#: expiry.1.xml:64(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:87(para) chage.1.xml:278(para)
+#: expiry.1.xml:73(para)
+msgid "The options which apply to the <command>expiry</command> command are:"
+msgstr ""
+
+#: expiry.1.xml:78(term)
+msgid "<option>-c</option>, <option>--check</option>"
+msgstr ""
+
+#: expiry.1.xml:80(para)
+msgid "Check the password expiration of the current user."
+msgstr ""
+
+#: expiry.1.xml:86(para)
+msgid "Force a password change if the current user has an expired password."
+msgstr ""
+
+#: expiry.1.xml:121(para) chage.1.xml:294(para)
 msgid "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: chsh.1.xml:46(refpurpose)
+#: chsh.1.xml:49(refpurpose)
 msgid "change login shell"
 msgstr ""
 
-#: chsh.1.xml:63(para)
+#: chsh.1.xml:66(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 only change the login shell for her own account; the superuser may change the login shell for any account."
 msgstr ""
 
-#: chsh.1.xml:74(para)
+#: chsh.1.xml:77(para)
 msgid "The options which apply to the <command>chsh</command> command are:"
 msgstr ""
 
-#: chsh.1.xml:96(para)
+#: chsh.1.xml:112(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 login shell. Enter the new value to change the shell, or leave the line blank to use the current one. The current shell is displayed between a pair of <emphasis>[ ]</emphasis> marks."
 msgstr ""
 
-#: chsh.1.xml:107(para)
+#: chsh.1.xml:123(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 superuser, and then any value may be added. An account with a restricted login shell may not change her login shell. For this reason, placing <filename>/bin/rsh</filename> in <filename>/etc/shells</filename> is discouraged since accidentally changing to a restricted shell would prevent the user from ever changing her login shell back to its original value."
 msgstr ""
 
-#: chsh.1.xml:142(filename)
+#: chsh.1.xml:158(filename)
 msgid "/etc/shells"
 msgstr ""
 
-#: chsh.1.xml:144(para)
+#: chsh.1.xml:160(para)
 msgid "List of valid login shells."
 msgstr ""
 
-#: chsh.1.xml:158(para)
+#: chsh.1.xml:174(para)
 msgid "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: chpasswd.8.xml:47(refpurpose)
+#: chpasswd.8.xml:50(refpurpose)
 msgid "update passwords in batch mode"
 msgstr ""
 
-#: chpasswd.8.xml:61(para)
+#: chpasswd.8.xml:64(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 group of existing users. Each line is of the format:"
 msgstr ""
 
-#: chpasswd.8.xml:66(para)
+#: chpasswd.8.xml:69(para)
 msgid "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</emphasis>"
 msgstr ""
 
-#: chpasswd.8.xml:70(para)
+#: chpasswd.8.xml:73(para)
 msgid "By default the passwords must be supplied in clear-text, and are encrypted by <command>chpasswd</command>. Also the password age will be updated, if present."
 msgstr ""
 
-#: chpasswd.8.xml:75(para)
+#: chpasswd.8.xml:78(para)
 msgid "The default encryption algorithm can be defined for the system with the <option>ENCRYPT_METHOD</option> or <option>MD5_CRYPT_ENAB</option> variables of <filename>/etc/login.defs</filename>, and can be overwitten with the <option>-e</option>, <option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
-#: chpasswd.8.xml:83(para)
+#: chpasswd.8.xml:86(para)
 msgid "By default, passwords are encrypted by PAM, but (even if not recommended) you can select a different encryption method with the <option>-e</option>, <option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
-#: chpasswd.8.xml:89(para)
+#: chpasswd.8.xml:92(para)
 msgid "<phrase condition=\"pam\">Except when PAM is used to encrypt the passwords,</phrase><command>chpasswd</command> first updates all the passwords in memory, and then commits all the changes to disk if no errors occured for any user."
 msgstr ""
 
-#: chpasswd.8.xml:95(para)
+#: chpasswd.8.xml:98(para)
 msgid "When PAM is used to encrypt the passwords (and update the passwords in the system database) then if a password cannot be updated <command>chpasswd</command> continues updating the passwords of the next users, and will return an error code on exit."
 msgstr ""
 
-#: chpasswd.8.xml:101(para) chgpasswd.8.xml:81(para)
+#: chpasswd.8.xml:104(para) chgpasswd.8.xml:84(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:109(para)
+#: chpasswd.8.xml:112(para)
 msgid "The options which apply to the <command>chpasswd</command> command are:"
 msgstr ""
 
-#: chpasswd.8.xml:115(term)
+#: chpasswd.8.xml:118(term)
 msgid "<option>-c</option>, <option>--crypt-method</option><replaceable>METHOD</replaceable>"
 msgstr ""
 
-#: chpasswd.8.xml:121(para) chgpasswd.8.xml:98(para)
+#: chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
 msgid "The available methods are DES, MD5, and NONE."
 msgstr ""
 
-#: chpasswd.8.xml:128(para)
+#: chpasswd.8.xml:131(para)
 msgid "By default, PAM is used to encrypt the passwords."
 msgstr ""
 
-#: chpasswd.8.xml:131(para)
+#: chpasswd.8.xml:134(para)
 msgid "By default (if none of the <option>-c</option>, <option>-m</option>, or <option>-e</option> options are specified), the encryption method is defined by the <option>ENCRYPT_METHOD</option> or <option>MD5_CRYPT_ENAB</option> variables of <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: chpasswd.8.xml:142(term) chgpasswd.8.xml:108(term)
+#: chpasswd.8.xml:145(term) chgpasswd.8.xml:111(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr ""
 
-#: chpasswd.8.xml:144(para) chgpasswd.8.xml:110(para)
+#: chpasswd.8.xml:147(para) chgpasswd.8.xml:113(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr ""
 
-#: chpasswd.8.xml:158(term) chgpasswd.8.xml:120(term)
+#: chpasswd.8.xml:161(term) chgpasswd.8.xml:123(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr ""
 
-#: chpasswd.8.xml:160(para) chgpasswd.8.xml:122(para)
+#: chpasswd.8.xml:163(para) chgpasswd.8.xml:125(para)
 msgid "Use MD5 encryption instead of DES when the supplied passwords are not encrypted."
 msgstr ""
 
-#: chpasswd.8.xml:167(term)
+#: chpasswd.8.xml:183(term)
 msgid "<option>-s</option>, <option>--sha-rounds</option><replaceable>ROUNDS</replaceable>"
 msgstr ""
 
-#: chpasswd.8.xml:187(para)
+#: chpasswd.8.xml:203(para)
 msgid "By default, the number of rounds is defined by the <option>SHA_CRYPT_MIN_ROUNDS</option> and <option>SHA_CRYPT_MAX_ROUNDS</option> variables in <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: chpasswd.8.xml:200(para) chgpasswd.8.xml:158(para)
+#: chpasswd.8.xml:216(para) chgpasswd.8.xml:174(para)
 msgid "Remember to set permissions or umask to prevent readability of unencrypted files by other users."
 msgstr ""
 
-#: chpasswd.8.xml:244(filename)
+#: chpasswd.8.xml:260(filename)
 msgid "/etc/pam.d/chpasswd"
 msgstr ""
 
-#: chpasswd.8.xml:246(para)
+#: chpasswd.8.xml:262(para)
 msgid "PAM configuration for <command>chpasswd</command>."
 msgstr ""
 
-#: chpasswd.8.xml:254(para)
+#: chpasswd.8.xml:270(para)
 msgid "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, </phrase><citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
-#: chgpasswd.8.xml:48(refpurpose)
+#: chgpasswd.8.xml:51(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr ""
 
-#: chgpasswd.8.xml:62(para)
+#: chgpasswd.8.xml:65(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 of existing groups. Each line is of the format:"
 msgstr ""
 
-#: chgpasswd.8.xml:67(para)
+#: chgpasswd.8.xml:70(para)
 msgid "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</emphasis>"
 msgstr ""
 
-#: chgpasswd.8.xml:71(para)
+#: chgpasswd.8.xml:74(para)
 msgid "By default the supplied password must be in clear-text, and is encrypted by <command>chgpasswd</command>."
 msgstr ""
 
-#: 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 overwiten with the <option>-e</option>, <option>-m</option>, or <option>-c</option> options."
+#: chgpasswd.8.xml:78(para)
+msgid "The default encryption algorithm can be defined for the system with the <option>ENCRYPT_METHOD</option> variable of <filename>/etc/login.defs</filename>, and can be overwiten with the <option>-e</option>, <option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
-#: chgpasswd.8.xml:89(para)
+#: chgpasswd.8.xml:92(para)
 msgid "The options which apply to the <command>chgpasswd</command> command are:"
 msgstr ""
 
-#: chgpasswd.8.xml:209(para)
+#: chgpasswd.8.xml:225(para)
 msgid "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: chfn.1.xml:47(refpurpose)
+#: chfn.1.xml:49(refpurpose)
 msgid "change real user name and information"
 msgstr ""
 
-#: chfn.1.xml:53(replaceable)
-msgid "full_name"
+#: chfn.1.xml:66(para)
+msgid "The <command>chfn</command> command changes user fullname, office room number, office phone number, and home phone number information for a user's account. This information is typically printed by <citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></citerefentry> and similar programs. A normal user may only change the fields for her own account, subject to the restrictions in <filename>/etc/login.defs</filename>. (The default configuration is to prevent users from changing their fullname.) The superuser may change any field for any account. Additionally, only the superuser may use the <option>-o</option> option to change the undefined portions of the GECOS field."
 msgstr ""
 
-#: chfn.1.xml:53(arg)
-msgid "-f <placeholder-1/>"
+#: chfn.1.xml:80(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. It is also recommended to avoid non-US-ASCII characters, but this is only enforced for the phone numbers. The <emphasis remap=\"I\">other</emphasis> field is used to store accounting information used by other applications."
 msgstr ""
 
-#: chfn.1.xml:54(replaceable)
-msgid "room_no"
+#: chfn.1.xml:93(para)
+msgid "The options which apply to the <command>chfn</command> command are:"
 msgstr ""
 
-#: chfn.1.xml:55(replaceable)
-msgid "work_ph"
+#: chfn.1.xml:98(term)
+msgid "<option>-f</option>, <option>--full-name</option><replaceable>FULL_NAME</replaceable>"
 msgstr ""
 
-#: chfn.1.xml:55(arg)
-msgid "-w <placeholder-1/>"
+#: chfn.1.xml:102(para)
+msgid "Change the user's full name."
 msgstr ""
 
-#: chfn.1.xml:56(replaceable)
-msgid "home_ph"
+#: chfn.1.xml:106(term)
+msgid "<option>-h</option>, <option>--home-phone</option><replaceable>HOME_PHONE</replaceable>"
 msgstr ""
 
-#: chfn.1.xml:57(replaceable)
-msgid "other"
+#: chfn.1.xml:110(para)
+msgid "Change the user's home phone number."
 msgstr ""
 
-#: chfn.1.xml:57(arg)
-msgid "-o <placeholder-1/>"
+#: chfn.1.xml:114(term)
+msgid "<option>-o</option>, <option>--other</option><replaceable>OTHER</replaceable>"
 msgstr ""
 
-#: 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. This information is typically printed by <citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></citerefentry> and similar programs. A normal user may only change the fields for her own account, subject to the restrictions in <filename>/etc/login.defs</filename>. (The default configuration is to prevent users from changing their fullname.) The superuser may change any field for any account. Additionally, only the superuser may use the <option>-o</option> option to change the undefined portions of the GECOS field."
+#: chfn.1.xml:118(para)
+msgid "Change the user's other GECOS information. This field is used to store accounting information used by other applications, and can be changed only by a superuser."
 msgstr ""
 
-#: 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. It is also recommended to avoid non-US-ASCII characters, but this is only enforced for the phone numbers. The <emphasis remap=\"I\">other</emphasis> field is used to store accounting information used by other applications."
+#: chfn.1.xml:126(term)
+msgid "<option>-r</option>, <option>--room</option><replaceable>ROOM_NUMBER</replaceable>"
 msgstr ""
 
-#: chfn.1.xml:87(para)
+#: chfn.1.xml:130(para)
+msgid "Change the user's room number."
+msgstr ""
+
+#: chfn.1.xml:147(term)
+msgid "<option>-u</option>, <option>--help</option>"
+msgstr ""
+
+#: chfn.1.xml:155(term)
+msgid "<option>-w</option>, <option>--work-phone</option><replaceable>WORK_PHONE</replaceable>"
+msgstr ""
+
+#: chfn.1.xml:159(para)
+msgid "Change the user's office phone number."
+msgstr ""
+
+#: chfn.1.xml:163(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 the fields. Enter the new value to change the field, or leave the line blank to use the current value. The current value is displayed between a pair of <emphasis remap=\"B\">[ ]</emphasis> marks. Without options, <command>chfn</command> prompts for the current user account."
 msgstr ""
 
-#: chfn.1.xml:132(para)
+#: chfn.1.xml:208(para)
 msgid "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: chage.1.xml:44(refpurpose)
+#: chage.1.xml:47(refpurpose)
 msgid "change user password expiry information"
 msgstr ""
 
-#: chage.1.xml:60(para)
+#: chage.1.xml:63(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:70(para)
+#: chage.1.xml:73(para)
 msgid "The options which apply to the <command>chage</command> command are:"
 msgstr ""
 
-#: chage.1.xml:75(term)
+#: chage.1.xml:78(term)
 msgid "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</replaceable>"
 msgstr ""
 
-#: chage.1.xml:79(para)
+#: chage.1.xml:82(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:87(term)
+#: chage.1.xml:90(term)
 msgid "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</replaceable>"
 msgstr ""
 
-#: chage.1.xml:91(para)
+#: chage.1.xml:94(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 format YYYY-MM-DD (or the format more commonly used in your area). A user whose account is locked must contact the system administrator before being able to use the system again."
 msgstr ""
 
-#: chage.1.xml:99(para)
+#: chage.1.xml:102(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:113(term)
+#: chage.1.xml:116(term)
 msgid "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</replaceable>"
 msgstr ""
 
-#: chage.1.xml:117(para)
+#: chage.1.xml:120(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 number of days of inactivity. A user whose account is locked must contact the system administrator before being able to use the system again."
 msgstr ""
 
-#: chage.1.xml:124(para)
+#: chage.1.xml:127(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:136(para)
+#: chage.1.xml:139(para)
 msgid "Show account aging information."
 msgstr ""
 
-#: chage.1.xml:142(term)
+#: chage.1.xml:145(term)
 msgid "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</replaceable>"
 msgstr ""
 
-#: chage.1.xml:154(term)
+#: chage.1.xml:157(term)
 msgid "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</replaceable>"
 msgstr ""
 
-#: chage.1.xml:158(para)
+#: chage.1.xml:161(para)
 msgid "Set the maximum number of days during which a password is valid. When <replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> is less than the current day, the user will be required to change his/her password before being able to use his/her account. This occurrence can be planned for in advance by use of the <option>-W</option> option, which provides the user with advance warning."
 msgstr ""
 
-#: chage.1.xml:167(para)
+#: chage.1.xml:170(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:175(term)
+#: chage.1.xml:191(term)
 msgid "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</replaceable>"
 msgstr ""
 
-#: chage.1.xml:179(para)
+#: chage.1.xml:195(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 the password expiring that a user will be warned his/her password is about to expire."
 msgstr ""
 
-#: chage.1.xml:188(para)
+#: chage.1.xml:204(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 the fields. Enter the new value to change the field, or leave the line blank to use the current value. The current value is displayed between a pair of <emphasis>[ ]</emphasis> marks."
 msgstr ""
 
-#: chage.1.xml:198(para)
+#: chage.1.xml:214(para)
 msgid "The <command>chage</command> program requires a shadow password file to be available."
 msgstr ""
 
-#: chage.1.xml:202(para)
+#: chage.1.xml:218(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:267(replaceable)
+#: chage.1.xml:283(replaceable)
 msgid "15"
 msgstr ""
 
-#: chage.1.xml:269(para)
+#: chage.1.xml:285(para)
 msgid "can't find the shadow password file"
 msgstr ""
 
-#: chage.1.xml:245(para)
+#: chage.1.xml:261(para)
 msgid "The <command>chage</command> command exits with the following values: <placeholder-1/>"
 msgstr ""
 

Modified: upstream/trunk/man/po/sv.po
===================================================================
--- upstream/trunk/man/po/sv.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/man/po/sv.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: man pages for shadow 4.0.18\n"
-"POT-Creation-Date: 2010-08-29 17:54+0200\n"
+"POT-Creation-Date: 2011-11-13 18:43+0100\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"
@@ -15,75 +15,104 @@
 # This file is distributed under the same license as the shadow package.
 # Daniel Nylander <po at danielnylander.se>, 2006.
 #
-#: vipw.8.xml:39(refentrytitle) vipw.8.xml:44(refname) vipw.8.xml:53(command)
-#: login.defs.5.xml:477(term)
+#: vipw.8.xml:40(refentrytitle) vipw.8.xml:47(refname) vipw.8.xml:56(command)
+#: login.defs.5.xml:480(term)
 msgid "vipw"
 msgstr "vipw"
 
-#: vipw.8.xml:40(manvolnum) usermod.8.xml:42(manvolnum)
-#: userdel.8.xml:44(manvolnum) userdel.8.xml:203(replaceable)
-#: useradd.8.xml:53(manvolnum) pwconv.8.xml:44(manvolnum)
-#: pwck.8.xml:44(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:130(replaceable)
-#: groupadd.8.xml:42(manvolnum) faillog.8.xml:35(manvolnum)
-#: faillog.5.xml:86(manvolnum) chpasswd.8.xml:42(manvolnum)
-#: chgpasswd.8.xml:43(manvolnum)
+#: vipw.8.xml:41(manvolnum) usermod.8.xml:43(manvolnum)
+#: userdel.8.xml:45(manvolnum) userdel.8.xml:219(replaceable)
+#: useradd.8.xml:54(manvolnum) pwconv.8.xml:45(manvolnum)
+#: pwck.8.xml:45(manvolnum) nologin.8.xml:39(manvolnum)
+#: newusers.8.xml:52(manvolnum) logoutd.8.xml:39(manvolnum)
+#: lastlog.8.xml:40(manvolnum) grpck.8.xml:40(manvolnum)
+#: groupmod.8.xml:40(manvolnum) groupmems.8.xml:40(manvolnum)
+#: groupdel.8.xml:40(manvolnum) groupdel.8.xml:163(replaceable)
+#: groupadd.8.xml:42(manvolnum) faillog.8.xml:39(manvolnum)
+#: faillog.5.xml:92(manvolnum) chpasswd.8.xml:43(manvolnum)
+#: chgpasswd.8.xml:44(manvolnum)
 msgid "8"
 msgstr "8"
 
-#: vipw.8.xml:41(refmiscinfo) usermod.8.xml:43(refmiscinfo)
-#: userdel.8.xml:45(refmiscinfo) useradd.8.xml:54(refmiscinfo)
-#: pwconv.8.xml:45(refmiscinfo) pwck.8.xml:45(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:43(refmiscinfo) faillog.8.xml:36(refmiscinfo)
-#: chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
+#: vipw.8.xml:42(refmiscinfo) usermod.8.xml:44(refmiscinfo)
+#: userdel.8.xml:46(refmiscinfo) useradd.8.xml:55(refmiscinfo)
+#: pwconv.8.xml:46(refmiscinfo) pwck.8.xml:46(refmiscinfo)
+#: nologin.8.xml:40(refmiscinfo) newusers.8.xml:53(refmiscinfo)
+#: logoutd.8.xml:40(refmiscinfo) lastlog.8.xml:41(refmiscinfo)
+#: grpck.8.xml:41(refmiscinfo) groupmod.8.xml:41(refmiscinfo)
+#: groupmems.8.xml:41(refmiscinfo) groupdel.8.xml:41(refmiscinfo)
+#: groupadd.8.xml:43(refmiscinfo) faillog.8.xml:40(refmiscinfo)
+#: chpasswd.8.xml:44(refmiscinfo) chgpasswd.8.xml:45(refmiscinfo)
 msgid "System Management Commands"
 msgstr "Systemhanteringskommandon"
 
-#: vipw.8.xml:45(refname) vipw.8.xml:59(command)
+#: vipw.8.xml:43(refmiscinfo) usermod.8.xml:45(refmiscinfo)
+#: userdel.8.xml:47(refmiscinfo) useradd.8.xml:56(refmiscinfo)
+#: suauth.5.xml:41(refmiscinfo) su.1.xml:58(refmiscinfo)
+#: sg.1.xml:42(refmiscinfo) shadow.5.xml:41(refmiscinfo)
+#: shadow.3.xml:41(refmiscinfo) pwconv.8.xml:47(refmiscinfo)
+#: pwck.8.xml:47(refmiscinfo) porttime.5.xml:41(refmiscinfo)
+#: passwd.5.xml:41(refmiscinfo) passwd.1.xml:48(refmiscinfo)
+#: nologin.8.xml:41(refmiscinfo) newusers.8.xml:54(refmiscinfo)
+#: newgrp.1.xml:42(refmiscinfo) logoutd.8.xml:41(refmiscinfo)
+#: login.defs.5.xml:104(refmiscinfo) login.access.5.xml:42(refmiscinfo)
+#: login.1.xml:74(refmiscinfo) limits.5.xml:42(refmiscinfo)
+#: lastlog.8.xml:42(refmiscinfo) gshadow.5.xml:40(refmiscinfo)
+#: grpck.8.xml:42(refmiscinfo) groups.1.xml:41(refmiscinfo)
+#: groupmod.8.xml:42(refmiscinfo) groupmems.8.xml:42(refmiscinfo)
+#: groupdel.8.xml:42(refmiscinfo) groupadd.8.xml:44(refmiscinfo)
+#: gpasswd.1.xml:46(refmiscinfo) faillog.8.xml:41(refmiscinfo)
+#: faillog.5.xml:41(refmiscinfo) expiry.1.xml:45(refmiscinfo)
+#: chsh.1.xml:44(refmiscinfo) chpasswd.8.xml:45(refmiscinfo)
+#: chgpasswd.8.xml:46(refmiscinfo) chfn.1.xml:44(refmiscinfo)
+#: chage.1.xml:42(refmiscinfo)
+#, fuzzy
+#| msgid "shadow"
+msgid "shadow-utils"
+msgstr "shadow"
+
+#: vipw.8.xml:48(refname) vipw.8.xml:62(command)
 msgid "vigr"
 msgstr "vigr"
 
-#: vipw.8.xml:46(refpurpose)
+#: vipw.8.xml:49(refpurpose)
 msgid "edit the password, group, shadow-password or shadow-group file"
 msgstr "redigera lösenordet, grupp, skugglösenord eller skuggruppfil"
 
-#: vipw.8.xml:55(replaceable) vipw.8.xml:61(replaceable)
-#: usermod.8.xml:54(replaceable) userdel.8.xml:54(arg)
-#: useradd.8.xml:64(replaceable) useradd.8.xml:76(replaceable)
-#: su.1.xml:66(replaceable) passwd.1.xml:57(replaceable)
-#: newusers.8.xml:63(replaceable) lastlog.8.xml:48(replaceable)
-#: groupmod.8.xml:51(replaceable) groupadd.8.xml:54(replaceable)
-#: faillog.8.xml:47(replaceable) chsh.1.xml:53(replaceable)
-#: chpasswd.8.xml:54(replaceable) chgpasswd.8.xml:55(replaceable)
-#: chage.1.xml:50(replaceable)
+#: vipw.8.xml:58(replaceable) vipw.8.xml:64(replaceable)
+#: usermod.8.xml:57(replaceable) userdel.8.xml:57(arg)
+#: useradd.8.xml:67(replaceable) useradd.8.xml:79(replaceable)
+#: su.1.xml:69(replaceable) pwconv.8.xml:62(replaceable)
+#: pwconv.8.xml:68(replaceable) pwconv.8.xml:74(replaceable)
+#: pwconv.8.xml:80(replaceable) pwck.8.xml:58(arg)
+#: passwd.1.xml:60(replaceable) newusers.8.xml:66(replaceable)
+#: lastlog.8.xml:54(replaceable) grpck.8.xml:53(arg)
+#: groupmod.8.xml:54(replaceable) groupdel.8.xml:54(replaceable)
+#: groupadd.8.xml:56(replaceable) faillog.8.xml:53(replaceable)
+#: chsh.1.xml:56(replaceable) chpasswd.8.xml:57(replaceable)
+#: chgpasswd.8.xml:58(replaceable) chfn.1.xml:56(replaceable)
+#: chage.1.xml:53(replaceable)
 msgid "options"
 msgstr "flaggor"
 
-#: vipw.8.xml:67(title) usermod.8.xml:61(title) userdel.8.xml:62(title)
-#: useradd.8.xml:82(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:71(title) pwck.8.xml:86(title)
-#: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
-#: nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title)
-#: logoutd.8.xml:50(title) login.defs.5.xml:110(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:63(title) gpasswd.1.xml:72(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:59(title)
+#: vipw.8.xml:70(title) usermod.8.xml:64(title) userdel.8.xml:65(title)
+#: useradd.8.xml:85(title) suauth.5.xml:56(title) su.1.xml:80(title)
+#: sg.1.xml:62(title) shadow.5.xml:50(title) shadow.3.xml:99(title)
+#: shadow.3.xml:155(title) pwconv.8.xml:86(title) pwck.8.xml:73(title)
+#: porttime.5.xml:50(title) passwd.5.xml:50(title) passwd.1.xml:69(title)
+#: nologin.8.xml:56(title) newusers.8.xml:75(title) newgrp.1.xml:58(title)
+#: logoutd.8.xml:56(title) login.defs.5.xml:113(title)
+#: login.access.5.xml:51(title) login.1.xml:106(title) limits.5.xml:52(title)
+#: lastlog.8.xml:60(title) gshadow.5.xml:49(title) grpck.8.xml:64(title)
+#: groups.1.xml:59(title) groupmod.8.xml:61(title) groupmems.8.xml:63(title)
+#: groupdel.8.xml:61(title) groupadd.8.xml:65(title) gpasswd.1.xml:75(title)
+#: faillog.8.xml:59(title) faillog.5.xml:50(title) expiry.1.xml:63(title)
+#: chsh.1.xml:65(title) chpasswd.8.xml:63(title) chgpasswd.8.xml:64(title)
+#: chfn.1.xml:65(title) chage.1.xml:62(title)
 msgid "DESCRIPTION"
 msgstr "BESKRIVNING"
 
-#: vipw.8.xml:68(para)
+#: vipw.8.xml:71(para)
 #, fuzzy
 msgid ""
 "The <command>vipw</command> and <command>vigr</command> commands edits the "
@@ -108,17 +137,18 @@
 "envar> och till sist standardredigeraren, <citerefentry><refentrytitle>vi</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: vipw.8.xml:85(title) usermod.8.xml:69(title) userdel.8.xml:71(title)
-#: useradd.8.xml:100(title) su.1.xml:123(title) pwck.8.xml:170(title)
-#: passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title)
-#: lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title)
-#: groupmems.8.xml:75(title) groupadd.8.xml:72(title) gpasswd.1.xml:112(title)
-#: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:108(title)
-#: chgpasswd.8.xml:88(title) chage.1.xml:69(title)
+#: vipw.8.xml:88(title) usermod.8.xml:72(title) userdel.8.xml:74(title)
+#: useradd.8.xml:103(title) su.1.xml:126(title) pwconv.8.xml:168(title)
+#: pwck.8.xml:157(title) passwd.1.xml:155(title) newusers.8.xml:244(title)
+#: login.1.xml:191(title) lastlog.8.xml:72(title) grpck.8.xml:128(title)
+#: groupmod.8.xml:70(title) groupmems.8.xml:78(title) groupdel.8.xml:69(title)
+#: groupadd.8.xml:74(title) gpasswd.1.xml:115(title) faillog.8.xml:70(title)
+#: expiry.1.xml:72(title) chsh.1.xml:76(title) chpasswd.8.xml:111(title)
+#: chgpasswd.8.xml:91(title) chfn.1.xml:92(title) chage.1.xml:72(title)
 msgid "OPTIONS"
 msgstr "FLAGGOR"
 
-#: vipw.8.xml:86(para)
+#: vipw.8.xml:89(para)
 msgid ""
 "The options which apply to the <command>vipw</command> and <command>vigr</"
 "command> commands are:"
@@ -126,83 +156,118 @@
 "Flaggorna som gäller för kommandona <command>vipw</command> och "
 "<command>vigr</command> är:"
 
-#: vipw.8.xml:92(term)
+#: vipw.8.xml:95(term)
 msgid "<option>-g</option>, <option>--group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: vipw.8.xml:94(para)
+#: vipw.8.xml:97(para)
 msgid "Edit group database."
 msgstr "Redigera gruppdatabasen."
 
-#: vipw.8.xml:98(term) userdel.8.xml:101(term) useradd.8.xml:250(term)
-#: passwd.1.xml:192(term) newusers.8.xml:257(term) lastlog.8.xml:82(term)
-#: groupmod.8.xml:98(term) groupmems.8.xml:117(term) groupadd.8.xml:107(term)
-#: gpasswd.1.xml:151(term) faillog.8.xml:97(term) chsh.1.xml:79(term)
-#: chpasswd.8.xml:150(term) chgpasswd.8.xml:114(term) chage.1.xml:107(term)
+#: vipw.8.xml:101(term) userdel.8.xml:104(term) useradd.8.xml:253(term)
+#: pwconv.8.xml:176(term) pwck.8.xml:167(term) passwd.1.xml:195(term)
+#: newusers.8.xml:262(term) lastlog.8.xml:88(term) grpck.8.xml:138(term)
+#: groupmod.8.xml:105(term) groupmems.8.xml:120(term) groupdel.8.xml:76(term)
+#: groupadd.8.xml:109(term) gpasswd.1.xml:154(term) faillog.8.xml:103(term)
+#: expiry.1.xml:93(term) chsh.1.xml:82(term) chpasswd.8.xml:153(term)
+#: chgpasswd.8.xml:117(term) chage.1.xml:110(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
-#: vipw.8.xml:100(para) userdel.8.xml:103(para) useradd.8.xml:252(para)
-#: passwd.1.xml:194(para) newusers.8.xml:259(para) lastlog.8.xml:86(para)
-#: groupmod.8.xml:100(para) groupmems.8.xml:119(para) groupadd.8.xml:109(para)
-#: gpasswd.1.xml:153(para) faillog.8.xml:99(para) chsh.1.xml:81(para)
-#: chpasswd.8.xml:152(para) chgpasswd.8.xml:116(para) chage.1.xml:109(para)
+#: vipw.8.xml:103(para) userdel.8.xml:106(para) useradd.8.xml:255(para)
+#: pwconv.8.xml:178(para) pwck.8.xml:169(para) passwd.1.xml:197(para)
+#: newusers.8.xml:264(para) lastlog.8.xml:92(para) grpck.8.xml:140(para)
+#: groupmod.8.xml:107(para) groupmems.8.xml:122(para) groupdel.8.xml:78(para)
+#: groupadd.8.xml:111(para) gpasswd.1.xml:156(para) faillog.8.xml:105(para)
+#: expiry.1.xml:95(para) chsh.1.xml:84(para) chpasswd.8.xml:155(para)
+#: chgpasswd.8.xml:119(para) chfn.1.xml:151(para) chage.1.xml:112(para)
 msgid "Display help message and exit."
 msgstr "Visa hjälpmeddelande och avsluta."
 
-#: vipw.8.xml:104(term)
+#: vipw.8.xml:107(term)
 msgid "<option>-p</option>, <option>--passwd</option>"
 msgstr "<option>-p</option>, <option>--passwd</option>"
 
-#: vipw.8.xml:106(para)
+#: vipw.8.xml:109(para)
 msgid "Edit passwd database."
 msgstr "Redigera lösenordsdatabasen."
 
-#: vipw.8.xml:110(term) passwd.1.xml:259(term)
+#: vipw.8.xml:113(term) pwck.8.xml:173(term) passwd.1.xml:262(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:112(para) passwd.1.xml:263(para)
+#: vipw.8.xml:115(para) passwd.1.xml:266(para)
 msgid "Quiet mode."
 msgstr "Tyst läge."
 
-#: vipw.8.xml:116(term)
+#: vipw.8.xml:119(term) usermod.8.xml:298(term) userdel.8.xml:127(term)
+#: useradd.8.xml:438(term) pwconv.8.xml:182(term) pwck.8.xml:190(term)
+#: passwd.1.xml:282(term) newusers.8.xml:287(term) lastlog.8.xml:96(term)
+#: grpck.8.xml:154(term) groupmod.8.xml:156(term) groupmems.8.xml:143(term)
+#: groupdel.8.xml:82(term) groupadd.8.xml:184(term) faillog.8.xml:163(term)
+#: chsh.1.xml:88(term) chpasswd.8.xml:170(term) chgpasswd.8.xml:132(term)
+#: chfn.1.xml:134(term) chage.1.xml:178(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-R</option>, <option>--root</option><replaceable>CHROOT_DIR</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HEM_KAT</"
+"replaceable>"
+
+#: vipw.8.xml:124(para) usermod.8.xml:303(para) userdel.8.xml:132(para)
+#: useradd.8.xml:443(para) pwconv.8.xml:187(para) pwck.8.xml:195(para)
+#: passwd.1.xml:287(para) newusers.8.xml:292(para) lastlog.8.xml:101(para)
+#: grpck.8.xml:159(para) groupmod.8.xml:161(para) groupmems.8.xml:148(para)
+#: groupdel.8.xml:87(para) groupadd.8.xml:189(para) gpasswd.1.xml:167(para)
+#: faillog.8.xml:168(para) chsh.1.xml:93(para) chpasswd.8.xml:175(para)
+#: chgpasswd.8.xml:137(para) chfn.1.xml:139(para) chage.1.xml:183(para)
+msgid ""
+"Apply changes in the <replaceable>CHROOT_DIR</replaceable> directory and use "
+"the configuration files from the <replaceable>CHROOT_DIR</replaceable> "
+"directory."
+msgstr ""
+
+#: vipw.8.xml:132(term)
 msgid "<option>-s</option>, <option>--shadow</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: vipw.8.xml:118(para)
+#: vipw.8.xml:134(para)
 msgid "Edit shadow or gshadow database."
 msgstr "Redigera shadow- eller gshadow-databasen."
 
-#: vipw.8.xml:122(term)
+#: vipw.8.xml:138(term)
 #, fuzzy
 #| msgid "<option>-q</option>, <option>--quiet</option>"
 msgid "<option>-u</option>, <option>--user</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:124(para)
+#: vipw.8.xml:140(para)
 msgid "Indicates which user's tcb shadow file to edit."
 msgstr ""
 
-#: vipw.8.xml:131(title) usermod.8.xml:374(title) userdel.8.xml:127(title)
-#: useradd.8.xml:629(title) su.1.xml:310(title) sg.1.xml:76(title)
-#: pwconv.8.xml:164(title) pwck.8.xml:230(title) passwd.1.xml:356(title)
-#: newusers.8.xml:324(title) newgrp.1.xml:87(title) login.1.xml:272(title)
-#: grpck.8.xml:173(title) groupmod.8.xml:152(title) groupmems.8.xml:162(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:185(title) gpasswd.1.xml:226(title)
-#: chsh.1.xml:120(title) chpasswd.8.xml:207(title) chgpasswd.8.xml:169(title)
-#: chfn.1.xml:99(title) chage.1.xml:210(title)
+#: vipw.8.xml:147(title) usermod.8.xml:404(title) userdel.8.xml:143(title)
+#: useradd.8.xml:645(title) su.1.xml:320(title) sg.1.xml:79(title)
+#: pwconv.8.xml:209(title) pwck.8.xml:234(title) passwd.1.xml:372(title)
+#: newusers.8.xml:342(title) newgrp.1.xml:90(title) login.1.xml:275(title)
+#: grpck.8.xml:191(title) groupmod.8.xml:172(title) groupmems.8.xml:178(title)
+#: groupdel.8.xml:110(title) groupadd.8.xml:200(title)
+#: gpasswd.1.xml:244(title) chsh.1.xml:136(title) chpasswd.8.xml:223(title)
+#: chgpasswd.8.xml:185(title) chfn.1.xml:175(title) chage.1.xml:226(title)
 msgid "CONFIGURATION"
 msgstr ""
 
-#: vipw.8.xml:132(para) usermod.8.xml:375(para) userdel.8.xml:128(para)
-#: useradd.8.xml:630(para) su.1.xml:311(para) sg.1.xml:77(para)
-#: pwck.8.xml:231(para) passwd.1.xml:357(para) newusers.8.xml:325(para)
-#: newgrp.1.xml:88(para) login.1.xml:273(para) grpck.8.xml:174(para)
-#: groupmod.8.xml:153(para) groupmems.8.xml:163(para) groupdel.8.xml:78(para)
-#: groupadd.8.xml:186(para) gpasswd.1.xml:227(para) chsh.1.xml:121(para)
-#: chpasswd.8.xml:208(para) chgpasswd.8.xml:170(para) chfn.1.xml:100(para)
-#: chage.1.xml:211(para)
+#: vipw.8.xml:148(para) usermod.8.xml:405(para) userdel.8.xml:144(para)
+#: useradd.8.xml:646(para) su.1.xml:321(para) sg.1.xml:80(para)
+#: pwck.8.xml:235(para) passwd.1.xml:373(para) newusers.8.xml:343(para)
+#: newgrp.1.xml:91(para) login.1.xml:276(para) grpck.8.xml:192(para)
+#: groupmod.8.xml:173(para) groupmems.8.xml:179(para) groupdel.8.xml:111(para)
+#: groupadd.8.xml:201(para) gpasswd.1.xml:245(para) chsh.1.xml:137(para)
+#: chpasswd.8.xml:224(para) chgpasswd.8.xml:186(para) chfn.1.xml:176(para)
+#: chage.1.xml:227(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of this tool:"
@@ -231,145 +296,147 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> för detaljer om hur "
 "denna sträng tolkas."
 
-#: vipw.8.xml:143(title)
+#: vipw.8.xml:159(title)
 msgid "ENVIRONMENT"
 msgstr ""
 
-#: vipw.8.xml:146(option)
+#: vipw.8.xml:162(option)
 msgid "VISUAL"
 msgstr ""
 
-#: vipw.8.xml:148(para)
+#: vipw.8.xml:164(para)
 msgid "Editor to be used."
 msgstr ""
 
-#: vipw.8.xml:152(option)
+#: vipw.8.xml:168(option)
 #, fuzzy
 #| msgid "HYSTORY"
 msgid "EDITOR"
 msgstr "HISTORIK"
 
-#: vipw.8.xml:154(para)
+#: vipw.8.xml:170(para)
 msgid "Editor to be used if <option>VISUAL</option> is not set."
 msgstr ""
 
-#: vipw.8.xml:161(title) usermod.8.xml:389(title) userdel.8.xml:144(title)
-#: useradd.8.xml:655(title) suauth.5.xml:168(title) su.1.xml:338(title)
-#: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
-#: pwconv.8.xml:187(title) pwck.8.xml:247(title) porttime.5.xml:105(title)
-#: passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(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:170(title) lastlog.8.xml:147(title)
-#: gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title)
-#: groupmod.8.xml:164(title) groupmems.8.xml:174(title)
-#: groupdel.8.xml:89(title) groupadd.8.xml:199(title) gpasswd.1.xml:241(title)
-#: faillog.8.xml:210(title) faillog.5.xml:71(title) expiry.1.xml:68(title)
-#: chsh.1.xml:133(title) chpasswd.8.xml:223(title) chgpasswd.8.xml:184(title)
-#: chfn.1.xml:113(title) chage.1.xml:222(title)
+#: vipw.8.xml:177(title) usermod.8.xml:419(title) userdel.8.xml:160(title)
+#: useradd.8.xml:671(title) suauth.5.xml:174(title) su.1.xml:348(title)
+#: sg.1.xml:91(title) shadow.5.xml:236(title) shadow.3.xml:207(title)
+#: pwconv.8.xml:232(title) pwck.8.xml:251(title) porttime.5.xml:111(title)
+#: passwd.5.xml:122(title) passwd.1.xml:390(title) newusers.8.xml:375(title)
+#: newgrp.1.xml:102(title) logoutd.8.xml:70(title)
+#: login.access.5.xml:102(title) login.1.xml:319(title)
+#: limits.5.xml:176(title) lastlog.8.xml:166(title) gshadow.5.xml:147(title)
+#: grpck.8.xml:203(title) groups.1.xml:81(title) groupmod.8.xml:184(title)
+#: groupmems.8.xml:190(title) groupdel.8.xml:122(title)
+#: groupadd.8.xml:214(title) gpasswd.1.xml:259(title) faillog.8.xml:229(title)
+#: faillog.5.xml:77(title) expiry.1.xml:102(title) chsh.1.xml:149(title)
+#: chpasswd.8.xml:239(title) chgpasswd.8.xml:200(title) chfn.1.xml:189(title)
+#: chage.1.xml:238(title)
 msgid "FILES"
 msgstr "FILER"
 
-#: vipw.8.xml:164(filename) usermod.8.xml:392(filename)
-#: userdel.8.xml:147(filename) useradd.8.xml:670(filename)
-#: sg.1.xml:103(filename) pwck.8.xml:250(filename)
-#: newusers.8.xml:372(filename) newgrp.1.xml:114(filename)
-#: gshadow.5.xml:144(filename) grpck.8.xml:188(filename)
-#: groups.1.xml:78(filename) groupmod.8.xml:167(filename)
-#: groupmems.8.xml:177(filename) groupdel.8.xml:92(filename)
-#: groupadd.8.xml:202(filename) gpasswd.1.xml:50(filename)
-#: gpasswd.1.xml:53(filename) gpasswd.1.xml:244(filename)
-#: chgpasswd.8.xml:187(filename)
+#: vipw.8.xml:180(filename) usermod.8.xml:422(filename)
+#: userdel.8.xml:163(filename) useradd.8.xml:686(filename)
+#: sg.1.xml:106(filename) pwck.8.xml:254(filename)
+#: newusers.8.xml:390(filename) newgrp.1.xml:117(filename)
+#: gshadow.5.xml:150(filename) grpck.8.xml:206(filename)
+#: groups.1.xml:84(filename) groupmod.8.xml:187(filename)
+#: groupmems.8.xml:193(filename) groupdel.8.xml:125(filename)
+#: groupadd.8.xml:217(filename) gpasswd.1.xml:53(filename)
+#: gpasswd.1.xml:56(filename) gpasswd.1.xml:262(filename)
+#: chgpasswd.8.xml:203(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
-#: vipw.8.xml:166(para) usermod.8.xml:394(para) userdel.8.xml:149(para)
-#: useradd.8.xml:672(para) sg.1.xml:105(para) pwck.8.xml:252(para)
-#: newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para)
-#: grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
-#: groupmems.8.xml:179(para) groupdel.8.xml:94(para) groupadd.8.xml:204(para)
-#: gpasswd.1.xml:246(para) chgpasswd.8.xml:189(para)
+#: vipw.8.xml:182(para) usermod.8.xml:424(para) userdel.8.xml:165(para)
+#: useradd.8.xml:688(para) sg.1.xml:108(para) pwck.8.xml:256(para)
+#: newusers.8.xml:392(para) newgrp.1.xml:119(para) gshadow.5.xml:152(para)
+#: grpck.8.xml:208(para) groups.1.xml:86(para) groupmod.8.xml:189(para)
+#: groupmems.8.xml:195(para) groupdel.8.xml:127(para) groupadd.8.xml:219(para)
+#: gpasswd.1.xml:264(para) chgpasswd.8.xml:205(para)
 msgid "Group account information."
 msgstr "Gruppkontoinformation."
 
-#: vipw.8.xml:170(filename) usermod.8.xml:398(filename)
-#: useradd.8.xml:676(filename) sg.1.xml:109(filename)
-#: newusers.8.xml:378(filename) newgrp.1.xml:120(filename)
-#: gshadow.5.xml:150(filename) grpck.8.xml:194(filename)
-#: groupmod.8.xml:173(filename) groupmems.8.xml:183(filename)
-#: groupdel.8.xml:98(filename) groupadd.8.xml:208(filename)
-#: gpasswd.1.xml:54(filename) gpasswd.1.xml:250(filename)
-#: chgpasswd.8.xml:193(filename)
+#: vipw.8.xml:186(filename) usermod.8.xml:428(filename)
+#: useradd.8.xml:692(filename) sg.1.xml:112(filename)
+#: newusers.8.xml:396(filename) newgrp.1.xml:123(filename)
+#: gshadow.5.xml:156(filename) grpck.8.xml:212(filename)
+#: groupmod.8.xml:193(filename) groupmems.8.xml:199(filename)
+#: groupdel.8.xml:131(filename) groupadd.8.xml:223(filename)
+#: gpasswd.1.xml:57(filename) gpasswd.1.xml:268(filename)
+#: chgpasswd.8.xml:209(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
-#: vipw.8.xml:172(para) usermod.8.xml:400(para) useradd.8.xml:678(para)
-#: sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para)
-#: gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para)
-#: groupdel.8.xml:100(para) groupadd.8.xml:210(para) gpasswd.1.xml:252(para)
-#: chgpasswd.8.xml:195(para)
+#: vipw.8.xml:188(para) usermod.8.xml:430(para) useradd.8.xml:694(para)
+#: sg.1.xml:114(para) newusers.8.xml:398(para) newgrp.1.xml:125(para)
+#: gshadow.5.xml:158(para) grpck.8.xml:214(para) groupmod.8.xml:195(para)
+#: groupdel.8.xml:133(para) groupadd.8.xml:225(para) gpasswd.1.xml:270(para)
+#: chgpasswd.8.xml:211(para)
 msgid "Secure group account information."
 msgstr "Säker gruppkontoinformation."
 
-#: vipw.8.xml:176(filename) usermod.8.xml:404(filename)
-#: userdel.8.xml:159(filename) useradd.8.xml:658(filename)
-#: su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
-#: pwck.8.xml:256(filename) passwd.5.xml:119(filename)
-#: passwd.1.xml:377(filename) newusers.8.xml:360(filename)
-#: newgrp.1.xml:102(filename) login.1.xml:331(filename)
-#: grpck.8.xml:200(filename) expiry.1.xml:71(filename)
-#: chsh.1.xml:136(filename) chpasswd.8.xml:226(filename)
-#: chfn.1.xml:122(filename) chage.1.xml:226(filename)
+#: vipw.8.xml:192(filename) usermod.8.xml:434(filename)
+#: userdel.8.xml:175(filename) useradd.8.xml:674(filename)
+#: su.1.xml:351(filename) sg.1.xml:94(filename) shadow.5.xml:239(filename)
+#: pwck.8.xml:260(filename) passwd.5.xml:125(filename)
+#: passwd.1.xml:393(filename) newusers.8.xml:378(filename)
+#: newgrp.1.xml:105(filename) login.1.xml:334(filename)
+#: grpck.8.xml:218(filename) groupmod.8.xml:199(filename)
+#: expiry.1.xml:105(filename) chsh.1.xml:152(filename)
+#: chpasswd.8.xml:242(filename) chfn.1.xml:198(filename)
+#: chage.1.xml:242(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
-#: vipw.8.xml:178(para) usermod.8.xml:406(para) userdel.8.xml:161(para)
-#: useradd.8.xml:660(para) su.1.xml:343(para) sg.1.xml:93(para)
-#: shadow.5.xml:235(para) pwck.8.xml:258(para) passwd.5.xml:121(para)
-#: passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
-#: login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para)
-#: chsh.1.xml:138(para) chpasswd.8.xml:228(para) chfn.1.xml:124(para)
-#: chage.1.xml:229(para)
+#: vipw.8.xml:194(para) usermod.8.xml:436(para) userdel.8.xml:177(para)
+#: useradd.8.xml:676(para) su.1.xml:353(para) sg.1.xml:96(para)
+#: shadow.5.xml:241(para) pwck.8.xml:262(para) passwd.5.xml:127(para)
+#: passwd.1.xml:395(para) newusers.8.xml:380(para) newgrp.1.xml:107(para)
+#: login.1.xml:336(para) grpck.8.xml:220(para) groupmod.8.xml:201(para)
+#: expiry.1.xml:107(para) chsh.1.xml:154(para) chpasswd.8.xml:244(para)
+#: chfn.1.xml:200(para) chage.1.xml:245(para)
 msgid "User account information."
 msgstr "Användarkontoinformation."
 
-#: vipw.8.xml:182(filename) usermod.8.xml:410(filename)
-#: userdel.8.xml:165(filename) useradd.8.xml:664(filename)
-#: su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
-#: shadow.3.xml:204(filename) pwck.8.xml:262(filename)
-#: passwd.5.xml:125(filename) passwd.1.xml:383(filename)
-#: newusers.8.xml:366(filename) newgrp.1.xml:108(filename)
-#: login.1.xml:337(filename) expiry.1.xml:77(filename)
-#: chpasswd.8.xml:232(filename) chage.1.xml:234(filename)
+#: vipw.8.xml:198(filename) usermod.8.xml:440(filename)
+#: userdel.8.xml:181(filename) useradd.8.xml:680(filename)
+#: su.1.xml:357(filename) sg.1.xml:100(filename) shadow.5.xml:245(filename)
+#: shadow.3.xml:210(filename) pwck.8.xml:266(filename)
+#: passwd.5.xml:131(filename) passwd.1.xml:399(filename)
+#: newusers.8.xml:384(filename) newgrp.1.xml:111(filename)
+#: login.1.xml:340(filename) expiry.1.xml:111(filename)
+#: chpasswd.8.xml:248(filename) chage.1.xml:250(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
-#: vipw.8.xml:184(para) usermod.8.xml:412(para) userdel.8.xml:167(para)
-#: useradd.8.xml:666(para) su.1.xml:349(para) sg.1.xml:99(para)
-#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:264(para)
-#: passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
-#: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:234(para)
-#: chage.1.xml:237(para)
+#: vipw.8.xml:200(para) usermod.8.xml:442(para) userdel.8.xml:183(para)
+#: useradd.8.xml:682(para) su.1.xml:359(para) sg.1.xml:102(para)
+#: shadow.5.xml:247(para) shadow.3.xml:212(para) pwck.8.xml:268(para)
+#: passwd.1.xml:401(para) newusers.8.xml:386(para) newgrp.1.xml:113(para)
+#: login.1.xml:342(para) expiry.1.xml:113(para) chpasswd.8.xml:250(para)
+#: chage.1.xml:253(para)
 msgid "Secure user account information."
 msgstr "Säker användarkontoinformation."
 
-#: vipw.8.xml:191(title) usermod.8.xml:419(title) userdel.8.xml:252(title)
-#: useradd.8.xml:772(title) suauth.5.xml:197(title) su.1.xml:409(title)
-#: sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title)
-#: pwconv.8.xml:199(title) pwck.8.xml:322(title) porttime.5.xml:117(title)
-#: passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title)
-#: newusers.8.xml:399(title) newgrp.1.xml:129(title)
-#: login.defs.5.xml:504(title) login.access.5.xml:108(title)
-#: login.1.xml:376(title) limits.5.xml:180(title) gshadow.5.xml:159(title)
-#: grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
-#: groupmems.8.xml:192(title) groupdel.8.xml:146(title)
-#: groupadd.8.xml:290(title) gpasswd.1.xml:259(title) faillog.8.xml:222(title)
-#: faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
-#: chpasswd.8.xml:253(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title)
-#: chage.1.xml:277(title)
+#: vipw.8.xml:207(title) usermod.8.xml:449(title) userdel.8.xml:268(title)
+#: useradd.8.xml:788(title) suauth.5.xml:203(title) su.1.xml:419(title)
+#: sg.1.xml:121(title) shadow.5.xml:264(title) shadow.3.xml:219(title)
+#: pwconv.8.xml:244(title) pwck.8.xml:326(title) porttime.5.xml:123(title)
+#: passwd.5.xml:150(title) passwd.1.xml:471(title) nologin.8.xml:70(title)
+#: newusers.8.xml:417(title) newgrp.1.xml:132(title)
+#: login.defs.5.xml:507(title) login.access.5.xml:114(title)
+#: login.1.xml:379(title) limits.5.xml:186(title) gshadow.5.xml:165(title)
+#: grpck.8.xml:272(title) groups.1.xml:93(title) groupmod.8.xml:259(title)
+#: groupmems.8.xml:208(title) groupdel.8.xml:179(title)
+#: groupadd.8.xml:305(title) gpasswd.1.xml:277(title) faillog.8.xml:241(title)
+#: faillog.5.xml:89(title) expiry.1.xml:120(title) chsh.1.xml:173(title)
+#: chpasswd.8.xml:269(title) chgpasswd.8.xml:224(title) chfn.1.xml:207(title)
+#: chage.1.xml:293(title)
 msgid "SEE ALSO"
 msgstr "SE OCKSÅ"
 
-#: vipw.8.xml:192(para)
+#: vipw.8.xml:208(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -407,22 +474,23 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: usermod.8.xml:41(refentrytitle) usermod.8.xml:46(refname)
-#: usermod.8.xml:52(command) login.defs.5.xml:468(term)
+#: usermod.8.xml:42(refentrytitle) usermod.8.xml:49(refname)
+#: usermod.8.xml:55(command) login.defs.5.xml:471(term)
 msgid "usermod"
 msgstr "usermod"
 
-#: usermod.8.xml:47(refpurpose)
+#: usermod.8.xml:50(refpurpose)
 msgid "modify a user account"
 msgstr "ändra ett användarkonto"
 
-#: usermod.8.xml:56(replaceable) userdel.8.xml:56(replaceable)
-#: useradd.8.xml:66(replaceable) passwd.1.xml:60(replaceable)
-#: chsh.1.xml:56(replaceable) chage.1.xml:53(replaceable)
+#: usermod.8.xml:59(replaceable) userdel.8.xml:59(replaceable)
+#: useradd.8.xml:69(replaceable) passwd.1.xml:63(replaceable)
+#: chsh.1.xml:59(replaceable) chfn.1.xml:59(replaceable)
+#: chage.1.xml:56(replaceable)
 msgid "LOGIN"
 msgstr "INLOGGNINGSNAMN"
 
-#: usermod.8.xml:62(para)
+#: usermod.8.xml:65(para)
 msgid ""
 "The <command>usermod</command> command modifies the system account files to "
 "reflect the changes that are specified on the command line."
@@ -430,15 +498,15 @@
 "Kommandot <command>usermod</command> ändrar systemkontofiler enligt det som "
 "anges på kommandoraden."
 
-#: usermod.8.xml:70(para)
+#: usermod.8.xml:73(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:76(term)
+#: usermod.8.xml:79(term)
 msgid "<option>-a</option>, <option>--append</option>"
 msgstr "<option>-a</option>, <option>--append</option>"
 
-#: usermod.8.xml:80(para)
+#: usermod.8.xml:83(para)
 #, fuzzy
 #| msgid ""
 #| "Add the user to the supplemental group(s). Use only with <option>-G</"
@@ -450,7 +518,7 @@
 "Lägg till användaren till tilläggsgrupp(er). Använd endast med flaggan "
 "<option>-G</option>."
 
-#: usermod.8.xml:87(term) useradd.8.xml:128(term)
+#: usermod.8.xml:90(term) useradd.8.xml:131(term)
 msgid ""
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
@@ -458,7 +526,7 @@
 "<option>-c</option>, <option>--comment</option><replaceable>KOMMENTAR</"
 "replaceable>"
 
-#: usermod.8.xml:92(para)
+#: usermod.8.xml:95(para)
 msgid ""
 "The new value of the user's password file comment field. It is normally "
 "modified using the <citerefentry><refentrytitle>chfn</"
@@ -468,7 +536,7 @@
 "ändras det med verktyget <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: usermod.8.xml:101(term) useradd.8.xml:141(term)
+#: usermod.8.xml:104(term) useradd.8.xml:144(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -476,20 +544,20 @@
 "<option>-d</option>, <option>--home</option><replaceable>HEM_KAT</"
 "replaceable>"
 
-#: usermod.8.xml:106(para)
+#: usermod.8.xml:109(para)
 #, fuzzy
 #| msgid "user home directory"
 msgid "The user's new login directory."
 msgstr "användarens hemkatalog"
 
-#: usermod.8.xml:109(para)
+#: usermod.8.xml:112(para)
 msgid ""
 "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:118(term) useradd.8.xml:168(term) useradd.8.xml:526(term)
+#: usermod.8.xml:121(term) useradd.8.xml:171(term) useradd.8.xml:542(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -497,21 +565,39 @@
 "<option>-e</option>, <option>--expiredate</option><replaceable>UTGÅNGSDATUM</"
 "replaceable>"
 
-#: usermod.8.xml:123(para) useradd.8.xml:173(para)
+#: usermod.8.xml:126(para) useradd.8.xml:176(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:130(term) useradd.8.xml:186(term) useradd.8.xml:539(term)
+#: usermod.8.xml:130(para)
 msgid ""
+"An empty <replaceable>EXPIRE_DATE</replaceable> argument will disable the "
+"expiration of the account."
+msgstr ""
+
+#: usermod.8.xml:134(para) usermod.8.xml:156(para)
+#, fuzzy
+#| msgid ""
+#| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
+#| "shadow</filename> by UID."
+msgid ""
+"This option requires a <filename>/etc/shadow</filename> file. A <filename>/"
+"etc/shadow</filename> entry will be created if there were none."
+msgstr ""
+"Sorterar poster i <filename>/etc/passwd</filename> och <filename>/etc/"
+"shadow</filename> efter UID."
+
+#: usermod.8.xml:142(term) useradd.8.xml:189(term) useradd.8.xml:555(term)
+msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 msgstr ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INAKTIV</"
 "replaceable>"
 
-#: usermod.8.xml:135(para)
+#: usermod.8.xml:147(para)
 #, fuzzy
 #| msgid ""
 #| "The number of days after a password has expired before the account will "
@@ -523,37 +609,37 @@
 "Antalet dagar efter att ett lösenord har gått ut innan kontot kommer att "
 "inaktiveras."
 
-#: usermod.8.xml:139(para)
+#: usermod.8.xml:151(para)
 msgid ""
 "A value of 0 disables the account as soon as the password has expired, and a "
 "value of -1 disables the feature."
 msgstr ""
 
-#: usermod.8.xml:147(term) useradd.8.xml:206(term) useradd.8.xml:555(term)
+#: usermod.8.xml:164(term) useradd.8.xml:209(term) useradd.8.xml:571(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GRUPP</replaceable>"
 
-#: usermod.8.xml:152(para)
+#: usermod.8.xml:169(para)
 msgid ""
 "The group name or number of the user's new initial login group. The group "
 "must exist."
 msgstr ""
 
-#: usermod.8.xml:156(para)
+#: usermod.8.xml:173(para)
 msgid ""
 "Any file from the user's home directory owned by the previous primary group "
 "of the user will be owned by this new group."
 msgstr ""
 
-#: usermod.8.xml:160(para)
+#: usermod.8.xml:177(para)
 msgid ""
 "The group ownership of files outside of the user's home directory must be "
 "fixed manually."
 msgstr ""
 
-#: usermod.8.xml:167(term) useradd.8.xml:234(term)
+#: usermod.8.xml:184(term) useradd.8.xml:237(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -563,7 +649,7 @@
 "replaceable>[<emphasis remap=\"I\">,GRUPP2,...</emphasis>[<emphasis remap=\"I"
 "\">,GRUPPN</emphasis>]]]"
 
-#: usermod.8.xml:172(para)
+#: usermod.8.xml:189(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. "
@@ -571,7 +657,7 @@
 "<option>-g</option> option."
 msgstr ""
 
-#: usermod.8.xml:179(para)
+#: usermod.8.xml:196(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 "
@@ -579,7 +665,7 @@
 "supplementary group list."
 msgstr ""
 
-#: usermod.8.xml:188(term)
+#: usermod.8.xml:205(term)
 msgid ""
 "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
 "replaceable>"
@@ -587,19 +673,19 @@
 "<option>-l</option>, <option>--login</"
 "option><replaceable>NYTT_INLOGGNINGSNAMN</replaceable>"
 
-#: usermod.8.xml:193(para)
+#: usermod.8.xml:210(para)
 msgid ""
 "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."
+"particular, the user's home directory or mail spool should probably be "
+"renamed manually to reflect the new login name."
 msgstr ""
 
-#: usermod.8.xml:203(term)
+#: usermod.8.xml:220(term)
 msgid "<option>-L</option>, <option>--lock</option>"
 msgstr "<option>-L</option>, <option>--lock</option>"
 
-#: usermod.8.xml:207(para)
+#: usermod.8.xml:224(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>-"
@@ -609,24 +695,24 @@
 "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:213(para)
+#: usermod.8.xml:230(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:222(term)
+#: usermod.8.xml:239(term)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "<option>-m</option>, <option>--move-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: usermod.8.xml:226(para)
+#: usermod.8.xml:243(para)
 msgid "Move the content of the user's home directory to the new location."
 msgstr ""
 
-#: usermod.8.xml:230(para)
+#: usermod.8.xml:247(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -634,26 +720,26 @@
 "<option>--home</option>) option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: usermod.8.xml:234(para)
+#: usermod.8.xml:251(para)
 msgid ""
 "<command>usermod</command> will try to adapt the ownership of the files and "
 "to copy the modes, ACL and extended attributes, but manual changes might be "
 "needed afterwards."
 msgstr ""
 
-#: usermod.8.xml:242(term) useradd.8.xml:374(term) groupmod.8.xml:116(term)
-#: groupadd.8.xml:134(term)
+#: usermod.8.xml:259(term) useradd.8.xml:377(term) groupmod.8.xml:123(term)
+#: groupadd.8.xml:136(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
-#: usermod.8.xml:246(para)
+#: usermod.8.xml:263(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:253(term) useradd.8.xml:386(term) groupmod.8.xml:127(term)
-#: groupadd.8.xml:144(term)
+#: usermod.8.xml:270(term) useradd.8.xml:389(term) groupmod.8.xml:134(term)
+#: groupadd.8.xml:146(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -661,7 +747,7 @@
 "<option>-p</option>, <option>--password</option><replaceable>LÖSENORD</"
 "replaceable>"
 
-#: usermod.8.xml:258(para) groupmod.8.xml:132(para)
+#: usermod.8.xml:275(para) groupmod.8.xml:139(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
@@ -670,75 +756,75 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>."
 
-#: usermod.8.xml:263(para) useradd.8.xml:396(para) groupmod.8.xml:137(para)
-#: groupadd.8.xml:154(para)
+#: usermod.8.xml:280(para) useradd.8.xml:399(para) groupmod.8.xml:144(para)
+#: groupadd.8.xml:156(para)
 msgid ""
 "<emphasis role=\"bold\">Note:</emphasis> This option is not recommended "
 "because the password (or encrypted password) will be visible by users "
 "listing the processes."
 msgstr ""
 
-#: usermod.8.xml:268(para)
+#: usermod.8.xml:285(para)
 msgid ""
 "The password will be written in the local <filename>/etc/passwd</filename> "
 "or <filename>/etc/shadow</filename> file. This might differ from the "
 "password database configured in your PAM configuration."
 msgstr ""
 
-#: usermod.8.xml:274(para) useradd.8.xml:401(para) groupmod.8.xml:142(para)
-#: groupadd.8.xml:159(para)
+#: usermod.8.xml:291(para) useradd.8.xml:404(para) groupmod.8.xml:149(para)
+#: groupadd.8.xml:161(para)
 msgid ""
 "You should make sure the password respects the system's password policy."
 msgstr ""
 
-#: usermod.8.xml:281(term) useradd.8.xml:435(term) useradd.8.xml:576(term)
-#: su.1.xml:157(term) chsh.1.xml:85(term)
+#: usermod.8.xml:311(term) useradd.8.xml:451(term) useradd.8.xml:592(term)
+#: su.1.xml:167(term) chsh.1.xml:101(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SKAL</replaceable>"
 
-#: usermod.8.xml:286(para) chsh.1.xml:89(para)
+#: usermod.8.xml:316(para) chsh.1.xml:105(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:293(term) useradd.8.xml:450(term)
+#: usermod.8.xml:323(term) useradd.8.xml:466(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: usermod.8.xml:298(para)
+#: usermod.8.xml:328(para)
 msgid "The new numerical value of the user's ID."
 msgstr ""
 
-#: usermod.8.xml:301(para)
+#: usermod.8.xml:331(para)
 msgid ""
 "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:307(para)
+#: usermod.8.xml:337(para)
 msgid ""
 "The user's mailbox, and any files which the user owns and which are located "
 "in the user's home directory will have the file user ID changed "
 "automatically."
 msgstr ""
 
-#: usermod.8.xml:312(para)
+#: usermod.8.xml:342(para)
 msgid ""
 "The ownership of files outside of the user's home directory must be fixed "
 "manually."
 msgstr ""
 
-#: usermod.8.xml:319(term)
+#: usermod.8.xml:349(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:323(para)
+#: usermod.8.xml:353(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</"
@@ -748,7 +834,7 @@
 "krypterade lösenordet. Du kan inte använda denna flagga med <option>-p</"
 "option> eller <option>-L</option>."
 
-#: usermod.8.xml:328(para)
+#: usermod.8.xml:358(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 "
@@ -756,7 +842,7 @@
 "from <filename>/etc/default/useradd</filename>)."
 msgstr ""
 
-#: usermod.8.xml:339(term) useradd.8.xml:482(term)
+#: usermod.8.xml:369(term) useradd.8.xml:498(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
@@ -767,22 +853,22 @@
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SKAL</replaceable>"
 
-#: usermod.8.xml:344(para)
+#: usermod.8.xml:374(para)
 msgid ""
 "The SELinux user for the user's login. The default is to leave this field "
 "the blank, which causes the system to select the default SELinux user."
 msgstr ""
 
-#: usermod.8.xml:355(title) userdel.8.xml:225(title) useradd.8.xml:605(title)
-#: su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
-#: newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title)
-#: groupdel.8.xml:65(title) groupadd.8.xml:223(title) gpasswd.1.xml:214(title)
-#: faillog.8.xml:199(title) chpasswd.8.xml:199(title)
-#: chgpasswd.8.xml:157(title)
+#: usermod.8.xml:385(title) userdel.8.xml:241(title) useradd.8.xml:621(title)
+#: su.1.xml:312(title) shadow.3.xml:199(title) passwd.1.xml:354(title)
+#: newusers.8.xml:330(title) login.1.xml:241(title) lastlog.8.xml:178(title)
+#: groupdel.8.xml:98(title) groupadd.8.xml:238(title) gpasswd.1.xml:232(title)
+#: faillog.8.xml:218(title) chpasswd.8.xml:215(title)
+#: chgpasswd.8.xml:173(title)
 msgid "CAVEATS"
 msgstr "TÄNK PÅ"
 
-#: usermod.8.xml:356(para)
+#: usermod.8.xml:386(para)
 msgid ""
 "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, the "
@@ -791,13 +877,13 @@
 "is logged in according to utmp on other architectures."
 msgstr ""
 
-#: usermod.8.xml:364(para)
+#: usermod.8.xml:394(para)
 msgid ""
 "You must change the owner of any <command>crontab</command> files or "
 "<command>at</command> jobs manually."
 msgstr ""
 
-#: usermod.8.xml:368(para)
+#: usermod.8.xml:398(para)
 msgid "You must make any changes involving NIS on the NIS server."
 msgstr ""
 
@@ -944,7 +1030,7 @@
 "algorithm: <placeholder-1/>"
 msgstr ""
 
-#: usermod.8.xml:420(para)
+#: usermod.8.xml:450(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -982,16 +1068,16 @@
 "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: userdel.8.xml:43(refentrytitle) userdel.8.xml:48(refname)
-#: userdel.8.xml:53(command) login.defs.5.xml:458(term)
+#: userdel.8.xml:44(refentrytitle) userdel.8.xml:51(refname)
+#: userdel.8.xml:56(command) login.defs.5.xml:461(term)
 msgid "userdel"
 msgstr "userdel"
 
-#: userdel.8.xml:49(refpurpose)
+#: userdel.8.xml:52(refpurpose)
 msgid "delete a user account and related files"
 msgstr "ta bort ett användarkonto och relaterade filer"
 
-#: userdel.8.xml:63(para)
+#: userdel.8.xml:66(para)
 #, fuzzy
 msgid ""
 "The <command>userdel</command> command modifies the system account files, "
@@ -1002,15 +1088,15 @@
 "alla poster som refererar till <emphasis remap=\"I\">login_name</emphasis>. "
 "Den angivna användaren måste finnas."
 
-#: userdel.8.xml:72(para)
+#: userdel.8.xml:75(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:77(term) groupadd.8.xml:79(term)
+#: userdel.8.xml:80(term) groupadd.8.xml:81(term) expiry.1.xml:84(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option>"
 
-#: userdel.8.xml:81(para)
+#: userdel.8.xml:84(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 "
@@ -1022,7 +1108,7 @@
 "it is still the primary group of another user."
 msgstr ""
 
-#: userdel.8.xml:94(para)
+#: userdel.8.xml:97(para)
 msgid ""
 "<emphasis>Note:</emphasis> This option is dangerous and may leave your "
 "system in an inconsistent state."
@@ -1030,18 +1116,18 @@
 "<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:107(term)
+#: userdel.8.xml:110(term)
 msgid "<option>-r</option>, <option>--remove</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
-#: userdel.8.xml:111(para)
+#: userdel.8.xml:114(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:117(para)
+#: userdel.8.xml:120(para)
 msgid ""
 "The mail spool is defined by the <option>MAIL_DIR</option> variable in the "
 "<filename>login.defs</filename> file."
@@ -1121,109 +1207,109 @@
 "the user."
 msgstr ""
 
-#: userdel.8.xml:153(filename) useradd.8.xml:694(filename)
-#: su.1.xml:353(filename) pwconv.8.xml:190(filename)
-#: passwd.1.xml:389(filename) newusers.8.xml:384(filename)
-#: login.access.5.xml:99(filename) login.1.xml:367(filename)
-#: groupadd.8.xml:214(filename) chsh.1.xml:148(filename)
-#: chpasswd.8.xml:238(filename) chgpasswd.8.xml:199(filename)
-#: chfn.1.xml:116(filename)
+#: userdel.8.xml:169(filename) useradd.8.xml:710(filename)
+#: su.1.xml:363(filename) pwconv.8.xml:235(filename)
+#: passwd.1.xml:405(filename) newusers.8.xml:402(filename)
+#: login.access.5.xml:105(filename) login.1.xml:370(filename)
+#: groupadd.8.xml:229(filename) chsh.1.xml:164(filename)
+#: chpasswd.8.xml:254(filename) chgpasswd.8.xml:215(filename)
+#: chfn.1.xml:192(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:155(para) useradd.8.xml:696(para) su.1.xml:355(para)
-#: pwconv.8.xml:192(para) passwd.1.xml:391(para) newusers.8.xml:386(para)
-#: login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:216(para)
-#: chsh.1.xml:150(para) chpasswd.8.xml:240(para) chgpasswd.8.xml:201(para)
-#: chfn.1.xml:118(para)
+#: userdel.8.xml:171(para) useradd.8.xml:712(para) su.1.xml:365(para)
+#: pwconv.8.xml:237(para) passwd.1.xml:407(para) newusers.8.xml:404(para)
+#: login.access.5.xml:107(para) login.1.xml:372(para) groupadd.8.xml:231(para)
+#: chsh.1.xml:166(para) chpasswd.8.xml:256(para) chgpasswd.8.xml:217(para)
+#: chfn.1.xml:194(para)
 msgid "Shadow password suite configuration."
 msgstr ""
 
-#: userdel.8.xml:174(title) useradd.8.xml:703(title) su.1.xml:362(title)
-#: pwck.8.xml:271(title) passwd.1.xml:404(title) grpck.8.xml:209(title)
-#: groupmod.8.xml:182(title) groupdel.8.xml:107(title)
-#: groupadd.8.xml:245(title) chage.1.xml:244(title)
+#: userdel.8.xml:190(title) useradd.8.xml:719(title) su.1.xml:372(title)
+#: pwck.8.xml:275(title) passwd.1.xml:420(title) grpck.8.xml:227(title)
+#: groupmod.8.xml:208(title) groupdel.8.xml:140(title)
+#: groupadd.8.xml:260(title) chage.1.xml:260(title)
 msgid "EXIT VALUES"
 msgstr "AVSLUTNINGSVÄRDEN"
 
-#: userdel.8.xml:179(replaceable) useradd.8.xml:708(replaceable)
-#: su.1.xml:381(replaceable) pwck.8.xml:276(replaceable)
-#: passwd.1.xml:409(replaceable) grpck.8.xml:214(replaceable)
-#: groupmod.8.xml:187(replaceable) groupdel.8.xml:112(replaceable)
-#: groupadd.8.xml:250(replaceable) chage.1.xml:249(replaceable)
+#: userdel.8.xml:195(replaceable) useradd.8.xml:724(replaceable)
+#: su.1.xml:391(replaceable) pwck.8.xml:280(replaceable)
+#: passwd.1.xml:425(replaceable) grpck.8.xml:232(replaceable)
+#: groupmod.8.xml:213(replaceable) groupdel.8.xml:145(replaceable)
+#: groupadd.8.xml:265(replaceable) chage.1.xml:265(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:181(para) useradd.8.xml:710(para) pwck.8.xml:278(para)
-#: passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para)
-#: groupdel.8.xml:114(para) groupadd.8.xml:252(para) chage.1.xml:251(para)
+#: userdel.8.xml:197(para) useradd.8.xml:726(para) pwck.8.xml:282(para)
+#: passwd.1.xml:427(para) grpck.8.xml:234(para) groupmod.8.xml:215(para)
+#: groupdel.8.xml:147(para) groupadd.8.xml:267(para) chage.1.xml:267(para)
 msgid "success"
 msgstr "lyckad"
 
-#: userdel.8.xml:185(replaceable) useradd.8.xml:714(replaceable)
-#: su.1.xml:55(manvolnum) su.1.xml:387(replaceable) sg.1.xml:39(manvolnum)
-#: pwck.8.xml:282(replaceable) passwd.1.xml:45(manvolnum)
-#: passwd.1.xml:415(replaceable) newgrp.1.xml:39(manvolnum)
-#: login.1.xml:71(manvolnum) grpck.8.xml:220(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:39(manvolnum)
-#: chage.1.xml:255(replaceable)
+#: userdel.8.xml:201(replaceable) useradd.8.xml:730(replaceable)
+#: su.1.xml:56(manvolnum) su.1.xml:397(replaceable) sg.1.xml:40(manvolnum)
+#: pwck.8.xml:286(replaceable) passwd.1.xml:46(manvolnum)
+#: passwd.1.xml:431(replaceable) newgrp.1.xml:40(manvolnum)
+#: login.1.xml:72(manvolnum) grpck.8.xml:238(replaceable)
+#: groups.1.xml:39(manvolnum) gpasswd.1.xml:44(manvolnum)
+#: expiry.1.xml:43(manvolnum) chsh.1.xml:42(manvolnum)
+#: chfn.1.xml:42(manvolnum) chage.1.xml:40(manvolnum)
+#: chage.1.xml:271(replaceable)
 msgid "1"
 msgstr "1"
 
-#: userdel.8.xml:187(para) useradd.8.xml:716(para)
+#: userdel.8.xml:203(para) useradd.8.xml:732(para)
 msgid "can't update password file"
 msgstr "kan inte uppdatera lösenordsfilen"
 
-#: userdel.8.xml:191(replaceable) useradd.8.xml:720(replaceable)
-#: pwck.8.xml:288(replaceable) passwd.1.xml:421(replaceable)
-#: grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable)
-#: groupdel.8.xml:118(replaceable) groupadd.8.xml:256(replaceable)
-#: chage.1.xml:261(replaceable)
+#: userdel.8.xml:207(replaceable) useradd.8.xml:736(replaceable)
+#: pwck.8.xml:292(replaceable) passwd.1.xml:437(replaceable)
+#: grpck.8.xml:244(replaceable) groupmod.8.xml:219(replaceable)
+#: groupdel.8.xml:151(replaceable) groupadd.8.xml:271(replaceable)
+#: chage.1.xml:277(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:193(para) useradd.8.xml:722(para) pwck.8.xml:284(para)
-#: grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
-#: groupadd.8.xml:258(para) chage.1.xml:263(para)
+#: userdel.8.xml:209(para) useradd.8.xml:738(para) pwck.8.xml:288(para)
+#: grpck.8.xml:240(para) groupmod.8.xml:221(para) groupdel.8.xml:153(para)
+#: groupadd.8.xml:273(para) chage.1.xml:279(para)
 msgid "invalid command syntax"
 msgstr "ogiltig kommandosyntax"
 
-#: userdel.8.xml:197(replaceable) useradd.8.xml:738(replaceable)
-#: pwck.8.xml:312(replaceable) passwd.1.xml:445(replaceable)
-#: groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
+#: userdel.8.xml:213(replaceable) useradd.8.xml:754(replaceable)
+#: pwck.8.xml:316(replaceable) passwd.1.xml:461(replaceable)
+#: groupmod.8.xml:237(replaceable) groupdel.8.xml:157(replaceable)
 msgid "6"
 msgstr "6"
 
-#: userdel.8.xml:199(para)
+#: userdel.8.xml:215(para)
 msgid "specified user doesn't exist"
 msgstr "angiven användare finns inte"
 
-#: userdel.8.xml:205(para)
+#: userdel.8.xml:221(para)
 msgid "user currently logged in"
 msgstr "användaren är för närvarande inloggad"
 
-#: userdel.8.xml:209(replaceable) useradd.8.xml:750(replaceable)
-#: groupmod.8.xml:223(replaceable) groupdel.8.xml:136(replaceable)
-#: groupadd.8.xml:280(replaceable)
+#: userdel.8.xml:225(replaceable) useradd.8.xml:766(replaceable)
+#: groupmod.8.xml:249(replaceable) groupdel.8.xml:169(replaceable)
+#: groupadd.8.xml:295(replaceable)
 msgid "10"
 msgstr "10"
 
-#: userdel.8.xml:211(para) useradd.8.xml:752(para) groupmod.8.xml:225(para)
-#: groupdel.8.xml:138(para) groupadd.8.xml:282(para)
+#: userdel.8.xml:227(para) useradd.8.xml:768(para) groupmod.8.xml:251(para)
+#: groupdel.8.xml:171(para) groupadd.8.xml:297(para)
 msgid "can't update group file"
 msgstr "kan inte uppdatera gruppfilen"
 
-#: userdel.8.xml:215(replaceable) useradd.8.xml:756(replaceable)
+#: userdel.8.xml:231(replaceable) useradd.8.xml:772(replaceable)
 msgid "12"
 msgstr "12"
 
-#: userdel.8.xml:217(para)
+#: userdel.8.xml:233(para)
 msgid "can't remove home directory"
 msgstr "kan inte ta bort hemkatalogen"
 
-#: userdel.8.xml:175(para)
+#: userdel.8.xml:191(para)
 msgid ""
 "The <command>userdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1231,7 +1317,7 @@
 "Kommandot <command>userdel</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: userdel.8.xml:226(para)
+#: userdel.8.xml:242(para)
 msgid ""
 "<command>userdel</command> will not allow you to remove an account if there "
 "are running processes which belong to this account. In that case, you may "
@@ -1240,13 +1326,13 @@
 "deletion of this account."
 msgstr ""
 
-#: userdel.8.xml:233(para)
+#: userdel.8.xml:249(para)
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this user."
 msgstr ""
 
-#: userdel.8.xml:237(para)
+#: userdel.8.xml:253(para)
 msgid ""
 "You may not remove any NIS attributes on a NIS client. This must be "
 "performed on the NIS server."
@@ -1254,7 +1340,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:240(para)
+#: userdel.8.xml:256(para)
 msgid ""
 "If <option>USERGROUPS_ENAB</option> is defined to <emphasis remap=\"I\">yes</"
 "emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -1265,7 +1351,7 @@
 "<option>-f</option> option can force the deletion of this group."
 msgstr ""
 
-#: userdel.8.xml:253(para)
+#: userdel.8.xml:269(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1299,22 +1385,22 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: useradd.8.xml:52(refentrytitle) useradd.8.xml:57(refname)
-#: useradd.8.xml:62(command) useradd.8.xml:69(command)
-#: useradd.8.xml:73(command) login.defs.5.xml:444(term)
+#: useradd.8.xml:53(refentrytitle) useradd.8.xml:60(refname)
+#: useradd.8.xml:65(command) useradd.8.xml:72(command)
+#: useradd.8.xml:76(command) login.defs.5.xml:447(term)
 msgid "useradd"
 msgstr "useradd"
 
-#: useradd.8.xml:58(refpurpose)
+#: useradd.8.xml:61(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:70(arg) useradd.8.xml:74(arg)
+#: useradd.8.xml:73(arg) useradd.8.xml:77(arg)
 msgid "-D"
 msgstr "-D"
 
-#: useradd.8.xml:83(para)
+#: useradd.8.xml:86(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 "
@@ -1324,24 +1410,24 @@
 "initial files."
 msgstr ""
 
-#: useradd.8.xml:92(para)
+#: useradd.8.xml:95(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:101(para)
+#: useradd.8.xml:104(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:105(term) useradd.8.xml:507(term)
+#: useradd.8.xml:108(term) useradd.8.xml:523(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
 msgstr ""
 
-#: useradd.8.xml:110(para)
+#: useradd.8.xml:113(para)
 msgid ""
 "The default base directory for the system if <option>-d</"
 "option><replaceable>HOME_DIR</replaceable> is not specified. "
@@ -1350,20 +1436,20 @@
 "<replaceable>BASE_DIR</replaceable> must exist."
 msgstr ""
 
-#: useradd.8.xml:118(para)
+#: useradd.8.xml:121(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:133(para)
+#: useradd.8.xml:136(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:146(para)
+#: useradd.8.xml:149(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 "
@@ -1373,45 +1459,45 @@
 "created if it is missing."
 msgstr ""
 
-#: useradd.8.xml:158(term)
+#: useradd.8.xml:161(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:162(para)
+#: useradd.8.xml:165(para)
 #, fuzzy
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr "Ändrar standardvärden"
 
-#: useradd.8.xml:177(para)
+#: useradd.8.xml:180(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:191(para)
+#: useradd.8.xml:194(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:197(para)
+#: useradd.8.xml:200(para)
 msgid ""
 "If not specified, <command>useradd</command> will use the default inactivity "
 "period specified by the <option>INACTIVE</option> variable in <filename>/etc/"
 "default/useradd</filename>, or -1 by default."
 msgstr ""
 
-#: useradd.8.xml:211(para)
+#: useradd.8.xml:214(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."
 msgstr ""
 
-#: useradd.8.xml:216(para)
+#: useradd.8.xml:219(para)
 msgid ""
 "If not specified, the behavior of <command>useradd</command> will depend on "
 "the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
@@ -1425,7 +1511,7 @@
 "default."
 msgstr ""
 
-#: useradd.8.xml:239(para)
+#: useradd.8.xml:242(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. "
@@ -1434,7 +1520,7 @@
 "the initial group."
 msgstr ""
 
-#: useradd.8.xml:256(term)
+#: useradd.8.xml:259(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
@@ -1445,14 +1531,14 @@
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SKAL</replaceable>"
 
-#: useradd.8.xml:261(para)
+#: useradd.8.xml:264(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:266(para)
+#: useradd.8.xml:269(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -1460,18 +1546,18 @@
 "home</option>) option is specified."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:270(para)
+#: useradd.8.xml:273(para)
 msgid ""
 "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:276(para)
+#: useradd.8.xml:279(para)
 msgid "If possible, the ACLs and extended attributes are copied."
 msgstr ""
 
-#: useradd.8.xml:282(term) groupadd.8.xml:113(term)
+#: useradd.8.xml:285(term) groupadd.8.xml:115(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -1479,7 +1565,7 @@
 "<option>-K</option>, <option>--key</option><replaceable>NYCKEL</"
 "replaceable>=<replaceable>VÄRDE</replaceable>"
 
-#: useradd.8.xml:287(para)
+#: useradd.8.xml:290(para)
 #, fuzzy
 #| msgid ""
 #| "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, "
@@ -1513,66 +1599,66 @@
 "replaceable><option> -K </option><replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable>"
 
-#: useradd.8.xml:311(term)
+#: useradd.8.xml:314(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:313(para)
+#: useradd.8.xml:316(para)
 msgid "Do not add the user to the lastlog and faillog databases."
 msgstr ""
 
-#: useradd.8.xml:316(para)
+#: useradd.8.xml:319(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:324(term)
+#: useradd.8.xml:327(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:328(para)
+#: useradd.8.xml:331(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:334(para)
+#: useradd.8.xml:337(para)
 msgid ""
 "By default, if this option is not specified and <option>CREATE_HOME</option> "
 "is not enabled, no home directories are created."
 msgstr ""
 
-#: useradd.8.xml:343(option)
+#: useradd.8.xml:346(option)
 #, fuzzy
 #| msgid "-"
 msgid "-M"
 msgstr "-"
 
-#: useradd.8.xml:346(para)
+#: useradd.8.xml:349(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:355(term)
+#: useradd.8.xml:358(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:359(para)
+#: useradd.8.xml:362(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 "
 "<option>GROUP</option> variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:365(para) useradd.8.xml:473(para)
+#: useradd.8.xml:368(para) useradd.8.xml:489(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 "
@@ -1580,18 +1666,18 @@
 "filename>."
 msgstr ""
 
-#: useradd.8.xml:378(para)
+#: useradd.8.xml:381(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr ""
 
-#: useradd.8.xml:379(para)
+#: useradd.8.xml:382(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "This option is only valid in combination with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:391(para) groupadd.8.xml:149(para)
+#: useradd.8.xml:394(para) groupadd.8.xml:151(para)
 #, fuzzy
 #| msgid ""
 #| "The encrypted password, as returned by "
@@ -1606,17 +1692,17 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>."
 
-#: useradd.8.xml:408(term) newusers.8.xml:263(term) groupadd.8.xml:166(term)
+#: useradd.8.xml:411(term) newusers.8.xml:268(term) groupadd.8.xml:168(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:412(para) newusers.8.xml:267(para)
+#: useradd.8.xml:415(para) newusers.8.xml:272(para)
 msgid "Create a system account."
 msgstr ""
 
-#: useradd.8.xml:415(para)
+#: useradd.8.xml:418(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are chosen in the "
@@ -1626,7 +1712,7 @@
 "the creation of groups)."
 msgstr ""
 
-#: useradd.8.xml:424(para)
+#: useradd.8.xml:427(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."
@@ -1635,7 +1721,7 @@
 "account to be created."
 msgstr ""
 
-#: useradd.8.xml:440(para)
+#: useradd.8.xml:456(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 specified "
@@ -1643,7 +1729,7 @@
 "filename>, or an empty string by default."
 msgstr ""
 
-#: useradd.8.xml:455(para)
+#: useradd.8.xml:471(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 "
@@ -1652,29 +1738,29 @@
 "accounts."
 msgstr ""
 
-#: useradd.8.xml:465(term)
+#: useradd.8.xml:481(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:469(para)
+#: useradd.8.xml:485(para)
 msgid ""
 "Create a group with the same name as the user, and add the user to this "
 "group."
 msgstr ""
 
-#: useradd.8.xml:487(para)
+#: useradd.8.xml:503(para)
 msgid ""
 "The SELinux user for the user's login. The default is to leave this field "
 "blank, which causes the system to select the default SELinux user."
 msgstr ""
 
-#: useradd.8.xml:497(title)
+#: useradd.8.xml:513(title)
 msgid "Changing the default values"
 msgstr "Ändrar standardvärden"
 
-#: useradd.8.xml:498(para)
+#: useradd.8.xml:514(para)
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
 "command> will display the current default values. When invoked with <option>-"
@@ -1682,7 +1768,7 @@
 "default values for the specified options. Valid default-changing options are:"
 msgstr ""
 
-#: useradd.8.xml:512(para)
+#: useradd.8.xml:528(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 "
@@ -1690,23 +1776,23 @@
 "when creating a new account."
 msgstr ""
 
-#: useradd.8.xml:519(para)
+#: useradd.8.xml:535(para)
 msgid ""
 "This option sets the <option>HOME</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:531(para)
+#: useradd.8.xml:547(para)
 msgid "The date on which the user account is disabled."
 msgstr "Datumet när användarkontot blir inaktiverat."
 
-#: useradd.8.xml:532(para)
+#: useradd.8.xml:548(para)
 msgid ""
 "This option sets the <option>EXPIRE</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:544(para)
+#: useradd.8.xml:560(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
@@ -1714,13 +1800,13 @@
 "Antalet dagar efter att ett lösenord har gått ut innan kontot kommer att "
 "inaktiveras."
 
-#: useradd.8.xml:548(para)
+#: useradd.8.xml:564(para)
 msgid ""
 "This option sets the <option>INACTIVE</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:560(para)
+#: useradd.8.xml:576(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> "
@@ -1729,27 +1815,27 @@
 "have an existing entry."
 msgstr ""
 
-#: useradd.8.xml:569(para)
+#: useradd.8.xml:585(para)
 msgid ""
 "This option sets the <option>GROUP</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:581(para)
+#: useradd.8.xml:597(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
-#: useradd.8.xml:584(para)
+#: useradd.8.xml:600(para)
 msgid ""
 "This option sets the <option>SHELL</option> variable in <filename>/etc/"
 "default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:596(title)
+#: useradd.8.xml:612(title)
 msgid "NOTES"
 msgstr "NOTERINGAR"
 
-#: useradd.8.xml:597(para)
+#: useradd.8.xml:613(para)
 #, fuzzy
 #| msgid ""
 #| "The system administrator is responsible for placing the default user "
@@ -1763,7 +1849,7 @@
 "Systemadministratören är ansvarig för att placera standardanvändarfiler i "
 "katalogen <filename>/etc/skel/</filename>."
 
-#: useradd.8.xml:606(para)
+#: useradd.8.xml:622(para)
 #, fuzzy
 msgid ""
 "You may not add a user to a NIS or LDAP group. This must be performed on the "
@@ -1772,14 +1858,14 @@
 "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:611(para)
+#: useradd.8.xml:627(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:617(para)
+#: useradd.8.xml:633(para)
 #, fuzzy
 #| msgid ""
 #| "Usernames must begin with a lower case letter or an underscore, and only "
@@ -1794,7 +1880,7 @@
 "endast innehålla gemener, understreck, minustecken och på slutet ett dollar-"
 "tecken. I reguljära uttryckstermer: [a-z_][a-z0-9_-]*[$]"
 
-#: useradd.8.xml:623(para)
+#: useradd.8.xml:639(para)
 msgid "Usernames may only be up to 32 characters long."
 msgstr ""
 
@@ -1976,71 +2062,71 @@
 "It is also used by <command>pam_umask</command> as the default umask value."
 msgstr ""
 
-#: useradd.8.xml:682(filename)
+#: useradd.8.xml:698(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
-#: useradd.8.xml:684(para)
+#: useradd.8.xml:700(para)
 msgid "Default values for account creation."
 msgstr "Standardvärden för skapande av konto."
 
-#: useradd.8.xml:688(filename)
+#: useradd.8.xml:704(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
-#: useradd.8.xml:690(para)
+#: useradd.8.xml:706(para)
 msgid "Directory containing default files."
 msgstr "Katalog som innehåller standardfiler."
 
-#: useradd.8.xml:726(replaceable) shadow.3.xml:35(manvolnum)
-#: pwck.8.xml:294(replaceable) passwd.1.xml:427(replaceable)
-#: grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable)
-#: groupadd.8.xml:262(replaceable)
+#: useradd.8.xml:742(replaceable) shadow.3.xml:39(manvolnum)
+#: pwck.8.xml:298(replaceable) passwd.1.xml:443(replaceable)
+#: grpck.8.xml:250(replaceable) groupmod.8.xml:225(replaceable)
+#: groupadd.8.xml:277(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:728(para) passwd.1.xml:447(para) groupmod.8.xml:201(para)
-#: groupadd.8.xml:264(para)
+#: useradd.8.xml:744(para) passwd.1.xml:463(para) groupmod.8.xml:227(para)
+#: groupadd.8.xml:279(para)
 msgid "invalid argument to option"
 msgstr "ogiltigt argument till flagga"
 
-#: useradd.8.xml:732(replaceable) pwck.8.xml:300(replaceable)
-#: passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable)
-#: groupmod.8.xml:205(replaceable) groupadd.8.xml:268(replaceable)
+#: useradd.8.xml:748(replaceable) pwck.8.xml:304(replaceable)
+#: passwd.1.xml:449(replaceable) grpck.8.xml:256(replaceable)
+#: groupmod.8.xml:231(replaceable) groupadd.8.xml:283(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:734(para)
+#: useradd.8.xml:750(para)
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr "UID används redan (och inget <option>-o</option>)"
 
-#: useradd.8.xml:740(para) groupmod.8.xml:207(para) groupmod.8.xml:213(para)
-#: groupdel.8.xml:126(para)
+#: useradd.8.xml:756(para) groupmod.8.xml:233(para) groupmod.8.xml:239(para)
+#: groupdel.8.xml:159(para)
 msgid "specified group doesn't exist"
 msgstr "angiven grupp finns inte"
 
-#: useradd.8.xml:744(replaceable) groupmod.8.xml:217(replaceable)
-#: groupadd.8.xml:274(replaceable)
+#: useradd.8.xml:760(replaceable) groupmod.8.xml:243(replaceable)
+#: groupadd.8.xml:289(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:746(para)
+#: useradd.8.xml:762(para)
 msgid "username already in use"
 msgstr "användarnamnet används redan"
 
-#: useradd.8.xml:758(para)
+#: useradd.8.xml:774(para)
 msgid "can't create home directory"
 msgstr "kan inte skapa hemkatalog"
 
-#: useradd.8.xml:762(replaceable)
+#: useradd.8.xml:778(replaceable)
 msgid "13"
 msgstr "13"
 
-#: useradd.8.xml:764(para)
+#: useradd.8.xml:780(para)
 msgid "can't create mail spool"
 msgstr "kan inte skapa postkö"
 
-#: useradd.8.xml:704(para)
+#: useradd.8.xml:720(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -2048,7 +2134,7 @@
 "Kommandot <command>useradd</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: useradd.8.xml:773(para)
+#: useradd.8.xml:789(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -2086,43 +2172,43 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
+#: suauth.5.xml:38(refentrytitle) suauth.5.xml:45(refname)
 msgid "suauth"
 msgstr "suauth"
 
-#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
-#: pwck.8.xml:306(replaceable) porttime.5.xml:35(manvolnum)
-#: passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable)
-#: login.defs.5.xml:101(manvolnum) login.access.5.xml:36(manvolnum)
-#: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
-#: grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
+#: suauth.5.xml:39(manvolnum) shadow.5.xml:39(manvolnum)
+#: pwck.8.xml:310(replaceable) porttime.5.xml:39(manvolnum)
+#: passwd.5.xml:39(manvolnum) passwd.1.xml:455(replaceable)
+#: login.defs.5.xml:102(manvolnum) login.access.5.xml:40(manvolnum)
+#: limits.5.xml:40(manvolnum) gshadow.5.xml:38(manvolnum)
+#: grpck.8.xml:262(replaceable) faillog.5.xml:39(manvolnum)
 msgid "5"
 msgstr "5"
 
-#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo)
-#: porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo)
-#: login.defs.5.xml:102(refmiscinfo) login.access.5.xml:37(refmiscinfo)
-#: limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo)
-#: faillog.5.xml:36(refmiscinfo)
+#: suauth.5.xml:40(refmiscinfo) shadow.5.xml:40(refmiscinfo)
+#: porttime.5.xml:40(refmiscinfo) passwd.5.xml:40(refmiscinfo)
+#: login.defs.5.xml:103(refmiscinfo) login.access.5.xml:41(refmiscinfo)
+#: limits.5.xml:41(refmiscinfo) gshadow.5.xml:39(refmiscinfo)
+#: faillog.5.xml:40(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr "Filformat och konversioner"
 
-#: suauth.5.xml:40(refpurpose)
+#: suauth.5.xml:46(refpurpose)
 msgid "detailed su control file"
 msgstr "detaljerad kontrollfil för su"
 
-#: suauth.5.xml:45(command) suauth.5.xml:171(filename)
+#: suauth.5.xml:51(command) suauth.5.xml:177(filename)
 msgid "/etc/suauth"
 msgstr "/etc/suauth"
 
-#: suauth.5.xml:51(para)
+#: suauth.5.xml:57(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:58(literallayout)
+#: suauth.5.xml:64(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2131,12 +2217,12 @@
 msgstr ""
 
 #. .fi
-#: suauth.5.xml:62(para)
+#: suauth.5.xml:68(para)
 msgid ""
 "2) the user executing the su command (or any groups he might be a member of)"
 msgstr ""
 
-#: suauth.5.xml:67(para)
+#: suauth.5.xml:73(para)
 msgid ""
 "The file is formatted like this, with lines starting with a # being treated "
 "as comment lines and ignored;"
@@ -2144,7 +2230,7 @@
 "Filen är i följande format, med de rader som inleds med # behandlas som "
 "kommentarsrader och ignoreras;"
 
-#: suauth.5.xml:72(literallayout)
+#: suauth.5.xml:78(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2155,17 +2241,22 @@
 "      till-id:från-id:ÅTGÄRD\n"
 "    "
 
-#: suauth.5.xml:76(para)
+#: suauth.5.xml:82(para)
+#, fuzzy
+#| 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 \",\""
 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 \",\""
+"a list of usernames delimited by \",\"."
 msgstr ""
 "Där till-id är antingen ordet <emphasis>ALL</emphasis>, en lista med "
 "användarnamn separerade med \",\" eller orden <emphasis>ALL EXCEPT</"
 "emphasis> följt av en lista med användarnamn separerade med \",\""
 
-#: suauth.5.xml:82(para)
+#: suauth.5.xml:88(para)
 msgid ""
 "from-id is formatted the same as to-id except the extra word "
 "<emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</"
@@ -2183,34 +2274,34 @@
 "<citerefentry><refentrytitle>/etc/group</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry> är nödvändigt."
 
-#: suauth.5.xml:93(para)
+#: suauth.5.xml:99(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:99(emphasis)
+#: suauth.5.xml:105(emphasis)
 msgid "DENY"
 msgstr "DENY"
 
-#: suauth.5.xml:102(para)
+#: suauth.5.xml:108(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:109(emphasis)
+#: suauth.5.xml:115(emphasis)
 msgid "NOPASS"
 msgstr "NOPASS"
 
-#: suauth.5.xml:112(para)
+#: suauth.5.xml:118(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:120(emphasis)
+#: suauth.5.xml:126(emphasis)
 msgid "OWNPASS"
 msgstr "OWNPASS"
 
-#: suauth.5.xml:123(para)
+#: suauth.5.xml:129(para)
 msgid ""
 "For the su command to be successful, the user must enter his or her own "
 "password. They are told this."
@@ -2218,7 +2309,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:131(para)
+#: suauth.5.xml:137(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 "
@@ -2227,11 +2318,11 @@
 "as fine control as he or she wishes."
 msgstr ""
 
-#: suauth.5.xml:141(title)
+#: suauth.5.xml:147(title)
 msgid "EXAMPLE"
 msgstr "EXEMPEL"
 
-#: suauth.5.xml:142(literallayout)
+#: suauth.5.xml:148(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2280,29 +2371,29 @@
 "      #\n"
 "    "
 
-#: suauth.5.xml:178(title) pwconv.8.xml:153(title) login.defs.5.xml:488(title)
+#: suauth.5.xml:184(title) pwconv.8.xml:198(title) login.defs.5.xml:491(title)
 msgid "BUGS"
 msgstr "FEL"
 
-#: suauth.5.xml:179(para)
+#: suauth.5.xml:185(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:188(title) shadow.3.xml:183(title)
+#: suauth.5.xml:194(title) shadow.3.xml:189(title)
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSTIK"
 
-#: suauth.5.xml:189(para)
+#: suauth.5.xml:195(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:198(para)
+#: suauth.5.xml:204(para)
 msgid ""
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -2310,31 +2401,31 @@
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command)
-#: login.defs.5.xml:418(term)
+#: su.1.xml:55(refentrytitle) su.1.xml:62(refname) su.1.xml:67(command)
+#: login.defs.5.xml:421(term)
 msgid "su"
 msgstr "su"
 
-#: 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:40(refmiscinfo)
+#: su.1.xml:57(refmiscinfo) sg.1.xml:41(refmiscinfo)
+#: passwd.1.xml:47(refmiscinfo) newgrp.1.xml:41(refmiscinfo)
+#: login.1.xml:73(refmiscinfo) groups.1.xml:40(refmiscinfo)
+#: gpasswd.1.xml:45(refmiscinfo) expiry.1.xml:44(refmiscinfo)
+#: chsh.1.xml:43(refmiscinfo) chfn.1.xml:43(refmiscinfo)
+#: chage.1.xml:41(refmiscinfo)
 msgid "User Commands"
 msgstr "Användarkommandon"
 
-#: su.1.xml:60(refpurpose)
+#: su.1.xml:63(refpurpose)
 #, fuzzy
 msgid "change user ID or become superuser"
 msgstr "ändra användar-id eller bli superanvändare"
 
-#: su.1.xml:70(replaceable) login.1.xml:85(replaceable)
-#: login.1.xml:93(replaceable)
+#: su.1.xml:73(replaceable) login.1.xml:88(replaceable)
+#: login.1.xml:96(replaceable)
 msgid "username"
 msgstr "användarnamn"
 
-#: su.1.xml:78(para)
+#: su.1.xml:81(para)
 #, fuzzy
 msgid ""
 "The <command>su</command> command is used to become another user during a "
@@ -2349,7 +2440,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:87(para)
+#: su.1.xml:90(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 "
@@ -2358,7 +2449,7 @@
 "specified in <filename>/etc/passwd</filename> for the target user."
 msgstr ""
 
-#: su.1.xml:96(para)
+#: su.1.xml:99(para)
 msgid ""
 "You can use the <option>--</option> argument to separate <command>su</"
 "command> options from the arguments supplied to the shell."
@@ -2366,7 +2457,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:101(para)
+#: su.1.xml:104(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 "
@@ -2376,7 +2467,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:106(para)
+#: su.1.xml:109(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 "
@@ -2386,18 +2477,18 @@
 "filename>."
 msgstr ""
 
-#: su.1.xml:115(para) login.1.xml:166(para)
+#: su.1.xml:118(para) login.1.xml:169(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:124(para)
+#: su.1.xml:127(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:128(term)
+#: su.1.xml:131(term)
 #, fuzzy
 msgid ""
 "<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
@@ -2406,17 +2497,23 @@
 "<option>-c</option>, <option>--comment</option><replaceable>KOMMENTAR</"
 "replaceable>"
 
-#: su.1.xml:133(para)
+#: su.1.xml:136(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:140(term)
+#: su.1.xml:140(para)
+msgid ""
+"The executed command will have no controlling terminal. This option cannot "
+"be used to execute interractive programs which need a controlling TTY."
+msgstr ""
+
+#: su.1.xml:150(term)
 msgid "<option>-</option>, <option>-l</option>, <option>--login</option>"
 msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
 
-#: su.1.xml:144(para)
+#: su.1.xml:154(para)
 msgid ""
 "Provide an environment similar to what the user would expect had the user "
 "logged in directly."
@@ -2424,7 +2521,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:148(para)
+#: su.1.xml:158(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 "
@@ -2434,15 +2531,15 @@
 "<command>su</command>. De andra formerna (<option>-l</option> och <option>--"
 "login</option>) har inte denna restriktion."
 
-#: su.1.xml:162(para)
+#: su.1.xml:172(para)
 msgid "The shell that will be invoked."
 msgstr "Skalet som ska startas."
 
-#: su.1.xml:170(para)
+#: su.1.xml:180(para)
 msgid "The shell specified with --shell."
 msgstr "Skalet angivet med --shell."
 
-#: su.1.xml:173(para)
+#: su.1.xml:183(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
@@ -2450,13 +2547,13 @@
 "Om <option>--preserve-environment</option> används, anges skalet med "
 "miljövariabeln <envar>$SHELL</envar>."
 
-#: su.1.xml:180(para)
+#: su.1.xml:190(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
 msgstr ""
 
-#: su.1.xml:186(para)
+#: su.1.xml:196(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
@@ -2464,12 +2561,12 @@
 "<filename>/bin/sh</filename> om ett skal inte kunde hittas med någon "
 "ovanstående metod."
 
-#: su.1.xml:163(para)
+#: su.1.xml:173(para)
 msgid ""
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:191(para)
+#: su.1.xml:201(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>/"
@@ -2478,7 +2575,7 @@
 "unless <command>su</command> is called by root."
 msgstr ""
 
-#: su.1.xml:202(term)
+#: su.1.xml:212(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2486,33 +2583,33 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:211(envar)
+#: su.1.xml:221(envar)
 msgid "$PATH"
 msgstr ""
 
-#: su.1.xml:213(para)
+#: su.1.xml:223(para)
 msgid ""
 "reset according to the <filename>/etc/login.defs</filename> options "
 "<option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
 msgstr ""
 
-#: su.1.xml:222(envar)
+#: su.1.xml:232(envar)
 msgid "$IFS"
 msgstr ""
 
-#: su.1.xml:224(para)
+#: su.1.xml:234(para)
 msgid ""
 "reset to <quote><space><tab><newline></quote>, if it was "
 "set."
 msgstr ""
 
-#: su.1.xml:207(para)
+#: su.1.xml:217(para)
 #, fuzzy
 #| msgid "Preserve the current environment."
 msgid "Preserve the current environment, except for: <placeholder-1/>"
 msgstr "Behåll den aktuella miljön."
 
-#: su.1.xml:233(para)
+#: su.1.xml:243(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
@@ -2520,27 +2617,27 @@
 "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:242(para)
+#: su.1.xml:252(para)
 msgid ""
 "The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, "
 "<envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> "
 "environment variables are reset."
 msgstr ""
 
-#: su.1.xml:251(para)
+#: su.1.xml:261(para)
 msgid ""
 "If <option>--login</option> is not used, the environment is copied, except "
 "for the variables above."
 msgstr ""
 
-#: su.1.xml:258(para)
+#: su.1.xml:268(para)
 msgid ""
 "If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>"
 "$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> "
 "environment variables are copied if they were set."
 msgstr ""
 
-#: su.1.xml:268(para)
+#: su.1.xml:278(para)
 msgid ""
 "If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</"
 "envar>, and <envar>$MAIL</envar> environment variables are set according to "
@@ -2549,23 +2646,23 @@
 "option> (see below)."
 msgstr ""
 
-#: su.1.xml:281(para)
+#: su.1.xml:291(para)
 msgid ""
 "If <option>--login</option> is used, other environment variables might be "
 "set by the <option>ENVIRON_FILE</option> file (see below)."
 msgstr ""
 
-#: su.1.xml:289(para)
+#: su.1.xml:299(para)
 msgid "Other environments might be set by PAM modules."
 msgstr ""
 
-#: su.1.xml:237(para)
+#: su.1.xml:247(para)
 msgid ""
 "Note that the default behavior for the environment is the following: "
 "<placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:303(para)
+#: su.1.xml:313(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -2614,7 +2711,7 @@
 #: 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."
+"is no."
 msgstr ""
 
 #: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
@@ -2724,7 +2821,7 @@
 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."
+"will not be translated."
 msgstr ""
 
 #: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
@@ -2755,7 +2852,9 @@
 msgstr "CHFN_AUTH (boolesk)"
 
 #: 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."
+msgid ""
+"Enable setting of resource limits from <filename>/etc/limits</filename> and "
+"ulimit, umask, and niceness from the user's passwd gecos field."
 msgstr ""
 
 #: su.1.xml:32(term) login.defs.5.xml:32(term)
@@ -2805,61 +2904,61 @@
 "sulog file logging."
 msgstr ""
 
-#: su.1.xml:363(para)
+#: su.1.xml:373(para)
 msgid ""
 "On success, <command>su</command> returns the exit value of the command it "
 "executed."
 msgstr ""
 
-#: su.1.xml:367(para)
+#: su.1.xml:377(para)
 msgid ""
 "If this command was terminated by a signal, <command>su</command> returns "
 "the number of this signal plus 128."
 msgstr ""
 
-#: su.1.xml:371(para)
+#: su.1.xml:381(para)
 msgid ""
 "If su has to kill the command (because it was asked to terminate, and the "
 "command did not terminate in time), <command>su</command> returns 255."
 msgstr ""
 
-#: su.1.xml:383(para)
+#: su.1.xml:393(para)
 msgid "success (<option>--help</option> only)"
 msgstr ""
 
-#: su.1.xml:389(para)
+#: su.1.xml:399(para)
 msgid "System or authentication failure"
 msgstr ""
 
-#: su.1.xml:393(replaceable)
+#: su.1.xml:403(replaceable)
 #, fuzzy
 #| msgid "12"
 msgid "126"
 msgstr "12"
 
-#: su.1.xml:395(para)
+#: su.1.xml:405(para)
 #, fuzzy
 #| msgid "execute command as different group ID"
 msgid "The requested command was not found"
 msgstr "kör kommando med annat grupp-id"
 
-#: su.1.xml:399(replaceable)
+#: su.1.xml:409(replaceable)
 #, fuzzy
 #| msgid "12"
 msgid "127"
 msgstr "12"
 
-#: su.1.xml:401(para)
+#: su.1.xml:411(para)
 msgid "The requested command could not be executed"
 msgstr ""
 
-#: su.1.xml:376(para)
+#: su.1.xml:386(para)
 msgid ""
 "Some exit values from <command>su</command> are independent from the "
 "executed command: <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:410(para)
+#: su.1.xml:420(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
@@ -2883,27 +2982,27 @@
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>"
 
-#: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command)
+#: sg.1.xml:39(refentrytitle) sg.1.xml:46(refname) sg.1.xml:52(command)
 msgid "sg"
 msgstr "sg"
 
-#: sg.1.xml:44(refpurpose)
+#: sg.1.xml:47(refpurpose)
 msgid "execute command as different group ID"
 msgstr "kör kommando med annat grupp-id"
 
-#: sg.1.xml:50(arg) newgrp.1.xml:49(arg)
+#: sg.1.xml:53(arg) newgrp.1.xml:52(arg)
 msgid "-"
 msgstr "-"
 
-#: sg.1.xml:52(arg) expiry.1.xml:53(arg)
+#: sg.1.xml:55(arg)
 msgid "-c"
 msgstr "-c"
 
-#: sg.1.xml:51(arg)
+#: sg.1.xml:54(arg)
 msgid "group <placeholder-1/> command"
 msgstr "grupp <placeholder-1/> kommando"
 
-#: sg.1.xml:60(para)
+#: sg.1.xml:63(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/"
@@ -2925,7 +3024,7 @@
 msgid "Enable \"syslog\" logging of <command>sg</command> activity."
 msgstr ""
 
-#: sg.1.xml:119(para)
+#: sg.1.xml:122(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -2963,20 +3062,19 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
-#: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
-#: pwck.8.xml:63(replaceable) pwck.8.xml:78(replaceable)
-#: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
+#: shadow.5.xml:38(refentrytitle) shadow.5.xml:45(refname)
+#: shadow.3.xml:38(refentrytitle) shadow.3.xml:45(refname)
+#: pwck.8.xml:65(replaceable) grpck.8.xml:57(replaceable)
 msgid "shadow"
 msgstr "shadow"
 
-#: shadow.5.xml:40(refpurpose)
+#: shadow.5.xml:46(refpurpose)
 #, fuzzy
 #| msgid "the password file"
 msgid "shadowed password file"
 msgstr "lösenordsfilen"
 
-#: shadow.5.xml:45(para)
+#: shadow.5.xml:51(para)
 #, fuzzy
 #| msgid ""
 #| "<filename>/etc/gshadow</filename> contains the shadowed information for "
@@ -2989,7 +3087,7 @@
 "<filename>/etc/gshadow</filename> innehåller skuggad gruppkontoinformation. "
 "Den innehåller rader med följande kolonseparerade fält:"
 
-#: shadow.5.xml:51(para) gshadow.5.xml:49(para)
+#: shadow.5.xml:57(para) gshadow.5.xml:55(para)
 msgid ""
 "This file must not be readable by regular users if password security is to "
 "be maintained."
@@ -2997,25 +3095,25 @@
 "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)
+#: shadow.5.xml:62(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)
+#: shadow.5.xml:69(emphasis) passwd.5.xml:59(para)
 msgid "login name"
 msgstr "inloggningsnamn"
 
-#: shadow.5.xml:65(para)
+#: shadow.5.xml:71(para)
 msgid "It must be a valid account name, which exist on the system."
 msgstr ""
 
-#: shadow.5.xml:71(emphasis) gshadow.5.xml:68(emphasis)
+#: shadow.5.xml:77(emphasis) gshadow.5.xml:74(emphasis)
 msgid "encrypted password"
 msgstr "krypterat lösenord"
 
-#: shadow.5.xml:73(para) gshadow.5.xml:70(para)
+#: shadow.5.xml:79(para) gshadow.5.xml:76(para)
 msgid ""
 "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry> for details on how this string is interpreted."
@@ -3024,7 +3122,7 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> för detaljer om hur "
 "denna sträng tolkas."
 
-#: shadow.5.xml:78(para)
+#: shadow.5.xml:84(para)
 #, fuzzy
 msgid ""
 "If the password field contains some string that is not a valid result of "
@@ -3036,7 +3134,7 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> för detaljer om hur "
 "denna sträng tolkas."
 
-#: shadow.5.xml:85(para)
+#: shadow.5.xml:91(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 "
@@ -3044,88 +3142,88 @@
 "access at all if the password field is empty."
 msgstr ""
 
-#: shadow.5.xml:92(para) gshadow.5.xml:92(para)
+#: shadow.5.xml:98(para) gshadow.5.xml:98(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)
+#: shadow.5.xml:108(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:105(para)
+#: shadow.5.xml:111(para)
 msgid ""
 "The date of the last password change, expressed as the number of days since "
 "Jan 1, 1970."
 msgstr ""
 
-#: shadow.5.xml:109(para)
+#: shadow.5.xml:115(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:114(para)
+#: shadow.5.xml:120(para)
 msgid "An empty field means that password aging features are disabled."
 msgstr ""
 
-#: shadow.5.xml:121(emphasis)
+#: shadow.5.xml:127(emphasis)
 #, fuzzy
 #| msgid "Password Changes"
 msgid "minimum password age"
 msgstr "Lösenordsändringar"
 
-#: shadow.5.xml:123(para)
+#: shadow.5.xml:129(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)
+#: shadow.5.xml:134(para)
 msgid "An empty field and value 0 mean that there are no minimum password age."
 msgstr ""
 
-#: shadow.5.xml:135(emphasis)
+#: shadow.5.xml:141(emphasis)
 #, fuzzy
 #| msgid "Password Changes"
 msgid "maximum password age"
 msgstr "Lösenordsändringar"
 
-#: shadow.5.xml:137(para)
+#: shadow.5.xml:143(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)
+#: shadow.5.xml:147(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)
+#: shadow.5.xml:152(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)
+#: shadow.5.xml:157(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)
+#: shadow.5.xml:165(emphasis)
 #, fuzzy
 #| msgid "Password Changes"
 msgid "password warning period"
 msgstr "Lösenordsändringar"
 
-#: shadow.5.xml:162(para)
+#: shadow.5.xml:168(para)
 #, fuzzy
 #| msgid ""
 #| "The number of days after a password has expired before the account will "
@@ -3137,92 +3235,92 @@
 "Antalet dagar efter att ett lösenord har gått ut innan kontot kommer att "
 "inaktiveras."
 
-#: shadow.5.xml:167(para)
+#: shadow.5.xml:173(para)
 msgid ""
 "An empty field and value 0 mean that there are no password warning period."
 msgstr ""
 
-#: shadow.5.xml:175(emphasis)
+#: shadow.5.xml:181(emphasis)
 msgid "password inactivity period"
 msgstr ""
 
-#: shadow.5.xml:178(para)
+#: shadow.5.xml:184(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)
+#: shadow.5.xml:190(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)
+#: shadow.5.xml:195(para)
 msgid ""
 "An empty field means that there are no enforcement of an inactivity period."
 msgstr ""
 
-#: shadow.5.xml:197(emphasis)
+#: shadow.5.xml:203(emphasis)
 #, fuzzy
 #| msgid "User account information."
 msgid "account expiration date"
 msgstr "Användarkontoinformation."
 
-#: shadow.5.xml:200(para)
+#: shadow.5.xml:206(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)
+#: shadow.5.xml:210(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)
+#: shadow.5.xml:216(para)
 msgid "An empty field means that the account will never expire."
 msgstr ""
 
-#: shadow.5.xml:213(para)
+#: shadow.5.xml:219(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)
+#: shadow.5.xml:227(emphasis)
 #, fuzzy
 #| msgid "a reserved field"
 msgid "reserved field"
 msgstr "ett reserverat fält"
 
-#: shadow.5.xml:223(para)
+#: shadow.5.xml:229(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:245(filename)
+#: shadow.5.xml:251(filename)
 #, fuzzy
 #| msgid "/etc/shadow"
 msgid "/etc/shadow-"
 msgstr "/etc/shadow"
 
-#: shadow.5.xml:247(para)
+#: shadow.5.xml:253(para)
 msgid "Backup file for /etc/shadow."
 msgstr ""
 
-#: shadow.5.xml:248(para) passwd.5.xml:134(para)
+#: shadow.5.xml:254(para) passwd.5.xml:140(para)
 msgid ""
 "Note that this file is used by the tools of the shadow toolsuite, but not by "
 "all user and password management tools."
 msgstr ""
 
-#: shadow.5.xml:259(para)
+#: shadow.5.xml:265(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
@@ -3270,95 +3368,95 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>"
 
-#: shadow.3.xml:36(refmiscinfo)
+#: shadow.3.xml:40(refmiscinfo)
 msgid "Library Calls"
 msgstr "Biblioteksanrop"
 
-#: shadow.3.xml:40(refname)
+#: shadow.3.xml:46(refname)
 msgid "getspnam"
 msgstr "getspnam"
 
-#: shadow.3.xml:41(refpurpose)
+#: shadow.3.xml:47(refpurpose)
 msgid "encrypted password file routines"
 msgstr ""
 
-#: shadow.3.xml:45(title)
+#: shadow.3.xml:51(title)
 msgid "SYNTAX"
 msgstr "SYNTAX"
 
-#: shadow.3.xml:47(emphasis)
+#: shadow.3.xml:53(emphasis)
 msgid "#include <shadow.h>"
 msgstr "#include <shadow.h>"
 
-#: shadow.3.xml:51(emphasis)
+#: shadow.3.xml:57(emphasis)
 msgid "struct spwd *getspent();"
 msgstr "struct spwd *getspent();"
 
-#: shadow.3.xml:55(emphasis)
+#: shadow.3.xml:61(emphasis)
 msgid "struct spwd *getspnam(char"
 msgstr "struct spwd *getspnam(char"
 
-#: shadow.3.xml:56(emphasis)
+#: shadow.3.xml:62(emphasis)
 msgid "*name"
 msgstr "*name"
 
-#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis)
-#: shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:62(emphasis) shadow.3.xml:75(emphasis)
+#: shadow.3.xml:80(emphasis) shadow.3.xml:86(emphasis)
 msgid ");"
 msgstr ");"
 
-#: shadow.3.xml:60(emphasis)
+#: shadow.3.xml:66(emphasis)
 msgid "void setspent();"
 msgstr "void setspent();"
 
-#: shadow.3.xml:64(emphasis)
+#: shadow.3.xml:70(emphasis)
 msgid "void endspent();"
 msgstr "void endspent();"
 
-#: shadow.3.xml:68(emphasis)
+#: shadow.3.xml:74(emphasis)
 msgid "struct spwd *fgetspent(FILE"
 msgstr "struct spwd *fgetspent(FILE"
 
-#: shadow.3.xml:69(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:75(emphasis) shadow.3.xml:86(emphasis)
 msgid "*fp"
 msgstr "*fp"
 
-#: shadow.3.xml:73(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "struct spwd *sgetspent(char"
 msgstr "struct spwd *sgetspent(char"
 
-#: shadow.3.xml:74(emphasis)
+#: shadow.3.xml:80(emphasis)
 msgid "*cp"
 msgstr "*cp"
 
-#: shadow.3.xml:78(emphasis)
+#: shadow.3.xml:84(emphasis)
 msgid "int putspent(struct spwd"
 msgstr "int putspent(struct spwd"
 
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "*p,"
 msgstr "*p,"
 
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "FILE"
 msgstr "FIL"
 
-#: shadow.3.xml:84(emphasis)
+#: shadow.3.xml:90(emphasis)
 msgid "int lckpwdf();"
 msgstr "int lckpwdf();"
 
-#: shadow.3.xml:88(emphasis)
+#: shadow.3.xml:94(emphasis)
 msgid "int ulckpwdf();"
 msgstr "int ulckpwdf();"
 
-#: shadow.3.xml:94(para)
+#: shadow.3.xml:100(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:99(programlisting)
+#: shadow.3.xml:105(programlisting)
 #, no-wrap
 msgid ""
 "struct spwd {\n"
@@ -3375,51 +3473,51 @@
 "    "
 msgstr ""
 
-#: shadow.3.xml:111(para)
+#: shadow.3.xml:117(para)
 msgid "The meanings of each field are:"
 msgstr "Betydelsen av varje fält är:"
 
-#: shadow.3.xml:114(para)
+#: shadow.3.xml:120(para)
 msgid "sp_namp - pointer to null-terminated user name"
 msgstr ""
 
-#: shadow.3.xml:117(para)
+#: shadow.3.xml:123(para)
 msgid "sp_pwdp - pointer to null-terminated password"
 msgstr ""
 
-#: shadow.3.xml:120(para)
+#: shadow.3.xml:126(para)
 msgid "sp_lstchg - days since Jan 1, 1970 password was last changed"
 msgstr ""
 
-#: shadow.3.xml:123(para)
+#: shadow.3.xml:129(para)
 msgid "sp_min - days before which password may not be changed"
 msgstr ""
 
-#: shadow.3.xml:126(para)
+#: shadow.3.xml:132(para)
 msgid "sp_max - days after which password must be changed"
 msgstr ""
 
-#: shadow.3.xml:129(para)
+#: shadow.3.xml:135(para)
 msgid ""
 "sp_warn - days before password is to expire that user is warned of pending "
 "password expiration"
 msgstr ""
 
-#: shadow.3.xml:134(para)
+#: shadow.3.xml:140(para)
 msgid ""
 "sp_inact - days after password expires that account is considered inactive "
 "and disabled"
 msgstr ""
 
-#: shadow.3.xml:139(para)
+#: shadow.3.xml:145(para)
 msgid "sp_expire - days since Jan 1, 1970 when account will be disabled"
 msgstr ""
 
-#: shadow.3.xml:142(para)
+#: shadow.3.xml:148(para)
 msgid "sp_flag - reserved for future use"
 msgstr "sp_flag - reserverat för framtida användning"
 
-#: shadow.3.xml:150(para)
+#: shadow.3.xml:156(para)
 msgid ""
 "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, "
 "<emphasis>fgetspent</emphasis>, and <emphasis>sgetspent</emphasis> each "
@@ -3432,13 +3530,13 @@
 "the file for an entry matching <emphasis>name</emphasis>."
 msgstr ""
 
-#: shadow.3.xml:163(para)
+#: shadow.3.xml:169(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:169(para)
+#: shadow.3.xml:175(para)
 msgid ""
 "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines "
 "should be used to insure exclusive access to the <filename>/etc/shadow</"
@@ -3450,20 +3548,20 @@
 "locks are acquired 0 is returned."
 msgstr ""
 
-#: shadow.3.xml:184(para)
+#: shadow.3.xml:190(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:194(para)
+#: shadow.3.xml:200(para)
 msgid ""
 "These routines may only be used by the superuser as access to the shadow "
 "password file is restricted."
 msgstr ""
 
-#: shadow.3.xml:214(para)
+#: shadow.3.xml:220(para)
 msgid ""
 "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -3473,38 +3571,38 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: pwconv.8.xml:43(refentrytitle) pwconv.8.xml:48(refname)
-#: pwconv.8.xml:57(command) login.defs.5.xml:401(term)
+#: pwconv.8.xml:44(refentrytitle) pwconv.8.xml:51(refname)
+#: pwconv.8.xml:60(command) login.defs.5.xml:404(term)
 msgid "pwconv"
 msgstr "pwconv"
 
-#: pwconv.8.xml:49(refname) pwconv.8.xml:60(command)
-#: login.defs.5.xml:410(term)
+#: pwconv.8.xml:52(refname) pwconv.8.xml:66(command)
+#: login.defs.5.xml:413(term)
 msgid "pwunconv"
 msgstr "pwunconv"
 
-#: pwconv.8.xml:50(refname) pwconv.8.xml:63(command)
-#: login.defs.5.xml:314(term)
+#: pwconv.8.xml:53(refname) pwconv.8.xml:72(command)
+#: login.defs.5.xml:317(term)
 msgid "grpconv"
 msgstr "grpconv"
 
-#: pwconv.8.xml:51(refname) pwconv.8.xml:66(command)
-#: login.defs.5.xml:320(term)
+#: pwconv.8.xml:54(refname) pwconv.8.xml:78(command)
+#: login.defs.5.xml:323(term)
 msgid "grpunconv"
 msgstr "grpunconv"
 
-#: pwconv.8.xml:52(refpurpose)
+#: pwconv.8.xml:55(refpurpose)
 msgid "convert to and from shadow passwords and groups"
 msgstr "konvertera till och från skugglösenord och grupper"
 
-#: pwconv.8.xml:72(para)
+#: pwconv.8.xml:87(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:77(para)
+#: pwconv.8.xml:92(para)
 msgid ""
 "<command>pwconv</command> does not work with <option>USE_TCB</option> "
 "enabled. To convert to tcb passwords, you should first use <command>pwconv</"
@@ -3514,7 +3612,7 @@
 "in <filename>login.defs</filename>.)"
 msgstr ""
 
-#: pwconv.8.xml:87(para)
+#: pwconv.8.xml:102(para)
 msgid ""
 "The <command>pwunconv</command> command creates <emphasis remap=\"I"
 "\">passwd</emphasis> from <emphasis remap=\"I\">passwd</emphasis> and "
@@ -3522,7 +3620,7 @@
 "\">shadow</emphasis>."
 msgstr ""
 
-#: pwconv.8.xml:93(para)
+#: pwconv.8.xml:108(para)
 msgid ""
 "<command>pwunconv</command> does not work with <option>USE_TCB</option> "
 "enabled. You should first switch back from tcb to shadowed passwords using "
@@ -3530,14 +3628,14 @@
 "in <filename>login.defs</filename> before using <command>pwunconv</command>."
 msgstr ""
 
-#: pwconv.8.xml:102(para)
+#: pwconv.8.xml:117(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:108(para)
+#: pwconv.8.xml:123(para)
 msgid ""
 "The <command>grpunconv</command> command creates <emphasis remap=\"I"
 "\">group</emphasis> from <emphasis remap=\"I\">group</emphasis> and "
@@ -3545,14 +3643,14 @@
 "\">gshadow</emphasis>."
 msgstr ""
 
-#: pwconv.8.xml:115(para)
+#: pwconv.8.xml:130(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:122(para)
+#: pwconv.8.xml:137(para)
 msgid ""
 "Each program acquires the necessary locks before conversion. "
 "<command>pwconv</command> and <command>grpconv</command> are similar. First, "
@@ -3564,7 +3662,7 @@
 "hand."
 msgstr ""
 
-#: pwconv.8.xml:133(para)
+#: pwconv.8.xml:148(para)
 msgid ""
 "<command>pwconv</command> will use the values of <emphasis remap=\"I"
 "\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis>, "
@@ -3572,7 +3670,7 @@
 "defs</filename> when adding new entries to <filename>/etc/shadow</filename>."
 msgstr ""
 
-#: pwconv.8.xml:142(para)
+#: pwconv.8.xml:157(para)
 msgid ""
 "Likewise <command>pwunconv</command> and <command>grpunconv</command> are "
 "similar. Passwords in the main file are updated from the shadowed file. "
@@ -3582,28 +3680,41 @@
 "can."
 msgstr ""
 
-#: pwconv.8.xml:154(para)
+#: pwconv.8.xml:169(para)
+#, fuzzy
+#| msgid ""
+#| "The options which apply to the <command>vipw</command> and <command>vigr</"
+#| "command> commands are:"
 msgid ""
+"The options which apply to the <command>pwconv</command>, <command>pwunconv</"
+"command>, <command>grpconv</command>, and <command>grpunconv</command> "
+"commands are:"
+msgstr ""
+"Flaggorna som gäller för kommandona <command>vipw</command> och "
+"<command>vigr</command> är:"
+
+#: pwconv.8.xml:199(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. "
 "Please run <command>pwck</command> and <command>grpck</command> to correct "
 "any such errors before converting to or from shadow passwords or groups."
 msgstr ""
 
-#: pwconv.8.xml:165(para)
+#: pwconv.8.xml:210(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:173(para)
+#: pwconv.8.xml:218(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of <command>pwconv</command>:"
 msgstr ""
 
-#: pwconv.8.xml:200(para)
+#: pwconv.8.xml:245(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
@@ -3633,37 +3744,23 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: pwck.8.xml:43(refentrytitle) pwck.8.xml:48(refname) pwck.8.xml:54(command)
-#: pwck.8.xml:69(command) login.defs.5.xml:392(term)
+#: pwck.8.xml:44(refentrytitle) pwck.8.xml:51(refname) pwck.8.xml:57(command)
+#: login.defs.5.xml:395(term)
 msgid "pwck"
 msgstr "pwck"
 
-#: pwck.8.xml:49(refpurpose)
+#: pwck.8.xml:52(refpurpose)
 msgid "verify integrity of password files"
 msgstr "validera integriteten för lösenordsfiler"
 
-#: pwck.8.xml:55(arg) pwck.8.xml:70(arg) pwck.8.xml:177(option)
-msgid "-q"
-msgstr "-q"
-
-#: pwck.8.xml:56(arg) pwck.8.xml:198(option) grpck.8.xml:58(arg)
-#: grpck.8.xml:149(option)
-msgid "-s"
-msgstr "-s"
-
-#: pwck.8.xml:59(replaceable) pwck.8.xml:74(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:381(term)
+#: pwck.8.xml:61(replaceable) passwd.5.xml:38(refentrytitle)
+#: passwd.5.xml:45(refname) passwd.1.xml:45(refentrytitle)
+#: passwd.1.xml:52(refname) passwd.1.xml:58(command)
+#: login.defs.5.xml:384(term)
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:71(arg) pwck.8.xml:188(option) login.1.xml:222(option)
-#: grpck.8.xml:49(arg) grpck.8.xml:139(option)
-msgid "-r"
-msgstr "-r"
-
-#: pwck.8.xml:87(para)
+#: pwck.8.xml:74(para)
 msgid ""
 "The <command>pwck</command> command verifies the integrity of the users and "
 "authentication information. It checks that all entries in <filename>/etc/"
@@ -3674,73 +3771,73 @@
 "which have other uncorrectable errors."
 msgstr ""
 
-#: pwck.8.xml:99(para) grpck.8.xml:80(para)
+#: pwck.8.xml:86(para) grpck.8.xml:75(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:102(para) grpck.8.xml:84(para)
+#: pwck.8.xml:89(para) grpck.8.xml:79(para)
 msgid "the correct number of fields"
 msgstr "korrekt antal fält"
 
-#: pwck.8.xml:105(para)
+#: pwck.8.xml:92(para)
 #, fuzzy
 #| msgid "a unique user name"
 msgid "a unique and valid user name"
 msgstr "ett unikt användarnamn"
 
-#: pwck.8.xml:108(para)
+#: pwck.8.xml:95(para)
 msgid "a valid user and group identifier"
 msgstr "en giltig identifierare för användare och grupp"
 
-#: pwck.8.xml:111(para)
+#: pwck.8.xml:98(para)
 msgid "a valid primary group"
 msgstr "en giltig primär grupp"
 
-#: pwck.8.xml:114(para)
+#: pwck.8.xml:101(para)
 msgid "a valid home directory"
 msgstr "en giltig hemkatalog"
 
-#: pwck.8.xml:117(para)
+#: pwck.8.xml:104(para)
 msgid "a valid login shell"
 msgstr "ett giltigt inloggningsskal"
 
-#: pwck.8.xml:121(para)
+#: pwck.8.xml:108(para)
 msgid ""
 "<filename>shadow</filename> checks are enabled when a second file parameter "
 "is specified or when <filename>/etc/shadow</filename> exists on the system."
 msgstr ""
 
-#: pwck.8.xml:126(para)
+#: pwck.8.xml:113(para)
 msgid "These checks are the following:"
 msgstr ""
 
-#: pwck.8.xml:131(para)
+#: pwck.8.xml:118(para)
 msgid ""
 "every passwd entry has a matching shadow entry, and every shadow entry has a "
 "matching passwd entry"
 msgstr ""
 
-#: pwck.8.xml:137(para)
+#: pwck.8.xml:124(para)
 msgid "passwords are specified in the shadowed file"
 msgstr ""
 
-#: pwck.8.xml:140(para)
+#: pwck.8.xml:127(para)
 #, fuzzy
 #| msgid "the correct number of fields"
 msgid "shadow entries have the correct number of fields"
 msgstr "korrekt antal fält"
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:130(para)
 msgid "shadow entries are unique in shadow"
 msgstr ""
 
-#: pwck.8.xml:146(para)
+#: pwck.8.xml:133(para)
 #, fuzzy
 #| msgid "days before password may be changed"
 msgid "the last password changes are not in the future"
 msgstr "dagar innan lösenordet får ändras"
 
-#: pwck.8.xml:150(para)
+#: pwck.8.xml:137(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 "
@@ -3751,28 +3848,48 @@
 "<command>usermod</command> command to correct the error."
 msgstr ""
 
-#: pwck.8.xml:161(para)
+#: pwck.8.xml:148(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:171(para)
+#: pwck.8.xml:158(para) grpck.8.xml:129(para)
+#, fuzzy
+msgid ""
+"The <option>-r</option> and <option>-s</option> options cannot be combined."
+msgstr ""
+"Flaggorna <option>-r</option>, <option>-h</option> och <option>-f</option> "
+"används endast när <command>login</command> har startats av root."
+
+#: pwck.8.xml:162(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:180(para)
+#: pwck.8.xml:175(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
 msgstr ""
 
-#: pwck.8.xml:191(para)
+#: pwck.8.xml:182(term) grpck.8.xml:144(term)
+#, fuzzy
+#| msgid "<option>-r</option>, <option>--remove</option>"
+msgid "<option>-r</option>, <option>--read-only</option>"
+msgstr "<option>-r</option>, <option>--remove</option>"
+
+#: pwck.8.xml:184(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:201(para)
+#: pwck.8.xml:203(term) grpck.8.xml:167(term)
+#, fuzzy
+#| msgid "<option>-s</option>, <option>--shadow</option>"
+msgid "<option>-s</option>, <option>--sort</option>"
+msgstr "<option>-s</option>, <option>--shadow</option>"
+
+#: pwck.8.xml:205(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
@@ -3780,13 +3897,13 @@
 "Sorterar poster i <filename>/etc/passwd</filename> och <filename>/etc/"
 "shadow</filename> efter UID."
 
-#: pwck.8.xml:205(para)
+#: pwck.8.xml:209(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid "This option has no effect when <option>USE_TCB</option> is enabled."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: pwck.8.xml:212(para)
+#: pwck.8.xml:216(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename><phrase condition=\"tcb"
@@ -3795,36 +3912,36 @@
 "<replaceable>shadow</replaceable> parameters."
 msgstr ""
 
-#: pwck.8.xml:221(para)
+#: pwck.8.xml:225(para)
 msgid ""
 "Note that when <option>USE_TCB</option> is enabled, you cannot specify an "
 "alternative <replaceable>shadow</replaceable> file. In future releases, this "
 "paramater could be replaced by an alternate TCB directory."
 msgstr ""
 
-#: pwck.8.xml:290(para)
+#: pwck.8.xml:294(para)
 msgid "one or more bad password entries"
 msgstr "en eller flera felaktiga lösenordsposter"
 
-#: pwck.8.xml:296(para)
+#: pwck.8.xml:300(para)
 msgid "can't open password files"
 msgstr "kan inte öppna lösenordsfiler"
 
-#: pwck.8.xml:302(para)
+#: pwck.8.xml:306(para)
 msgid "can't lock password files"
 msgstr "kan inte låsa lösenordsfiler"
 
-#: pwck.8.xml:308(para)
+#: pwck.8.xml:312(para)
 msgid "can't update password files"
 msgstr "kan inte uppdatera lösenordsfiler"
 
-#: pwck.8.xml:314(para)
+#: pwck.8.xml:318(para)
 #, fuzzy
 #| msgid "can't open password files"
 msgid "can't sort password files"
 msgstr "kan inte öppna lösenordsfiler"
 
-#: pwck.8.xml:272(para)
+#: pwck.8.xml:276(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -3832,7 +3949,7 @@
 "Kommandot <command>pwck</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: pwck.8.xml:323(para)
+#: pwck.8.xml:327(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
@@ -3862,15 +3979,15 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
+#: porttime.5.xml:38(refentrytitle) porttime.5.xml:45(refname)
 msgid "porttime"
 msgstr "porttime"
 
-#: porttime.5.xml:40(refpurpose)
+#: porttime.5.xml:46(refpurpose)
 msgid "port access time file"
 msgstr ""
 
-#: porttime.5.xml:45(para)
+#: porttime.5.xml:51(para)
 msgid ""
 "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, "
 "user names, and permitted login times."
@@ -3878,7 +3995,7 @@
 "<emphasis remap=\"I\">porttime</emphasis> innehåller en lista av tty-"
 "enheter, användarnamn och tillåtna inloggningstider."
 
-#: porttime.5.xml:50(para)
+#: porttime.5.xml:56(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 "
@@ -3888,7 +4005,7 @@
 "permitted access times."
 msgstr ""
 
-#: porttime.5.xml:59(para)
+#: porttime.5.xml:65(para)
 msgid ""
 "Each access time entry consists of zero or more days of the week, "
 "abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</"
@@ -3899,11 +4016,11 @@
 "indicate every day. If no days are given, <emphasis>Al</emphasis> is assumed."
 msgstr ""
 
-#: porttime.5.xml:73(title)
+#: porttime.5.xml:79(title)
 msgid "EXAMPLES"
 msgstr "EXEMPEL"
 
-#: porttime.5.xml:74(para)
+#: porttime.5.xml:80(para)
 msgid ""
 "The following entry allows access to user <emphasis remap=\"B\">jfh</"
 "emphasis> on every port during weekdays from 9am to 5pm."
@@ -3911,11 +4028,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:80(para)
+#: porttime.5.xml:86(para)
 msgid "*:jfh:Wk0900-1700"
 msgstr "*:jfh:Wk0900-1700"
 
-#: porttime.5.xml:82(para)
+#: porttime.5.xml:88(para)
 msgid ""
 "The following entries allow access only to the users <emphasis>root</"
 "emphasis> and <emphasis>oper</emphasis> on <filename>/dev/console</filename> "
@@ -3929,7 +4046,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:91(programlisting)
+#: porttime.5.xml:97(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3942,7 +4059,7 @@
 "      console:*:\n"
 "    "
 
-#: porttime.5.xml:96(para)
+#: porttime.5.xml:102(para)
 msgid ""
 "The following entry allows access for the user <emphasis>games</emphasis> on "
 "any port during non-working hours."
@@ -3950,19 +4067,19 @@
 "Fölajnde post tillåter åtkomst för användaren <emphasis>games</emphasis> på "
 "valfri port men inte under arbetstid."
 
-#: porttime.5.xml:101(para)
+#: porttime.5.xml:107(para)
 msgid "*:games:Wk1700-0900,SaSu0000-2400"
 msgstr "*:games:Wk1700-0900,SaSu0000-2400"
 
-#: porttime.5.xml:108(filename) logoutd.8.xml:67(filename)
+#: porttime.5.xml:114(filename) logoutd.8.xml:73(filename)
 msgid "/etc/porttime"
 msgstr "/etc/porttime"
 
-#: porttime.5.xml:110(para) logoutd.8.xml:69(para)
+#: porttime.5.xml:116(para) logoutd.8.xml:75(para)
 msgid "File containing port access."
 msgstr "Fil som innehåller portåtkomst"
 
-#: porttime.5.xml:118(para) login.access.5.xml:109(para)
+#: porttime.5.xml:124(para) login.access.5.xml:115(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -3970,11 +4087,11 @@
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: passwd.5.xml:40(refpurpose)
+#: passwd.5.xml:46(refpurpose)
 msgid "the password file"
 msgstr "lösenordsfilen"
 
-#: passwd.5.xml:45(para)
+#: passwd.5.xml:51(para)
 msgid ""
 "<filename>/etc/passwd</filename> contains one line for each user account, "
 "with seven fields delimited by colons (<quote>:</quote>). These fields are:"
@@ -3982,31 +4099,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:56(para)
+#: passwd.5.xml:62(para)
 msgid "optional encrypted password"
 msgstr "valfritt krypterat lösenord"
 
-#: passwd.5.xml:59(para)
+#: passwd.5.xml:65(para)
 msgid "numerical user ID"
 msgstr "numeriskt användar-id"
 
-#: passwd.5.xml:62(para)
+#: passwd.5.xml:68(para)
 msgid "numerical group ID"
 msgstr "numeriskt grupp-id"
 
-#: passwd.5.xml:65(para)
+#: passwd.5.xml:71(para)
 msgid "user name or comment field"
 msgstr "användarnamn eller kommentarsfält"
 
-#: passwd.5.xml:68(para)
+#: passwd.5.xml:74(para)
 msgid "user home directory"
 msgstr "användarens hemkatalog"
 
-#: passwd.5.xml:71(para)
+#: passwd.5.xml:77(para)
 msgid "optional user command interpreter"
 msgstr ""
 
-#: passwd.5.xml:75(para)
+#: passwd.5.xml:81(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 "
@@ -4024,21 +4141,21 @@
 "citerefentry>."
 msgstr ""
 
-#: passwd.5.xml:94(para)
+#: passwd.5.xml:100(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:100(para)
+#: passwd.5.xml:106(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:106(para)
+#: passwd.5.xml:112(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 "
@@ -4047,21 +4164,21 @@
 "defaults to the value <filename>/bin/sh</filename>."
 msgstr ""
 
-#: passwd.5.xml:127(para)
+#: passwd.5.xml:133(para)
 msgid "optional encrypted password file"
 msgstr ""
 
-#: passwd.5.xml:131(filename)
+#: passwd.5.xml:137(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/passwd-"
 msgstr "/etc/passwd"
 
-#: passwd.5.xml:133(para)
+#: passwd.5.xml:139(para)
 msgid "Backup file for /etc/passwd."
 msgstr ""
 
-#: passwd.5.xml:145(para)
+#: passwd.5.xml:151(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
@@ -4117,11 +4234,11 @@
 "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: passwd.1.xml:50(refpurpose)
+#: passwd.1.xml:53(refpurpose)
 msgid "change user password"
 msgstr "ändra användarlösenord"
 
-#: passwd.1.xml:67(para)
+#: passwd.1.xml:70(para)
 #, fuzzy
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
@@ -4136,11 +4253,11 @@
 "användaren, användarens inloggningsskal eller hans/hennes utgångsdatum för "
 "lösenordet och intervall."
 
-#: passwd.1.xml:76(title)
+#: passwd.1.xml:79(title)
 msgid "Password Changes"
 msgstr "Lösenordsändringar"
 
-#: passwd.1.xml:77(para)
+#: passwd.1.xml:80(para)
 #, fuzzy
 msgid ""
 "The user is first prompted for his/her old password, if one is present. This "
@@ -4154,7 +4271,7 @@
 "Superanvändaren tillåts kringgå detta steg så att bortglömda lösenord kan "
 "ändras."
 
-#: passwd.1.xml:85(para)
+#: passwd.1.xml:88(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, "
@@ -4165,7 +4282,7 @@
 "tillfället. Om inte, nekar <command>passwd</command> att ändra lösenordet "
 "och avslutas."
 
-#: passwd.1.xml:92(para)
+#: passwd.1.xml:95(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 "
@@ -4175,7 +4292,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:98(para)
+#: passwd.1.xml:101(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 "
@@ -4185,19 +4302,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:106(para)
+#: passwd.1.xml:109(para)
 msgid "lower case alphabetics"
 msgstr "gemena bokstäver ur alfabetet"
 
-#: passwd.1.xml:109(para)
+#: passwd.1.xml:112(para)
 msgid "digits 0 thru 9"
 msgstr "siffrorna 0 till 9"
 
-#: passwd.1.xml:112(para)
+#: passwd.1.xml:115(para)
 msgid "punctuation marks"
 msgstr "skiljetecken"
 
-#: passwd.1.xml:116(para)
+#: passwd.1.xml:119(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 "
@@ -4207,11 +4324,11 @@
 "<command>passwd</command> kommer att neka alla lösenord som inte har lämplig "
 "komplexitet."
 
-#: passwd.1.xml:125(title)
+#: passwd.1.xml:128(title)
 msgid "Hints for user passwords"
 msgstr "Tips för användarlösenord"
 
-#: passwd.1.xml:126(para)
+#: passwd.1.xml:129(para)
 #, fuzzy
 #| msgid ""
 #| "The security of a password depends upon the strength of the encryption "
@@ -4232,7 +4349,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:135(para)
+#: passwd.1.xml:138(para)
 msgid ""
 "Compromises in password security normally result from careless password "
 "selection or handling. For this reason, you should not select a password "
@@ -4246,21 +4363,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:144(para)
+#: passwd.1.xml:147(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:153(para)
+#: passwd.1.xml:156(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:158(term) faillog.8.xml:71(term)
+#: passwd.1.xml:161(term) faillog.8.xml:77(term)
 msgid "<option>-a</option>, <option>--all</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
-#: passwd.1.xml:162(para)
+#: passwd.1.xml:165(para)
 msgid ""
 "This option can be used only with <option>-S</option> and causes show status "
 "for all users."
@@ -4268,11 +4385,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:169(term)
+#: passwd.1.xml:172(term)
 msgid "<option>-d</option>, <option>--delete</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: passwd.1.xml:173(para)
+#: passwd.1.xml:176(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."
@@ -4281,11 +4398,11 @@
 "att inaktivera ett lösenord för ett konto. Det kommer att ta bort det "
 "angivna kontots lösenord."
 
-#: passwd.1.xml:181(term)
+#: passwd.1.xml:184(term)
 msgid "<option>-e</option>, <option>--expire</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
-#: passwd.1.xml:185(para)
+#: passwd.1.xml:188(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."
@@ -4293,7 +4410,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:198(term)
+#: passwd.1.xml:201(term)
 msgid ""
 "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -4301,7 +4418,7 @@
 "<option>-i</option>, <option>--inactive</option><replaceable>INAKTIV</"
 "replaceable>"
 
-#: passwd.1.xml:202(para)
+#: passwd.1.xml:205(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 "
@@ -4313,11 +4430,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:211(term)
+#: passwd.1.xml:214(term)
 msgid "<option>-k</option>, <option>--keep-tokens</option>"
 msgstr "<option>-k</option>, <option>--keep-tokens</option>"
 
-#: passwd.1.xml:215(para)
+#: passwd.1.xml:218(para)
 #, fuzzy
 msgid ""
 "Indicate password change should be performed only for expired authentication "
@@ -4328,11 +4445,11 @@
 "autentiseringslösenord. Användaren önskar behålla sitt icke-utgångna "
 "lösenord som tidigare."
 
-#: passwd.1.xml:223(term)
+#: passwd.1.xml:226(term)
 msgid "<option>-l</option>, <option>--lock</option>"
 msgstr "<option>-l</option>, <option>--lock</option>"
 
-#: passwd.1.xml:227(para)
+#: passwd.1.xml:230(para)
 #, fuzzy
 msgid ""
 "Lock the password of the named account. This option disables a password by "
@@ -4342,7 +4459,7 @@
 "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:233(para)
+#: passwd.1.xml:236(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 "
@@ -4350,11 +4467,11 @@
 "(this set the account's expire date to Jan 2, 1970)."
 msgstr ""
 
-#: passwd.1.xml:240(para)
+#: passwd.1.xml:243(para)
 msgid "Users with a locked password are not allowed to change their password."
 msgstr ""
 
-#: passwd.1.xml:247(term)
+#: passwd.1.xml:250(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
@@ -4366,7 +4483,7 @@
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAGAR</"
 "replaceable>"
 
-#: passwd.1.xml:251(para) chage.1.xml:146(para)
+#: passwd.1.xml:254(para) chage.1.xml:149(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -4376,7 +4493,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:269(term)
+#: passwd.1.xml:272(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -4384,16 +4501,16 @@
 "<option>-r</option>, <option>--repository</option><replaceable>FÖRRÅD</"
 "replaceable>"
 
-#: passwd.1.xml:273(para)
+#: passwd.1.xml:276(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:279(term)
+#: passwd.1.xml:295(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
-#: passwd.1.xml:283(para)
+#: passwd.1.xml:299(para)
 #, fuzzy
 #| msgid ""
 #| "Display account status information. The status information consists of 7 "
@@ -4420,11 +4537,11 @@
 "varningsperiod och inaktivitetsperiod för lösenordet. Dessa åldrar anges i "
 "dagar."
 
-#: passwd.1.xml:297(term)
+#: passwd.1.xml:313(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
-#: passwd.1.xml:301(para)
+#: passwd.1.xml:317(para)
 #, fuzzy
 msgid ""
 "Unlock the password of the named account. This option re-enables a password "
@@ -4435,7 +4552,7 @@
 "tillbaka lösenordet till dess tidigare värde (till värdet före användning av "
 "flaggan <option>-l</option>)."
 
-#: passwd.1.xml:310(term)
+#: passwd.1.xml:326(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -4443,7 +4560,7 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>VARN_DAGAR</"
 "replaceable>"
 
-#: passwd.1.xml:314(para)
+#: passwd.1.xml:330(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 "
@@ -4454,7 +4571,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:323(term)
+#: passwd.1.xml:339(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -4462,7 +4579,7 @@
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAGAR</"
 "replaceable>"
 
-#: passwd.1.xml:327(para)
+#: passwd.1.xml:343(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -4470,7 +4587,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:339(para)
+#: passwd.1.xml:355(para)
 #, fuzzy
 #| msgid ""
 #| "Not all options may be supported. Password complexity checking may vary "
@@ -4488,13 +4605,13 @@
 "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:344(para)
+#: passwd.1.xml:360(para)
 msgid ""
 "Users may not be able to change their password on a system if NIS is enabled "
 "and they are not logged into the NIS server."
 msgstr ""
 
-#: passwd.1.xml:349(para)
+#: passwd.1.xml:365(para)
 msgid ""
 "<command>passwd</command> uses PAM to authenticate users and to change their "
 "passwords."
@@ -4568,7 +4685,7 @@
 #: 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 "
+"This variable is superseded by the <option>ENCRYPT_METHOD</option> variable "
 "or by any command line option used to configure the encryption algorithm."
 msgstr ""
 
@@ -4657,7 +4774,7 @@
 
 #: 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."
+msgid "The values must be inside the 1000-999,999,999 range."
 msgstr ""
 
 #: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para)
@@ -4675,37 +4792,37 @@
 "option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:395(filename)
+#: passwd.1.xml:411(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/passwd"
 
-#: passwd.1.xml:397(para)
+#: passwd.1.xml:413(para)
 msgid "PAM configuration for <command>passwd</command>."
 msgstr ""
 
-#: passwd.1.xml:417(para) chage.1.xml:257(para)
+#: passwd.1.xml:433(para) chage.1.xml:273(para)
 msgid "permission denied"
 msgstr "åtkomst nekad"
 
-#: passwd.1.xml:423(para)
+#: passwd.1.xml:439(para)
 msgid "invalid combination of options"
 msgstr "ogiltig kombination av flaggor"
 
-#: passwd.1.xml:429(para)
+#: passwd.1.xml:445(para)
 msgid "unexpected failure, nothing done"
 msgstr "oväntat fel, ingenting har genomförts"
 
-#: passwd.1.xml:435(para)
+#: passwd.1.xml:451(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr "oväntat fel, filen <filename>passwd</filename> saknas"
 
-#: passwd.1.xml:441(para)
+#: passwd.1.xml:457(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr "Filen <filename>passwd</filename> är upptagen, försök igen"
 
-#: passwd.1.xml:405(para)
+#: passwd.1.xml:421(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4713,41 +4830,46 @@
 "Kommandot <command>passwd</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: passwd.1.xml:456(para)
+#: passwd.1.xml:472(para)
 #, fuzzy
 #| msgid ""
-#| "<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>."
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
-"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
-"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>chpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <phrase condition=\"no_pam"
+"\"><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, </phrase><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>."
 
-#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname)
-#: nologin.8.xml:45(command)
+#: nologin.8.xml:38(refentrytitle) nologin.8.xml:45(refname)
+#: nologin.8.xml:51(command)
 msgid "nologin"
 msgstr "nologin"
 
-#: nologin.8.xml:40(refpurpose)
+#: nologin.8.xml:46(refpurpose)
 msgid "politely refuse a login"
 msgstr "vägra snällt en inloggning"
 
-#: nologin.8.xml:51(para)
+#: nologin.8.xml:57(para)
 #, fuzzy
 msgid ""
 "The <command>nologin</command> command displays a message that an account is "
@@ -4758,7 +4880,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:56(para)
+#: nologin.8.xml:62(para)
 msgid ""
 "To disable all logins, investigate <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
@@ -4767,7 +4889,7 @@
 "<citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>."
 
-#: nologin.8.xml:65(para)
+#: nologin.8.xml:71(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
@@ -4777,67 +4899,67 @@
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: nologin.8.xml:76(title)
+#: nologin.8.xml:82(title)
 #, fuzzy
 #| msgid "HYSTORY"
 msgid "HISTORY"
 msgstr "HISTORIK"
 
-#: nologin.8.xml:77(para)
+#: nologin.8.xml:83(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:50(refentrytitle) newusers.8.xml:55(refname)
-#: newusers.8.xml:61(command) login.defs.5.xml:365(term)
+#: newusers.8.xml:51(refentrytitle) newusers.8.xml:58(refname)
+#: newusers.8.xml:64(command) login.defs.5.xml:368(term)
 msgid "newusers"
 msgstr "newusers"
 
-#: newusers.8.xml:56(refpurpose)
+#: newusers.8.xml:59(refpurpose)
 msgid "update and create new users in batch"
 msgstr "uppdatera och skapa nya användare satsvis"
 
-#: newusers.8.xml:64(replaceable)
-msgid "new_users"
-msgstr "nya_användare"
+#: newusers.8.xml:69(replaceable)
+msgid "file"
+msgstr ""
 
-#: newusers.8.xml:71(para)
+#: newusers.8.xml:76(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 exceptions "
-"explained below:"
+"The <command>newusers</command> command reads a <replaceable>file</"
+"replaceable> (or the standard input by default) and uses this information to "
+"update a set 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 exceptions explained below:"
 msgstr ""
 
-#: newusers.8.xml:79(para)
+#: newusers.8.xml:84(para)
 msgid "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
 msgstr ""
 
-#: newusers.8.xml:84(emphasis)
+#: newusers.8.xml:89(emphasis)
 #, fuzzy
 #| msgid "group_name"
 msgid "pw_name"
 msgstr "gruppnamn"
 
-#: newusers.8.xml:87(para)
+#: newusers.8.xml:92(para)
 msgid "This is the name of the user."
 msgstr ""
 
-#: newusers.8.xml:90(para)
+#: newusers.8.xml:95(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:101(emphasis)
+#: newusers.8.xml:106(emphasis)
 msgid "pw_passwd"
 msgstr "pw_passwd"
 
-#: newusers.8.xml:104(para)
+#: newusers.8.xml:109(para)
 msgid ""
 "This field will be encrypted and used as the new value of the encrypted "
 "password."
@@ -4845,62 +4967,62 @@
 "Detta fält kommer att krypteras och användas som det nya värdet för det "
 "krypterade lösenordet."
 
-#: newusers.8.xml:112(emphasis)
+#: newusers.8.xml:117(emphasis)
 #, fuzzy
 #| msgid "pw_gid"
 msgid "pw_uid"
 msgstr "pw_gid"
 
-#: newusers.8.xml:115(para)
+#: newusers.8.xml:120(para)
 msgid "This field is used to define the UID of the user."
 msgstr ""
 
-#: newusers.8.xml:118(para)
+#: newusers.8.xml:123(para)
 msgid ""
 "If the field is empty, an new (unused) UID will be defined automatically by "
 "<command>newusers</command>."
 msgstr ""
 
-#: newusers.8.xml:122(para)
+#: newusers.8.xml:127(para)
 msgid "If this field contains a number, this number will be used as the UID."
 msgstr ""
 
-#: newusers.8.xml:126(para)
+#: newusers.8.xml:131(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:132(para)
+#: newusers.8.xml:137(para)
 msgid ""
 "If the UID of an existing user is changed, the files ownership of the user's "
 "file should be fixed manually."
 msgstr ""
 
-#: newusers.8.xml:140(emphasis)
+#: newusers.8.xml:145(emphasis)
 msgid "pw_gid"
 msgstr "pw_gid"
 
-#: newusers.8.xml:143(para)
+#: newusers.8.xml:148(para)
 msgid "This field is used to define the primary group ID for the user."
 msgstr ""
 
-#: newusers.8.xml:146(para)
+#: newusers.8.xml:151(para)
 msgid ""
 "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:152(para)
+#: newusers.8.xml:157(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:158(para)
+#: newusers.8.xml:163(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> "
@@ -4908,56 +5030,56 @@
 "group."
 msgstr ""
 
-#: newusers.8.xml:164(para)
+#: newusers.8.xml:169(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 "
+"created before 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."
+"and GID for the new group."
 msgstr ""
 
-#: newusers.8.xml:176(emphasis)
+#: newusers.8.xml:181(emphasis)
 msgid "pw_gecos"
 msgstr ""
 
-#: newusers.8.xml:179(para)
+#: newusers.8.xml:184(para)
 msgid "This field is copied in the GECOS field of the user."
 msgstr ""
 
-#: newusers.8.xml:186(emphasis)
+#: newusers.8.xml:191(emphasis)
 msgid "pw_dir"
 msgstr "pw_dir"
 
-#: newusers.8.xml:189(para)
+#: newusers.8.xml:194(para)
 msgid "This field is used to define the home directory of the user."
 msgstr ""
 
-#: newusers.8.xml:192(para)
+#: newusers.8.xml:197(para)
 msgid ""
 "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:197(para)
+#: newusers.8.xml:202(para)
 msgid ""
 "If the home directory of an existing user is changed, <command>newusers</"
 "command> does not move or copy the content of the old directory to the new "
 "location. This should be done manually."
 msgstr ""
 
-#: newusers.8.xml:207(emphasis)
+#: newusers.8.xml:212(emphasis)
 msgid "pw_shell"
 msgstr ""
 
-#: newusers.8.xml:210(para)
+#: newusers.8.xml:215(para)
 msgid ""
 "This field defines the shell of the user. No checks are performed on this "
 "field."
 msgstr ""
 
-#: newusers.8.xml:218(para)
+#: newusers.8.xml:223(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 "
@@ -4965,7 +5087,7 @@
 "no changes are committed to the databases."
 msgstr ""
 
-#: newusers.8.xml:224(para)
+#: newusers.8.xml:229(para)
 msgid ""
 "During this first pass, users are created with a locked password (and "
 "passwords are not changed for the users which are not created). A second "
@@ -4973,7 +5095,7 @@
 "password are reported, but will not stop the other password updates."
 msgstr ""
 
-#: newusers.8.xml:232(para)
+#: newusers.8.xml:237(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are updated at a single time."
@@ -4981,29 +5103,29 @@
 "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:240(para)
+#: newusers.8.xml:245(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:245(term) chgpasswd.8.xml:95(term)
+#: newusers.8.xml:250(term) chgpasswd.8.xml:98(term)
 #, fuzzy
 msgid "<option>-c</option>, <option>--crypt-method</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: newusers.8.xml:247(para) chpasswd.8.xml:120(para) chgpasswd.8.xml:97(para)
+#: newusers.8.xml:252(para) chpasswd.8.xml:123(para) chgpasswd.8.xml:100(para)
 msgid "Use the specified method to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:248(para) chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
+#: newusers.8.xml:253(para) chpasswd.8.xml:127(para) chgpasswd.8.xml:104(para)
 msgid ""
 "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc "
 "support these methods."
 msgstr ""
 
-#: newusers.8.xml:270(para)
+#: newusers.8.xml:275(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are chosen in the "
@@ -5013,59 +5135,59 @@
 "the creation of groups)."
 msgstr ""
 
-#: newusers.8.xml:284(term) chgpasswd.8.xml:129(term)
+#: newusers.8.xml:302(term) chgpasswd.8.xml:145(term)
 #, fuzzy
 msgid "<option>-s</option>, <option>--sha-rounds</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: newusers.8.xml:286(para) chpasswd.8.xml:172(para) chgpasswd.8.xml:131(para)
+#: newusers.8.xml:304(para) chpasswd.8.xml:188(para) chgpasswd.8.xml:147(para)
 msgid "Use the specified number of rounds to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:289(para) chpasswd.8.xml:175(para) chgpasswd.8.xml:134(para)
+#: newusers.8.xml:307(para) chpasswd.8.xml:191(para) chgpasswd.8.xml:150(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:293(para) chpasswd.8.xml:179(para) chgpasswd.8.xml:138(para)
+#: newusers.8.xml:311(para) chpasswd.8.xml:195(para) chgpasswd.8.xml:154(para)
 msgid ""
 "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr ""
 
-#: newusers.8.xml:297(para) chpasswd.8.xml:183(para) chgpasswd.8.xml:142(para)
+#: newusers.8.xml:315(para) chpasswd.8.xml:199(para) chgpasswd.8.xml:158(para)
 msgid "You can only use this option with the SHA256 or SHA512 crypt method."
 msgstr ""
 
-#: newusers.8.xml:301(para) chgpasswd.8.xml:146(para)
+#: newusers.8.xml:319(para) chgpasswd.8.xml:162(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:313(para)
+#: newusers.8.xml:331(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:317(para) chgpasswd.8.xml:162(para)
+#: newusers.8.xml:335(para) chgpasswd.8.xml:178(para)
 msgid ""
 "You should make sure the passwords and the encryption method respect the "
 "system's password policy."
 msgstr ""
 
-#: newusers.8.xml:390(filename)
+#: newusers.8.xml:408(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/newusers"
 msgstr "/etc/passwd"
 
-#: newusers.8.xml:392(para)
+#: newusers.8.xml:410(para)
 msgid "PAM configuration for <command>newusers</command>."
 msgstr ""
 
-#: newusers.8.xml:400(para)
+#: newusers.8.xml:418(para)
 msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5079,22 +5201,21 @@
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname)
-#: newgrp.1.xml:49(command)
+#: newgrp.1.xml:39(refentrytitle) newgrp.1.xml:46(refname)
+#: newgrp.1.xml:52(command)
 msgid "newgrp"
 msgstr "newgrp"
 
-#: newgrp.1.xml:44(refpurpose)
+#: newgrp.1.xml:47(refpurpose)
 msgid "log in to a new group"
 msgstr "logga in i en ny grupp"
 
-#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
-#: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
-#: groupadd.8.xml:57(replaceable) gpasswd.1.xml:66(replaceable)
+#: newgrp.1.xml:53(replaceable) grpck.8.xml:55(replaceable)
+#: groupadd.8.xml:59(replaceable) gpasswd.1.xml:69(replaceable)
 msgid "group"
 msgstr "grupp"
 
-#: newgrp.1.xml:56(para)
+#: newgrp.1.xml:59(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, "
@@ -5103,7 +5224,7 @@
 "remains unchanged."
 msgstr ""
 
-#: newgrp.1.xml:64(para)
+#: newgrp.1.xml:67(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 "
@@ -5117,7 +5238,7 @@
 "as a member."
 msgstr ""
 
-#: newgrp.1.xml:78(para)
+#: newgrp.1.xml:81(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 "
@@ -5125,7 +5246,7 @@
 "considered."
 msgstr ""
 
-#: newgrp.1.xml:130(para)
+#: newgrp.1.xml:133(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -5151,16 +5272,18 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname)
-#: logoutd.8.xml:45(command)
+#: logoutd.8.xml:38(refentrytitle) logoutd.8.xml:45(refname)
+#: logoutd.8.xml:51(command)
 msgid "logoutd"
 msgstr "logoutd"
 
-#: logoutd.8.xml:40(refpurpose)
-msgid "Enforce login time restrictions"
+#: logoutd.8.xml:46(refpurpose)
+#, fuzzy
+#| msgid "Enforce login time restrictions"
+msgid "enforce login time restrictions"
 msgstr "Upprätthåll tidsbegränsningar för inloggningar"
 
-#: logoutd.8.xml:51(para)
+#: logoutd.8.xml:57(para)
 msgid ""
 "<command>logoutd</command> enforces the login time and port restrictions "
 "specified in <filename>/etc/porttime</filename>. <command>logoutd</command> "
@@ -5171,23 +5294,23 @@
 "porttime</filename> is terminated."
 msgstr ""
 
-#: logoutd.8.xml:73(filename) login.1.xml:319(filename)
+#: logoutd.8.xml:79(filename) login.1.xml:322(filename)
 msgid "/var/run/utmp"
 msgstr "/var/run/utmp"
 
-#: logoutd.8.xml:75(para) login.1.xml:321(para)
+#: logoutd.8.xml:81(para) login.1.xml:324(para)
 msgid "List of current login sessions."
 msgstr "Lista på aktuella inloggningssessioner."
 
-#: login.defs.5.xml:100(refentrytitle) login.defs.5.xml:105(refname)
+#: login.defs.5.xml:101(refentrytitle) login.defs.5.xml:108(refname)
 msgid "login.defs"
 msgstr "login.defs"
 
-#: login.defs.5.xml:106(refpurpose)
+#: login.defs.5.xml:109(refpurpose)
 msgid "shadow password suite configuration"
 msgstr ""
 
-#: login.defs.5.xml:111(para)
+#: login.defs.5.xml:114(para)
 msgid ""
 "The <filename>/etc/login.defs</filename> file defines the site-specific "
 "configuration for the shadow password suite. This file is required. Absence "
@@ -5195,7 +5318,7 @@
 "undesirable operation."
 msgstr ""
 
-#: login.defs.5.xml:118(para)
+#: login.defs.5.xml:121(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 "
@@ -5204,7 +5327,7 @@
 "the first non-white character of the line."
 msgstr ""
 
-#: login.defs.5.xml:126(para)
+#: login.defs.5.xml:129(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 "
@@ -5217,7 +5340,7 @@
 "and long numeric parameters is machine-dependent."
 msgstr ""
 
-#: login.defs.5.xml:141(para)
+#: login.defs.5.xml:144(para)
 msgid "The following configuration items are provided:"
 msgstr "Följande konfigurationsposter tillhandahålls:"
 
@@ -5402,7 +5525,7 @@
 #: login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "This will most likely be overridden by PAM, since the default pam_unix "
-"module has it's own built in of 3 retries. However, this is a safe fallback "
+"module has its 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 ""
@@ -5439,7 +5562,7 @@
 "inhibited."
 msgstr ""
 
-#: login.defs.5.xml:184(para)
+#: login.defs.5.xml:187(para)
 #, fuzzy
 msgid ""
 "<option>PASS_MAX_DAYS</option>, <option>PASS_MIN_DAYS</option> and "
@@ -5456,7 +5579,9 @@
 msgstr "CHFN_AUTH (boolesk)"
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "Enable checking of time restrictions specified in /etc/porttime."
+msgid ""
+"Enable checking of time restrictions specified in <filename>/etc/porttime</"
+"filename>."
 msgstr ""
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -5516,121 +5641,121 @@
 msgid "Default <command>ulimit</command> value."
 msgstr ""
 
-#: login.defs.5.xml:215(title)
+#: login.defs.5.xml:218(title)
 msgid "CROSS REFERENCES"
 msgstr ""
 
-#: login.defs.5.xml:216(para)
+#: login.defs.5.xml:219(para)
 msgid ""
 "The following cross references show which programs in the shadow password "
 "suite use which parameters."
 msgstr ""
 
-#: login.defs.5.xml:223(term) chage.1.xml:38(refentrytitle)
-#: chage.1.xml:43(refname) chage.1.xml:48(command)
+#: login.defs.5.xml:226(term) chage.1.xml:39(refentrytitle)
+#: chage.1.xml:46(refname) chage.1.xml:51(command)
 msgid "chage"
 msgstr "chage"
 
-#: login.defs.5.xml:225(para) login.defs.5.xml:413(phrase)
-#: login.defs.5.xml:480(phrase)
+#: login.defs.5.xml:228(para) login.defs.5.xml:416(phrase)
+#: login.defs.5.xml:483(phrase)
 msgid "USE_TCB"
 msgstr ""
 
-#: login.defs.5.xml:229(term) chfn.1.xml:41(refentrytitle)
-#: chfn.1.xml:46(refname) chfn.1.xml:52(command)
+#: login.defs.5.xml:232(term) chfn.1.xml:41(refentrytitle)
+#: chfn.1.xml:48(refname) chfn.1.xml:54(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:231(para)
+#: login.defs.5.xml:234(para)
 msgid ""
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:239(term) chgpasswd.8.xml:42(refentrytitle)
-#: chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
+#: login.defs.5.xml:242(term) chgpasswd.8.xml:43(refentrytitle)
+#: chgpasswd.8.xml:50(refname) chgpasswd.8.xml:56(command)
 msgid "chgpasswd"
 msgstr "chgpasswd"
 
-#: login.defs.5.xml:241(para) login.defs.5.xml:272(para)
+#: login.defs.5.xml:244(para) login.defs.5.xml:275(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:249(term) chpasswd.8.xml:41(refentrytitle)
-#: chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
+#: login.defs.5.xml:252(term) chpasswd.8.xml:42(refentrytitle)
+#: chpasswd.8.xml:49(refname) chpasswd.8.xml:55(command)
 msgid "chpasswd"
 msgstr "chpasswd"
 
-#: login.defs.5.xml:252(phrase)
+#: login.defs.5.xml:255(phrase)
 msgid "ENCRYPT_METHOD MD5_CRYPT_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:254(phrase)
+#: login.defs.5.xml:257(phrase)
 msgid "SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS"
 msgstr ""
 
-#: login.defs.5.xml:260(term) chsh.1.xml:40(refentrytitle)
-#: chsh.1.xml:45(refname) chsh.1.xml:51(command)
+#: login.defs.5.xml:263(term) chsh.1.xml:41(refentrytitle)
+#: chsh.1.xml:48(refname) chsh.1.xml:54(command)
 msgid "chsh"
 msgstr "chsh"
 
-#: login.defs.5.xml:262(para)
+#: login.defs.5.xml:265(para)
 #, fuzzy
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
-#: login.defs.5.xml:270(term) gpasswd.1.xml:42(refentrytitle)
-#: gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
+#: login.defs.5.xml:273(term) gpasswd.1.xml:43(refentrytitle)
+#: gpasswd.1.xml:50(refname) gpasswd.1.xml:64(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
-#: login.defs.5.xml:280(term) groupadd.8.xml:41(refentrytitle)
-#: groupadd.8.xml:46(refname) groupadd.8.xml:52(command)
+#: login.defs.5.xml:283(term) groupadd.8.xml:41(refentrytitle)
+#: groupadd.8.xml:48(refname) groupadd.8.xml:54(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:282(para)
+#: login.defs.5.xml:285(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:289(term) groupdel.8.xml:38(refentrytitle)
-#: groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
+#: login.defs.5.xml:292(term) groupdel.8.xml:39(refentrytitle)
+#: groupdel.8.xml:46(refname) groupdel.8.xml:52(command)
 msgid "groupdel"
 msgstr "groupdel"
 
-#: login.defs.5.xml:291(para) login.defs.5.xml:297(para)
-#: login.defs.5.xml:303(para) login.defs.5.xml:310(para)
-#: login.defs.5.xml:316(para) login.defs.5.xml:322(para)
+#: login.defs.5.xml:294(para) login.defs.5.xml:300(para)
+#: login.defs.5.xml:306(para) login.defs.5.xml:313(para)
+#: login.defs.5.xml:319(para) login.defs.5.xml:325(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:295(term) groupmems.8.xml:38(refentrytitle)
-#: groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
+#: login.defs.5.xml:298(term) groupmems.8.xml:39(refentrytitle)
+#: groupmems.8.xml:46(refname) groupmems.8.xml:52(command)
 msgid "groupmems"
 msgstr "groupmems"
 
-#: login.defs.5.xml:301(term) groupmod.8.xml:38(refentrytitle)
-#: groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
+#: login.defs.5.xml:304(term) groupmod.8.xml:39(refentrytitle)
+#: groupmod.8.xml:46(refname) groupmod.8.xml:52(command)
 msgid "groupmod"
 msgstr "groupmod"
 
-#: login.defs.5.xml:308(term) grpck.8.xml:38(refentrytitle)
-#: grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
+#: login.defs.5.xml:311(term) grpck.8.xml:39(refentrytitle)
+#: grpck.8.xml:46(refname) grpck.8.xml:52(command)
 msgid "grpck"
 msgstr "grpck"
 
-#: login.defs.5.xml:328(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)
+#: login.defs.5.xml:331(term) login.1.xml:71(refentrytitle)
+#: login.1.xml:78(refname) login.1.xml:84(command) login.1.xml:92(command)
+#: login.1.xml:99(command)
 msgid "login"
 msgstr "login"
 
-#: login.defs.5.xml:330(para)
+#: login.defs.5.xml:333(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</"
@@ -5645,17 +5770,17 @@
 "phrase> USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:357(term)
+#: login.defs.5.xml:360(term)
 #, fuzzy
 #| msgid "newgrp"
 msgid "newgrp / sg"
 msgstr "newgrp"
 
-#: login.defs.5.xml:359(para)
+#: login.defs.5.xml:362(para)
 msgid "SYSLOG_SG_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:367(para)
+#: login.defs.5.xml:370(para)
 #, fuzzy
 msgid ""
 "ENCRYPT_METHOD GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB "
@@ -5666,20 +5791,20 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:383(para)
+#: login.defs.5.xml:386(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:394(para)
+#: login.defs.5.xml:397(para)
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb"
 "\">TCB_AUTH_GROUP TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:403(para)
+#: login.defs.5.xml:406(para)
 #, fuzzy
 #| msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 msgid ""
@@ -5687,7 +5812,7 @@
 "phrase>"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 
-#: login.defs.5.xml:420(para)
+#: login.defs.5.xml:423(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH "
@@ -5697,16 +5822,16 @@
 "\">USERGROUPS_ENAB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:435(term)
+#: login.defs.5.xml:438(term)
 #, fuzzy
 msgid "sulogin"
 msgstr "login"
 
-#: login.defs.5.xml:437(para)
+#: login.defs.5.xml:440(para)
 msgid "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:446(para)
+#: login.defs.5.xml:449(para)
 #, fuzzy
 msgid ""
 "CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
@@ -5717,19 +5842,19 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:460(para)
+#: login.defs.5.xml:463(para)
 msgid ""
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB <phrase "
 "condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:470(para)
+#: login.defs.5.xml:473(para)
 msgid ""
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP <phrase condition=\"tcb"
 "\">TCB_SYMLINKS USE_TCB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:489(para)
+#: login.defs.5.xml:492(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
@@ -5755,7 +5880,7 @@
 "citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: login.defs.5.xml:505(para)
+#: login.defs.5.xml:508(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5777,22 +5902,22 @@
 "citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
+#: login.access.5.xml:39(refentrytitle) login.access.5.xml:46(refname)
 msgid "login.access"
 msgstr "login.access"
 
-#: login.access.5.xml:41(refpurpose)
+#: login.access.5.xml:47(refpurpose)
 msgid "login access control table"
 msgstr ""
 
-#: login.access.5.xml:46(para)
+#: login.access.5.xml:52(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:52(para)
+#: login.access.5.xml:58(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, "
@@ -5801,19 +5926,19 @@
 "whether the login will be accepted or refused."
 msgstr ""
 
-#: login.access.5.xml:60(para)
+#: login.access.5.xml:66(para)
 msgid ""
 "Each line of the login access control table has three fields separated by a "
 "\":\" character:"
 msgstr ""
 
-#: login.access.5.xml:65(para)
+#: login.access.5.xml:71(para)
 msgid ""
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
 "emphasis>:<emphasis remap=\"I\">origins</emphasis>"
 msgstr ""
 
-#: login.access.5.xml:69(para)
+#: login.access.5.xml:75(para)
 msgid ""
 "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or "
 "\"<emphasis>-</emphasis>\" (access denied) character. The second field "
@@ -5827,50 +5952,50 @@
 "@netgroupname in host or user patterns."
 msgstr ""
 
-#: login.access.5.xml:83(para)
+#: login.access.5.xml:89(para)
 msgid ""
 "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
 "compact rules."
 msgstr ""
 
-#: login.access.5.xml:88(para)
+#: login.access.5.xml:94(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:76(refpurpose)
+#: login.1.xml:79(refpurpose)
 msgid "begin session on the system"
 msgstr ""
 
-#: 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)
+#: login.1.xml:85(arg) login.1.xml:93(arg) login.1.xml:100(arg)
+#: login.1.xml:217(option) groupmems.8.xml:57(arg)
 msgid "-p"
 msgstr "-p"
 
-#: login.1.xml:83(replaceable) login.1.xml:91(replaceable)
-#: login.1.xml:98(replaceable)
+#: login.1.xml:86(replaceable) login.1.xml:94(replaceable)
+#: login.1.xml:101(replaceable)
 msgid "host"
 msgstr "värd"
 
-#: login.1.xml:83(arg) login.1.xml:91(arg) chfn.1.xml:56(arg)
+#: login.1.xml:86(arg) login.1.xml:94(arg)
 msgid "-h <placeholder-1/>"
 msgstr "-h <placeholder-1/>"
 
-#: login.1.xml:86(replaceable)
+#: login.1.xml:89(replaceable)
 msgid "ENV=VAR"
 msgstr ""
 
-#: login.1.xml:92(arg) login.1.xml:192(option) expiry.1.xml:54(arg)
+#: login.1.xml:95(arg) login.1.xml:195(option)
 msgid "-f"
 msgstr "-f"
 
-#: login.1.xml:98(arg) chfn.1.xml:54(arg)
+#: login.1.xml:101(arg)
 msgid "-r <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
-#: login.1.xml:104(para)
+#: login.1.xml:107(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 "
@@ -5884,7 +6009,7 @@
 "produce an error message."
 msgstr ""
 
-#: login.1.xml:118(para)
+#: login.1.xml:121(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 "
@@ -5892,7 +6017,7 @@
 "communications link is severed."
 msgstr ""
 
-#: login.1.xml:125(para)
+#: login.1.xml:128(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 "
@@ -5901,7 +6026,7 @@
 "citerefentry> for more information."
 msgstr ""
 
-#: login.1.xml:134(para)
+#: login.1.xml:137(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 "
@@ -5912,7 +6037,7 @@
 "the condition of your mailbox."
 msgstr ""
 
-#: login.1.xml:145(para)
+#: login.1.xml:148(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>, "
@@ -5922,21 +6047,21 @@
 "entries in the GECOS field."
 msgstr ""
 
-#: login.1.xml:154(para)
+#: login.1.xml:157(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:160(para)
+#: login.1.xml:163(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:172(para) login.1.xml:248(para)
+#: login.1.xml:175(para) login.1.xml:251(para)
 msgid ""
 "The <command>login</command> program is NOT responsible for removing users "
 "from the utmp file. It is the responsibility of "
@@ -5949,31 +6074,35 @@
 "\"."
 msgstr ""
 
-#: login.1.xml:195(para)
+#: login.1.xml:198(para)
 msgid "Do not perform authentication, user is preauthenticated."
 msgstr "Genomför inte autentisering, användaren är förautentiserad."
 
-#: login.1.xml:198(para)
+#: login.1.xml:201(para)
 msgid "Note: In that case, <replaceable>username</replaceable> is mandatory."
 msgstr ""
 
-#: login.1.xml:206(option)
+#: login.1.xml:209(option)
 msgid "-h"
 msgstr "-h"
 
-#: login.1.xml:209(para)
+#: login.1.xml:212(para)
 msgid "Name of the remote host for this login."
 msgstr "Namnet på fjärrvärden för denna inloggning."
 
-#: login.1.xml:217(para)
+#: login.1.xml:220(para)
 msgid "Preserve environment."
 msgstr "Behåll miljö."
 
-#: login.1.xml:225(para)
+#: login.1.xml:225(option)
+msgid "-r"
+msgstr "-r"
+
+#: login.1.xml:228(para)
 msgid "Perform autologin protocol for rlogin."
 msgstr "Genomför automatiskt inloggningsprotokoll för rlogin."
 
-#: login.1.xml:230(para)
+#: login.1.xml:233(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."
@@ -5981,18 +6110,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:239(para)
+#: login.1.xml:242(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:244(para)
+#: login.1.xml:247(para)
 msgid ""
 "The location of files is subject to differences in system configuration."
 msgstr ""
 
-#: login.1.xml:260(para)
+#: login.1.xml:263(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 "
@@ -6001,47 +6130,47 @@
 "trusted path and prevent this kind of attack."
 msgstr ""
 
-#: login.1.xml:325(filename)
+#: login.1.xml:328(filename)
 msgid "/var/log/wtmp"
 msgstr "/var/log/wtmp"
 
-#: login.1.xml:327(para)
+#: login.1.xml:330(para)
 msgid "List of previous login sessions."
 msgstr "Lista på tidigare inloggningssessioner."
 
-#: login.1.xml:343(filename)
+#: login.1.xml:346(filename)
 msgid "/etc/motd"
 msgstr "/etc/motd"
 
-#: login.1.xml:345(para)
+#: login.1.xml:348(para)
 msgid "System message of the day file."
 msgstr "Fil för dagens systemmeddelande."
 
-#: login.1.xml:349(filename)
+#: login.1.xml:352(filename)
 msgid "/etc/nologin"
 msgstr "/etc/nologin"
 
-#: login.1.xml:351(para)
+#: login.1.xml:354(para)
 msgid "Prevent non-root users from logging in."
 msgstr "Förhindra icke-rootanvändare från att logga in."
 
-#: login.1.xml:355(filename)
+#: login.1.xml:358(filename)
 msgid "/etc/ttytype"
 msgstr "/etc/ttytype"
 
-#: login.1.xml:357(para)
+#: login.1.xml:360(para)
 msgid "List of terminal types."
 msgstr "Lista på terminaltyper."
 
-#: login.1.xml:361(filename)
+#: login.1.xml:364(filename)
 msgid "$HOME/.hushlogin"
 msgstr "$HOME/.hushlogin"
 
-#: login.1.xml:363(para)
+#: login.1.xml:366(para)
 msgid "Suppress printing of system messages."
 msgstr "Tysta ner utskrift av systemmeddelanden."
 
-#: login.1.xml:377(para)
+#: login.1.xml:380(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -6071,15 +6200,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getty</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
+#: limits.5.xml:39(refentrytitle) limits.5.xml:46(refname)
 msgid "limits"
 msgstr "limits"
 
-#: limits.5.xml:41(refpurpose)
+#: limits.5.xml:47(refpurpose)
 msgid "resource limits definition"
 msgstr "definition av resursbegränsningar"
 
-#: limits.5.xml:47(para)
+#: limits.5.xml:53(para)
 msgid ""
 "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</"
 "filename> by default or LIMITS_FILE defined <filename>config.h</filename>) "
@@ -6087,81 +6216,57 @@
 "and readable by root account only."
 msgstr ""
 
-#: limits.5.xml:55(para)
+#: limits.5.xml:61(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:61(para)
+#: limits.5.xml:67(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:64(emphasis)
+#: limits.5.xml:70(emphasis)
 msgid "user LIMITS_STRING"
 msgstr "user LIMITS_STRING"
 
-#: limits.5.xml:67(para)
+#: limits.5.xml:73(para)
 msgid "or in the form:"
 msgstr ""
 
-#: limits.5.xml:70(emphasis)
+#: limits.5.xml:76(emphasis)
 #, fuzzy
 #| msgid "user LIMITS_STRING"
 msgid "@group LIMITS_STRING"
 msgstr "user LIMITS_STRING"
 
-#: limits.5.xml:73(para)
+#: limits.5.xml:79(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:79(para)
+#: limits.5.xml:85(para)
 msgid "The valid identifiers are:"
 msgstr "De giltiga identifierarna är:"
 
-#: limits.5.xml:82(para)
+#: limits.5.xml:88(para)
 msgid "A: max address space (KB)"
 msgstr "A: maximal adressrymd (KB)"
 
-#: limits.5.xml:83(para)
+#: limits.5.xml:89(para)
 msgid "C: max core file size (KB)"
 msgstr ""
 
-#: limits.5.xml:84(para)
+#: limits.5.xml:90(para)
 msgid "D: max data size (KB)"
 msgstr "D: maximal datastorlek (KB)"
 
-#: limits.5.xml:85(para)
+#: limits.5.xml:91(para)
 msgid "F: maximum filesize (KB)"
 msgstr "F: maximal filstorlek (KB)"
 
-#: limits.5.xml:86(para)
-msgid "M: max locked-in-memory address space (KB)"
-msgstr ""
-
-#: limits.5.xml:87(para)
-msgid "N: max number of open files"
-msgstr "N: maximalt antal öppna filer"
-
-#: limits.5.xml:88(para)
-msgid "R: max resident set size (KB)"
-msgstr ""
-
-#: limits.5.xml:89(para)
-msgid "S: max stack size (KB)"
-msgstr "S: maximal stackstorlek (KB)"
-
-#: limits.5.xml:90(para)
-msgid "T: max CPU time (MIN)"
-msgstr "T: maximal processortid (MIN)"
-
-#: limits.5.xml:91(para)
-msgid "U: max number of processes"
-msgstr "U: maximalt antal processer"
-
 #: limits.5.xml:92(para)
 msgid ""
 "K: file creation mask, set by <citerefentry><refentrytitle>umask</"
@@ -6169,10 +6274,26 @@
 msgstr ""
 
 #: limits.5.xml:97(para)
+msgid "I: max nice value (0..39 which translates to 20..-19)"
+msgstr ""
+
+#: limits.5.xml:99(para)
 msgid "L: max number of logins for this user"
 msgstr "L: maximalt antal inloggningar för denna användare"
 
-#: limits.5.xml:98(para)
+#: limits.5.xml:100(para)
+msgid "M: max locked-in-memory address space (KB)"
+msgstr ""
+
+#: limits.5.xml:101(para)
+msgid "N: max number of open files"
+msgstr "N: maximalt antal öppna filer"
+
+#: limits.5.xml:102(para)
+msgid "O: max real time priority"
+msgstr ""
+
+#: limits.5.xml:103(para)
 msgid ""
 "P: process priority, set by <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
@@ -6180,22 +6301,30 @@
 "P: processprioritet, inställd av <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
-#: limits.5.xml:103(para)
-msgid "I: max nice value (0..39 which translates to 20..-19)"
+#: limits.5.xml:108(para)
+msgid "R: max resident set size (KB)"
 msgstr ""
 
-#: limits.5.xml:105(para)
-msgid "O: max real time priority"
-msgstr ""
+#: limits.5.xml:109(para)
+msgid "S: max stack size (KB)"
+msgstr "S: maximal stackstorlek (KB)"
 
-#: limits.5.xml:108(para)
+#: limits.5.xml:110(para)
+msgid "T: max CPU time (MIN)"
+msgstr "T: maximal processortid (MIN)"
+
+#: limits.5.xml:111(para)
+msgid "U: max number of processes"
+msgstr "U: maximalt antal processer"
+
+#: limits.5.xml:114(para)
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
 "<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
 "entries are equivalent:"
 msgstr ""
 
-#: limits.5.xml:114(programlisting)
+#: limits.5.xml:120(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -6208,7 +6337,7 @@
 "      username L2 D2048 N5\n"
 "    "
 
-#: limits.5.xml:119(para)
+#: limits.5.xml:125(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 "
@@ -6216,7 +6345,7 @@
 "<command>login</command> program."
 msgstr ""
 
-#: limits.5.xml:126(para)
+#: limits.5.xml:132(para)
 msgid ""
 "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
 "have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
@@ -6224,50 +6353,50 @@
 "default entry."
 msgstr ""
 
-#: limits.5.xml:133(para)
+#: limits.5.xml:139(para)
 msgid ""
 "The limits specified in the form \"<replaceable>@group</replaceable>\" apply "
 "to the members of the specified <replaceable>group</replaceable>."
 msgstr ""
 
-#: limits.5.xml:139(para)
+#: limits.5.xml:145(para)
 msgid ""
-"If a line with limits for an user exist, only the first line for this user "
-"will be considered."
+"If more than one line with limits for an user exist, only the first line for "
+"this user will be considered."
 msgstr ""
 
-#: limits.5.xml:144(para)
+#: limits.5.xml:150(para)
 msgid ""
 "If no lines are specified for an user, the last <replaceable>@group</"
 "replaceable> line matching a group whose the user is a member of will be "
-"conisdered, or the last line with default limits if no groups contain the "
-"user)."
+"considered, or the last line with default limits if no groups contain the "
+"user."
 msgstr ""
 
-#: limits.5.xml:151(para)
+#: limits.5.xml:157(para)
 msgid ""
 "To completely disable limits for a user, a single dash \"<emphasis>-</"
 "emphasis>\" will do."
 msgstr ""
 
-#: limits.5.xml:156(para)
+#: limits.5.xml:162(para)
 msgid ""
 "To disable a limit for a user, a single dash \"<replaceable>-</replaceable>"
 "\" can be used instead of the numerical value for this limit."
 msgstr ""
 
-#: limits.5.xml:162(para)
+#: limits.5.xml:168(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:173(filename)
+#: limits.5.xml:179(filename)
 msgid "/etc/limits"
 msgstr "/etc/limits"
 
-#: limits.5.xml:181(para)
+#: limits.5.xml:187(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>setpriority</"
@@ -6281,16 +6410,16 @@
 "<citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
-#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname)
-#: lastlog.8.xml:46(command)
+#: lastlog.8.xml:39(refentrytitle) lastlog.8.xml:46(refname)
+#: lastlog.8.xml:52(command)
 msgid "lastlog"
 msgstr "lastlog"
 
-#: lastlog.8.xml:41(refpurpose)
+#: lastlog.8.xml:47(refpurpose)
 msgid "reports the most recent login of all users or of a given user"
 msgstr ""
 
-#: lastlog.8.xml:55(para)
+#: lastlog.8.xml:61(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</"
@@ -6299,35 +6428,35 @@
 "be printed, sorted by their order in <filename>/etc/passwd</filename>."
 msgstr ""
 
-#: lastlog.8.xml:67(para)
+#: lastlog.8.xml:73(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:72(term)
+#: lastlog.8.xml:78(term)
 msgid ""
 "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-b</option>, <option>--before</option><replaceable>DAGAR</"
 "replaceable>"
 
-#: lastlog.8.xml:76(para)
+#: lastlog.8.xml:82(para)
 msgid ""
 "Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
 msgstr ""
 
-#: lastlog.8.xml:90(term) faillog.8.xml:157(term)
+#: lastlog.8.xml:109(term) faillog.8.xml:176(term)
 msgid ""
 "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>DAGAR</replaceable>"
 
-#: lastlog.8.xml:95(para)
+#: lastlog.8.xml:114(para)
 msgid ""
 "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
 "emphasis>."
 msgstr ""
 
-#: lastlog.8.xml:102(term) faillog.8.xml:168(term)
+#: lastlog.8.xml:121(term) faillog.8.xml:187(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
@@ -6339,11 +6468,11 @@
 "<option>-K</option>, <option>--key</option><replaceable>NYCKEL</"
 "replaceable>=<replaceable>VÄRDE</replaceable>"
 
-#: lastlog.8.xml:107(para)
+#: lastlog.8.xml:126(para)
 msgid "Print the lastlog record of the specified user(s)."
 msgstr ""
 
-#: lastlog.8.xml:110(para) faillog.8.xml:178(para)
+#: lastlog.8.xml:129(para) faillog.8.xml:197(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</"
@@ -6352,24 +6481,24 @@
 "UID_MAX</replaceable>), or a min value (<replaceable>UID_MIN-</replaceable>)."
 msgstr ""
 
-#: lastlog.8.xml:122(para)
+#: lastlog.8.xml:141(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:127(para)
+#: lastlog.8.xml:146(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:197(title)
+#: lastlog.8.xml:154(title) groups.1.xml:71(title) chsh.1.xml:122(title)
+#: chage.1.xml:213(title)
 msgid "NOTE"
 msgstr "NOTERA"
 
-#: lastlog.8.xml:136(para)
+#: lastlog.8.xml:155(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, "
@@ -6379,15 +6508,15 @@
 "its real size with \"<command>ls -s</command>\"."
 msgstr ""
 
-#: lastlog.8.xml:150(filename)
+#: lastlog.8.xml:169(filename)
 msgid "/var/log/lastlog"
 msgstr "/var/log/lastlog"
 
-#: lastlog.8.xml:152(para)
+#: lastlog.8.xml:171(para)
 msgid "Database times of previous user logins."
 msgstr "Databastider för tidigare användarinloggningar."
 
-#: lastlog.8.xml:160(para)
+#: lastlog.8.xml:179(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 "
@@ -6395,15 +6524,15 @@
 "processes entries with UIDs 171-799)."
 msgstr ""
 
-#: gshadow.5.xml:33(refentrytitle) gshadow.5.xml:38(refname)
+#: gshadow.5.xml:37(refentrytitle) gshadow.5.xml:44(refname)
 msgid "gshadow"
 msgstr "gshadow"
 
-#: gshadow.5.xml:39(refpurpose)
+#: gshadow.5.xml:45(refpurpose)
 msgid "shadowed group file"
 msgstr "skuggad gruppfil"
 
-#: gshadow.5.xml:44(para)
+#: gshadow.5.xml:50(para)
 #, fuzzy
 #| msgid ""
 #| "<filename>/etc/gshadow</filename> contains the shadowed information for "
@@ -6416,19 +6545,19 @@
 "<filename>/etc/gshadow</filename> innehåller skuggad gruppkontoinformation. "
 "Den innehåller rader med följande kolonseparerade fält:"
 
-#: gshadow.5.xml:54(para)
+#: gshadow.5.xml:60(para)
 msgid "Each line of this file contains the following colon-separated fields:"
 msgstr ""
 
-#: gshadow.5.xml:60(emphasis)
+#: gshadow.5.xml:66(emphasis)
 msgid "group name"
 msgstr "gruppnamn"
 
-#: gshadow.5.xml:62(para)
+#: gshadow.5.xml:68(para)
 msgid "It must be a valid group name, which exist on the system."
 msgstr ""
 
-#: gshadow.5.xml:75(para)
+#: gshadow.5.xml:81(para)
 #, fuzzy
 msgid ""
 "If the password field contains some string that is not a valid result of "
@@ -6440,7 +6569,7 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> för detaljer om hur "
 "denna sträng tolkas."
 
-#: gshadow.5.xml:82(para)
+#: gshadow.5.xml:88(para)
 #, fuzzy
 #| msgid ""
 #| "The new value of the user's password file comment field. It is normally "
@@ -6455,51 +6584,51 @@
 "ändras det med verktyget <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: gshadow.5.xml:88(para)
+#: gshadow.5.xml:94(para)
 msgid ""
 "This field may be empty, in which case only the group members can gain the "
 "group permissions."
 msgstr ""
 
-#: gshadow.5.xml:98(para)
+#: gshadow.5.xml:104(para)
 msgid ""
 "This password supersedes any password specified in <filename>/etc/group</"
 "filename>."
 msgstr ""
 
-#: gshadow.5.xml:106(emphasis)
+#: gshadow.5.xml:112(emphasis)
 msgid "administrators"
 msgstr ""
 
-#: gshadow.5.xml:108(para) gshadow.5.xml:124(para)
+#: gshadow.5.xml:114(para) gshadow.5.xml:130(para)
 #, fuzzy
 #| msgid "comma-separated list of group members"
 msgid "It must be a comma-separated list of user names."
 msgstr "kommaseparerad lista med gruppmedlemmar"
 
-#: gshadow.5.xml:111(para)
+#: gshadow.5.xml:117(para)
 msgid "Administrators can change the password or the members of the group."
 msgstr ""
 
-#: gshadow.5.xml:115(para)
+#: gshadow.5.xml:121(para)
 msgid ""
 "Administrators also have the same permissions as the members (see below)."
 msgstr ""
 
-#: gshadow.5.xml:122(emphasis)
+#: gshadow.5.xml:128(emphasis)
 msgid "members"
 msgstr ""
 
-#: gshadow.5.xml:127(para)
+#: gshadow.5.xml:133(para)
 msgid "Members can access the group without being prompted for a password."
 msgstr ""
 
-#: gshadow.5.xml:131(para)
+#: gshadow.5.xml:137(para)
 msgid ""
 "You should use the same list of users as in <filename>/etc/group</filename>."
 msgstr ""
 
-#: gshadow.5.xml:160(para)
+#: gshadow.5.xml:166(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
@@ -6529,11 +6658,11 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: grpck.8.xml:44(refpurpose)
+#: grpck.8.xml:47(refpurpose)
 msgid "verify integrity of group files"
 msgstr "validera integriteten för gruppfiler"
 
-#: grpck.8.xml:70(para)
+#: grpck.8.xml:65(para)
 msgid ""
 "The <command>grpck</command> command verifies the integrity of the groups "
 "information. It checks that all entries in <filename>/etc/group</"
@@ -6543,13 +6672,13 @@
 "other uncorrectable errors."
 msgstr ""
 
-#: grpck.8.xml:87(para)
+#: grpck.8.xml:82(para)
 #, fuzzy
 #| msgid "a unique group name"
 msgid "a unique and valid group name"
 msgstr "ett unikt gruppnamn"
 
-#: grpck.8.xml:90(para)
+#: grpck.8.xml:85(para)
 #, fuzzy
 #| msgid ""
 #| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
@@ -6561,7 +6690,7 @@
 "Sorterar poster i <filename>/etc/passwd</filename> och <filename>/etc/"
 "shadow</filename> efter UID."
 
-#: grpck.8.xml:97(para)
+#: grpck.8.xml:92(para)
 #, fuzzy
 #| msgid "a valid list of members and administrators"
 msgid ""
@@ -6569,14 +6698,14 @@
 "phrase>"
 msgstr "en giltig lista med medlemmar och administratörer"
 
-#: grpck.8.xml:103(para)
+#: grpck.8.xml:98(para)
 msgid ""
 "a corresponding entry in the <filename>/etc/gshadow</filename> file "
 "(respectively <filename>/etc/group</filename> for the <filename>gshadow</"
 "filename> checks)"
 msgstr ""
 
-#: grpck.8.xml:111(para)
+#: grpck.8.xml:106(para)
 msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
 "an entry has the wrong number of fields, the user will be prompted to delete "
@@ -6587,7 +6716,7 @@
 "command to correct the error."
 msgstr ""
 
-#: grpck.8.xml:122(para)
+#: grpck.8.xml:117(para)
 msgid ""
 "The commands which operate on the <filename>/etc/group</filename><phrase "
 "condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
@@ -6596,20 +6725,20 @@
 "those circumstances to remove the offending entries."
 msgstr ""
 
-#: grpck.8.xml:134(para)
+#: grpck.8.xml:133(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:141(para)
+#: grpck.8.xml:146(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:151(para)
+#: grpck.8.xml:169(para)
 #, fuzzy
 #| msgid ""
 #| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
@@ -6621,7 +6750,7 @@
 "Sorterar poster i <filename>/etc/passwd</filename> och <filename>/etc/"
 "shadow</filename> efter UID."
 
-#: grpck.8.xml:160(para)
+#: grpck.8.xml:178(para)
 msgid ""
 "By default, <command>grpck</command> operates on <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</"
@@ -6631,23 +6760,23 @@
 "emphasis> parameters.</phrase>"
 msgstr ""
 
-#: grpck.8.xml:228(para)
+#: grpck.8.xml:246(para)
 msgid "one or more bad group entries"
 msgstr "en eller flera felaktiga grupposter"
 
-#: grpck.8.xml:234(para)
+#: grpck.8.xml:252(para)
 msgid "can't open group files"
 msgstr "kan inte öppna gruppfiler"
 
-#: grpck.8.xml:240(para)
+#: grpck.8.xml:258(para)
 msgid "can't lock group files"
 msgstr "kan inte låsa gruppfiler"
 
-#: grpck.8.xml:246(para)
+#: grpck.8.xml:264(para)
 msgid "can't update group files"
 msgstr "kan inte uppdatera gruppfiler"
 
-#: grpck.8.xml:210(para)
+#: grpck.8.xml:228(para)
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6655,7 +6784,7 @@
 "Kommandot <command>grpck</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: grpck.8.xml:255(para)
+#: grpck.8.xml:273(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
@@ -6679,20 +6808,20 @@
 "citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
-#: groups.1.xml:45(command)
+#: groups.1.xml:38(refentrytitle) groups.1.xml:45(refname)
+#: groups.1.xml:51(command)
 msgid "groups"
 msgstr "groups"
 
-#: groups.1.xml:40(refpurpose)
+#: groups.1.xml:46(refpurpose)
 msgid "display current group names"
 msgstr "visa aktuella gruppnamn"
 
-#: groups.1.xml:47(replaceable) chfn.1.xml:58(replaceable)
+#: groups.1.xml:53(replaceable)
 msgid "user"
 msgstr "användare"
 
-#: groups.1.xml:54(para)
+#: groups.1.xml:60(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/"
@@ -6701,15 +6830,15 @@
 "the groups for the named <emphasis remap=\"I\">user</emphasis>."
 msgstr ""
 
-#: groups.1.xml:66(para)
+#: groups.1.xml:72(para)
 msgid ""
 "Systems which do not support concurrent group sets will have the information "
 "from <filename>/etc/group</filename> reported. The user must use "
-"<command>newgrp</command> or <command>sg</command> to change their current "
+"<command>newgrp</command> or <command>sg</command> to change his current "
 "real and effective group ID."
 msgstr ""
 
-#: groups.1.xml:88(para)
+#: groups.1.xml:94(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getgid</"
@@ -6725,51 +6854,57 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getuid</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
-#: groupmod.8.xml:44(refpurpose)
+#: groupmod.8.xml:47(refpurpose)
 msgid "modify a group definition on the system"
 msgstr "ändra en gruppdefinition på systemet"
 
-#: groupmod.8.xml:53(replaceable)
+#: groupmod.8.xml:56(replaceable) groupdel.8.xml:56(replaceable)
 msgid "GROUP"
 msgstr "GRUPP"
 
-#: groupmod.8.xml:59(para)
+#: groupmod.8.xml:62(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:68(para)
+#: groupmod.8.xml:71(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:74(term) groupadd.8.xml:93(term)
+#: groupmod.8.xml:77(term) groupadd.8.xml:95(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
-#: groupmod.8.xml:78(para)
+#: groupmod.8.xml:81(para)
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
 "to <replaceable>GID</replaceable>."
 msgstr ""
 
-#: groupmod.8.xml:82(para)
+#: groupmod.8.xml:85(para)
 msgid ""
 "The value of <replaceable>GID</replaceable> must be a non-negative decimal "
 "integer. This value must be unique, unless the <option>-o</option> option is "
 "used. Values between 0 and 999 are typically reserved for system groups."
 msgstr ""
 
-#: groupmod.8.xml:89(para)
+#: groupmod.8.xml:92(para)
 msgid ""
+"Users who use the group as primary group will be updated to keep the group "
+"as their primary group."
+msgstr ""
+
+#: groupmod.8.xml:96(para)
+msgid ""
 "Any files that have the old group ID and must continue to belong to "
 "<replaceable>GROUP</replaceable>, must have their group ID changed manually."
 msgstr ""
 
-#: groupmod.8.xml:104(term)
+#: groupmod.8.xml:111(term)
 msgid ""
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
@@ -6777,13 +6912,13 @@
 "<option>-n</option>, <option>--new-name</option><replaceable>NY_GRUPP</"
 "replaceable>"
 
-#: groupmod.8.xml:109(para)
+#: groupmod.8.xml:116(para)
 msgid ""
 "The name of the group will be changed from <replaceable>GROUP</replaceable> "
 "to <replaceable>NEW_GROUP</replaceable> name."
 msgstr ""
 
-#: groupmod.8.xml:120(para)
+#: groupmod.8.xml:127(para)
 #, fuzzy
 msgid ""
 "When used with the <option>-g</option> option, allow to change the group "
@@ -6791,11 +6926,11 @@
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
-#: groupmod.8.xml:219(para)
+#: groupmod.8.xml:245(para)
 msgid "group name already in use"
 msgstr "gruppnamnet används redan"
 
-#: groupmod.8.xml:183(para)
+#: groupmod.8.xml:209(para)
 msgid ""
 "The <command>groupmod</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6803,7 +6938,7 @@
 "Kommandot <command>groupmod</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: groupmod.8.xml:234(para)
+#: groupmod.8.xml:260(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6835,35 +6970,35 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: groupmems.8.xml:44(refpurpose)
+#: groupmems.8.xml:47(refpurpose)
 msgid "administer members of a user's primary group"
 msgstr "administrera medlemmar av en användares primära grupp"
 
-#: groupmems.8.xml:51(replaceable) groupmems.8.xml:52(replaceable)
+#: groupmems.8.xml:54(replaceable) groupmems.8.xml:55(replaceable)
 msgid "user_name"
 msgstr "användarnamn"
 
-#: groupmems.8.xml:51(arg)
+#: groupmems.8.xml:54(arg)
 msgid "-a <placeholder-1/>"
 msgstr "-a <placeholder-1/>"
 
-#: groupmems.8.xml:52(arg)
+#: groupmems.8.xml:55(arg)
 msgid "-d <placeholder-1/>"
 msgstr "-d <placeholder-1/>"
 
-#: groupmems.8.xml:53(replaceable)
+#: groupmems.8.xml:56(replaceable)
 msgid "group_name"
 msgstr "gruppnamn"
 
-#: groupmems.8.xml:53(arg)
+#: groupmems.8.xml:56(arg)
 msgid "-g <placeholder-1/>"
 msgstr "-g <placeholder-1/>"
 
-#: groupmems.8.xml:54(arg)
+#: groupmems.8.xml:57(arg)
 msgid "-l"
 msgstr "-l"
 
-#: groupmems.8.xml:61(para)
+#: groupmems.8.xml:64(para)
 msgid ""
 "The <command>groupmems</command> command allows a user to administer his/her "
 "own group membership list without the requirement of superuser privileges. "
@@ -6871,7 +7006,7 @@
 "users to be in their own name sake primary group (i.e., guest / guest)."
 msgstr ""
 
-#: groupmems.8.xml:69(para)
+#: groupmems.8.xml:72(para)
 #, fuzzy
 msgid ""
 "Only the superuser, as administrator, can use <command>groupmems</command> "
@@ -6880,12 +7015,12 @@
 "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:76(para)
+#: groupmems.8.xml:79(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:82(term)
+#: groupmems.8.xml:85(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
@@ -6895,21 +7030,21 @@
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: groupmems.8.xml:84(para)
+#: groupmems.8.xml:87(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:85(para) groupmems.8.xml:101(para)
-#: groupmems.8.xml:132(para)
+#: groupmems.8.xml:88(para) groupmems.8.xml:104(para)
+#: groupmems.8.xml:135(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)
+#: groupmems.8.xml:96(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -6920,17 +7055,17 @@
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>DAGAR</replaceable>"
 
-#: groupmems.8.xml:95(para)
+#: groupmems.8.xml:98(para)
 msgid "Delete a user from the group membership list."
 msgstr "Ta bort en användare från gruppen medlemslista."
 
-#: groupmems.8.xml:96(para)
+#: groupmems.8.xml:99(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:109(term)
+#: groupmems.8.xml:112(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
@@ -6940,34 +7075,34 @@
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
-#: groupmems.8.xml:111(para)
+#: groupmems.8.xml:114(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:123(term) chage.1.xml:132(term)
+#: groupmems.8.xml:126(term) chage.1.xml:135(term)
 msgid "<option>-l</option>, <option>--list</option>"
 msgstr "<option>-l</option>, <option>--list</option>"
 
-#: groupmems.8.xml:125(para)
+#: groupmems.8.xml:128(para)
 msgid "List the group membership list."
 msgstr "Lista gruppens medlemslista."
 
-#: groupmems.8.xml:129(term)
+#: groupmems.8.xml:132(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:131(para)
+#: groupmems.8.xml:134(para)
 msgid "Purge all users from the group membership list."
 msgstr "Rensa alla användare från gruppens medlemslista."
 
-#: groupmems.8.xml:143(title)
+#: groupmems.8.xml:159(title)
 msgid "SETUP"
 msgstr ""
 
-#: groupmems.8.xml:144(para)
+#: groupmems.8.xml:160(para)
 msgid ""
 "The <command>groupmems</command> executable should be in mode <literal>2770</"
 "literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</"
@@ -6976,7 +7111,7 @@
 "utility to manage their own group membership list."
 msgstr ""
 
-#: groupmems.8.xml:153(programlisting)
+#: groupmems.8.xml:169(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -6993,11 +7128,11 @@
 "\t$ groupmems -g groups -a gk4\n"
 "    "
 
-#: groupmems.8.xml:185(para)
+#: groupmems.8.xml:201(para)
 msgid "secure group account information"
 msgstr "säker gruppkontoinformation"
 
-#: groupmems.8.xml:193(para)
+#: groupmems.8.xml:209(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7025,18 +7160,29 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: groupdel.8.xml:44(refpurpose)
+#: groupdel.8.xml:47(refpurpose)
 msgid "delete a group"
 msgstr "ta bort en grupp"
 
-#: groupdel.8.xml:58(para)
+#: groupdel.8.xml:62(para)
+#, fuzzy
 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."
+"deleting all entries that refer to <replaceable>GROUP</replaceable>. The "
+"named group must exist."
 msgstr ""
+"Kommandot <command>userdel</command> ändrar i systemkontofilerna, tar bort "
+"alla poster som refererar till <emphasis remap=\"I\">login_name</emphasis>. "
+"Den angivna användaren måste finnas."
 
-#: groupdel.8.xml:66(para)
+#: groupdel.8.xml:70(para)
+#, fuzzy
+#| msgid ""
+#| "The options which apply to the <command>groupmod</command> command are:"
+msgid "The options which apply to the <command>groupdel</command> command are:"
+msgstr "Flaggorna som gäller för kommandot <command>groupmod</command> är:"
+
+#: groupdel.8.xml:99(para)
 msgid ""
 "You may not remove the primary group of any existing user. You must remove "
 "the user before you remove the group."
@@ -7044,17 +7190,17 @@
 "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:70(para)
+#: groupdel.8.xml:103(para)
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this group."
 msgstr ""
 
-#: groupdel.8.xml:132(para)
+#: groupdel.8.xml:165(para)
 msgid "can't remove user's primary group"
 msgstr "kan inte ta bort användarens primära grupp"
 
-#: groupdel.8.xml:108(para)
+#: groupdel.8.xml:141(para)
 msgid ""
 "The <command>groupdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -7062,7 +7208,23 @@
 "Kommandot <command>groupdel</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: groupdel.8.xml:147(para)
+#: groupdel.8.xml:180(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>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7077,7 +7239,7 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7094,22 +7256,22 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>"
 
-#: groupadd.8.xml:47(refpurpose)
+#: groupadd.8.xml:49(refpurpose)
 msgid "create a new group"
 msgstr "skapa en ny grupp"
 
-#: groupadd.8.xml:64(para)
+#: groupadd.8.xml:66(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:73(para)
+#: groupadd.8.xml:75(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:83(para)
+#: groupadd.8.xml:85(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 "
@@ -7117,7 +7279,7 @@
 "g</option> is turned off)."
 msgstr ""
 
-#: groupadd.8.xml:97(para)
+#: groupadd.8.xml:99(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 "
@@ -7126,7 +7288,7 @@
 "system accounts."
 msgstr ""
 
-#: groupadd.8.xml:117(para)
+#: groupadd.8.xml:119(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (GID_MIN, GID_MAX "
 "and others). Multiple <option>-K</option> options can be specified."
@@ -7134,7 +7296,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:122(para)
+#: groupadd.8.xml:124(para)
 #, fuzzy
 #| msgid ""
 #| "Example: <option>-K </option><replaceable>GID_MIN</"
@@ -7149,7 +7311,7 @@
 "replaceable>=<replaceable>100</replaceable><option> -K </"
 "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: groupadd.8.xml:126(para)
+#: groupadd.8.xml:128(para)
 msgid ""
 "Note: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
@@ -7159,18 +7321,18 @@
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
 "replaceable>=<replaceable>499</replaceable> fungerar ännu inte."
 
-#: groupadd.8.xml:138(para)
+#: groupadd.8.xml:140(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:170(para)
+#: groupadd.8.xml:172(para)
 #, fuzzy
 #| msgid "create a new group"
 msgid "Create a system group."
 msgstr "skapa en ny grupp"
 
-#: groupadd.8.xml:173(para)
+#: groupadd.8.xml:175(para)
 msgid ""
 "The numeric identifiers of new system groups are chosen in the "
 "<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
@@ -7178,7 +7340,7 @@
 "<option>GID_MAX</option>."
 msgstr ""
 
-#: groupadd.8.xml:224(para)
+#: groupadd.8.xml:239(para)
 #, fuzzy
 #| msgid ""
 #| "Usernames must begin with a lower case letter or an underscore, and only "
@@ -7193,11 +7355,11 @@
 "endast innehålla gemener, understreck, minustecken och på slutet ett dollar-"
 "tecken. I reguljära uttryckstermer: [a-z_][a-z0-9_-]*[$]"
 
-#: groupadd.8.xml:230(para)
+#: groupadd.8.xml:245(para)
 msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr ""
 
-#: groupadd.8.xml:233(para)
+#: groupadd.8.xml:248(para)
 #, fuzzy
 msgid ""
 "You may not add a NIS or LDAP group. This must be performed on the "
@@ -7206,21 +7368,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:237(para)
+#: groupadd.8.xml:252(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:270(para)
+#: groupadd.8.xml:285(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:276(para)
+#: groupadd.8.xml:291(para)
 msgid "group name not unique"
 msgstr "gruppnamn inte unikt"
 
-#: groupadd.8.xml:246(para)
+#: groupadd.8.xml:261(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -7228,7 +7390,7 @@
 "Kommandot <command>groupadd</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: groupadd.8.xml:291(para)
+#: groupadd.8.xml:306(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7262,23 +7424,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:49(phrase)
+#: gpasswd.1.xml:52(phrase)
 #, fuzzy
 #| msgid "-r <placeholder-1/>"
 msgid "administer <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
-#: gpasswd.1.xml:52(phrase)
+#: gpasswd.1.xml:55(phrase)
 #, fuzzy
 msgid "administer <placeholder-1/> and <placeholder-2/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:63(replaceable)
+#: gpasswd.1.xml:66(replaceable) expiry.1.xml:57(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "flaggor"
 
-#: gpasswd.1.xml:73(para)
+#: gpasswd.1.xml:76(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -7286,14 +7448,14 @@
 "\">administrators,</phrase> members and a password."
 msgstr ""
 
-#: gpasswd.1.xml:81(para)
+#: gpasswd.1.xml:84(para)
 msgid ""
 "System administrators can use the <option>-A</option> option to define group "
 "administrator(s) and the <option>-M</option> option to define members. They "
 "have all rights of group administrators and members."
 msgstr ""
 
-#: gpasswd.1.xml:86(para)
+#: gpasswd.1.xml:89(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -7301,7 +7463,7 @@
 "of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:93(para)
+#: gpasswd.1.xml:96(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still use "
@@ -7312,18 +7474,18 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> för detaljer om hur "
 "denna sträng tolkas."
 
-#: gpasswd.1.xml:101(title)
+#: gpasswd.1.xml:104(title)
 msgid "Notes about group passwords"
 msgstr "Noteringar angående grupplösenord"
 
-#: gpasswd.1.xml:102(para)
+#: gpasswd.1.xml:105(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:113(para)
+#: gpasswd.1.xml:116(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
@@ -7332,16 +7494,16 @@
 "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:117(para)
+#: gpasswd.1.xml:120(para)
 msgid "The options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:120(para)
+#: gpasswd.1.xml:123(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:125(term)
+#: gpasswd.1.xml:128(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
@@ -7350,13 +7512,13 @@
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:129(para)
+#: gpasswd.1.xml:132(para)
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:138(term)
+#: gpasswd.1.xml:141(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -7366,39 +7528,51 @@
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>DAGAR</replaceable>"
 
-#: gpasswd.1.xml:142(para)
+#: gpasswd.1.xml:145(para)
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
 "<replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:159(term)
+#: gpasswd.1.xml:162(term)
 #, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-Q</option>, <option>--root</option><replaceable>CHROOT_DIR</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HEM_KAT</"
+"replaceable>"
+
+#: gpasswd.1.xml:177(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:163(para)
+#: gpasswd.1.xml:181(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:174(term)
+#: gpasswd.1.xml:192(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:178(para)
+#: gpasswd.1.xml:196(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:189(term)
+#: gpasswd.1.xml:207(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
@@ -7410,12 +7584,12 @@
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAGAR</"
 "replaceable>"
 
-#: gpasswd.1.xml:193(para)
+#: gpasswd.1.xml:211(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr "kommaseparerad lista med gruppadministratörer"
 
-#: gpasswd.1.xml:201(term)
+#: gpasswd.1.xml:219(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
@@ -7427,12 +7601,12 @@
 "<option>-b</option>, <option>--before</option><replaceable>DAGAR</"
 "replaceable>"
 
-#: gpasswd.1.xml:205(para)
+#: gpasswd.1.xml:223(para)
 #, fuzzy
 msgid "Set the list of group members."
 msgstr "kommaseparerad lista med gruppmedlemmar"
 
-#: gpasswd.1.xml:215(para)
+#: gpasswd.1.xml:233(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -7441,7 +7615,7 @@
 "server."
 msgstr ""
 
-#: gpasswd.1.xml:260(para)
+#: gpasswd.1.xml:278(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -7468,17 +7642,17 @@
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: 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:86(refentrytitle)
+#: faillog.8.xml:38(refentrytitle) faillog.8.xml:45(refname)
+#: faillog.8.xml:51(command) faillog.5.xml:38(refentrytitle)
+#: faillog.5.xml:45(refname) faillog.5.xml:92(refentrytitle)
 msgid "faillog"
 msgstr "faillog"
 
-#: faillog.8.xml:40(refpurpose)
+#: faillog.8.xml:46(refpurpose)
 msgid "display faillog records or set login failure limits"
 msgstr ""
 
-#: faillog.8.xml:54(para)
+#: faillog.8.xml:60(para)
 msgid ""
 "<command>faillog</command> displays the contents of the failure log database "
 "(<filename>/var/log/faillog</filename>). It can also set the failure "
@@ -7487,30 +7661,30 @@
 "failure."
 msgstr ""
 
-#: faillog.8.xml:65(para)
+#: faillog.8.xml:71(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:73(para)
+#: faillog.8.xml:79(para)
 msgid ""
 "Display (or act on) faillog records for all users having an entry in the "
 "<filename>faillog</filename> database."
 msgstr ""
 
-#: faillog.8.xml:77(para)
+#: faillog.8.xml:83(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
 "The range of users can be restricted with the <option>-u</option> option."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: faillog.8.xml:81(para)
+#: faillog.8.xml:87(para)
 msgid ""
 "In display mode, this is still restricted to existing users but forces the "
 "display of the faillog entries even if they are empty."
 msgstr ""
 
-#: faillog.8.xml:86(para)
+#: faillog.8.xml:92(para)
 msgid ""
 "With the <option>-l</option>, <option>-m</option>, <option>-r</option>, "
 "<option>-t</option> options, the users' records are changed, even if the "
@@ -7518,7 +7692,7 @@
 "that have been deleted or to set a policy in advance for a range of users."
 msgstr ""
 
-#: faillog.8.xml:103(term)
+#: faillog.8.xml:109(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
@@ -7530,7 +7704,7 @@
 "<option>-l</option>, <option>--lock-time</option><replaceable>SEK</"
 "replaceable>"
 
-#: faillog.8.xml:108(para)
+#: faillog.8.xml:114(para)
 #, fuzzy
 #| msgid ""
 #| "Lock account to <replaceable>SEC</replaceable> seconds after failed login."
@@ -7540,19 +7714,19 @@
 "Lås kontot <replaceable>SEK</replaceable> sekunder efter misslyckad "
 "inloggning."
 
-#: faillog.8.xml:112(para) faillog.8.xml:138(para) faillog.8.xml:150(para)
+#: faillog.8.xml:118(para) faillog.8.xml:144(para) faillog.8.xml:156(para)
 msgid ""
 "Write access to <filename>/var/log/faillog</filename> is required for this "
 "option."
 msgstr ""
 
-#: faillog.8.xml:119(term)
+#: faillog.8.xml:125(term)
 msgid ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 
-#: faillog.8.xml:124(para)
+#: faillog.8.xml:130(para)
 #, fuzzy
 #| msgid ""
 #| "Set the maximum number of days a password remains valid. After "
@@ -7565,39 +7739,39 @@
 "Sätter maximalt antal dagar som ett lösenord ska vara giltigt. Efter "
 "<replaceable>MAX_DAGAR</replaceable> krävs det att lösenordet ändras."
 
-#: faillog.8.xml:128(para)
+#: faillog.8.xml:134(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:133(para)
+#: faillog.8.xml:139(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:145(term)
+#: faillog.8.xml:151(term)
 msgid "<option>-r</option>, <option>--reset</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: faillog.8.xml:147(para)
+#: faillog.8.xml:153(para)
 msgid "Reset the counters of login failures."
 msgstr ""
 
-#: faillog.8.xml:161(para)
+#: faillog.8.xml:180(para)
 msgid ""
 "Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr ""
 
-#: faillog.8.xml:173(para)
+#: faillog.8.xml:192(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 the specified user(s)."
 msgstr ""
 
-#: faillog.8.xml:191(para)
+#: faillog.8.xml:210(para)
 #, fuzzy
 #| msgid ""
 #| "The <option>-r</option>, <option>-h</option> and <option>-f</option> "
@@ -7610,7 +7784,7 @@
 "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:200(para)
+#: faillog.8.xml:219(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 "
@@ -7619,15 +7793,15 @@
 "option> flag."
 msgstr ""
 
-#: faillog.8.xml:213(filename) faillog.5.xml:74(filename)
+#: faillog.8.xml:232(filename) faillog.5.xml:80(filename)
 msgid "/var/log/faillog"
 msgstr "/var/log/faillog"
 
-#: faillog.8.xml:215(para) faillog.5.xml:76(para)
+#: faillog.8.xml:234(para) faillog.5.xml:82(para)
 msgid "Failure logging file."
 msgstr ""
 
-#: faillog.8.xml:223(para)
+#: faillog.8.xml:242(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
@@ -7637,31 +7811,31 @@
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: faillog.5.xml:40(refpurpose)
+#: faillog.5.xml:46(refpurpose)
 msgid "login failure logging file"
 msgstr ""
 
-#: faillog.5.xml:45(para)
+#: faillog.5.xml:51(para)
 msgid ""
 "<filename>/var/log/faillog</filename> maintains a count of login failures "
 "and the limits for each account."
 msgstr ""
 
-#: faillog.5.xml:49(para)
+#: faillog.5.xml:55(para)
 msgid ""
 "The file contains fixed length records, indexed by numerical UID. Each "
 "record contains the count of login failures since the last successful login; "
 "the maximum number of failures before the account is disabled; the line on "
-"whiche the last login failure occurred; the date of the last login failure; "
+"which the last login failure occurred; the date of the last login failure; "
 "and the duration (in seconds) during which the account will be locked after "
 "a failure."
 msgstr ""
 
-#: faillog.5.xml:59(para)
+#: faillog.5.xml:65(para)
 msgid "The structure of the file is:"
 msgstr "Strukturen för filen är:"
 
-#: faillog.5.xml:60(programlisting)
+#: faillog.5.xml:66(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -7682,23 +7856,45 @@
 "\tlong    fail_locktime;\n"
 "};"
 
-#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
-#: expiry.1.xml:52(command)
+#: expiry.1.xml:42(refentrytitle) expiry.1.xml:49(refname)
+#: expiry.1.xml:55(command)
 msgid "expiry"
 msgstr "expiry"
 
-#: expiry.1.xml:47(refpurpose)
+#: expiry.1.xml:50(refpurpose)
 msgid "check and enforce password expiration policy"
 msgstr "kontrollera och upprätthåll policy för lösenordsutgång"
 
-#: expiry.1.xml:60(para)
+#: expiry.1.xml:64(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:87(para) chage.1.xml:278(para)
+#: expiry.1.xml:73(para)
+#, fuzzy
+#| msgid "The options which apply to the <command>pwck</command> command are:"
+msgid "The options which apply to the <command>expiry</command> command are:"
+msgstr "Flaggorna som gäller för kommandot <command>pwck</command> är:"
+
+#: expiry.1.xml:78(term)
+#, fuzzy
+#| msgid "<option>-L</option>, <option>--lock</option>"
+msgid "<option>-c</option>, <option>--check</option>"
+msgstr "<option>-L</option>, <option>--lock</option>"
+
+#: expiry.1.xml:80(para)
+#, fuzzy
+#| msgid "check and enforce password expiration policy"
+msgid "Check the password expiration of the current user."
+msgstr "kontrollera och upprätthåll policy för lösenordsutgång"
+
+#: expiry.1.xml:86(para)
+msgid "Force a password change if the current user has an expired password."
+msgstr ""
+
+#: expiry.1.xml:121(para) chage.1.xml:294(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -7708,11 +7904,11 @@
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: chsh.1.xml:46(refpurpose)
+#: chsh.1.xml:49(refpurpose)
 msgid "change login shell"
 msgstr "ändra inloggningsskal"
 
-#: chsh.1.xml:63(para)
+#: chsh.1.xml:66(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 "
@@ -7720,11 +7916,11 @@
 "the login shell for any account."
 msgstr ""
 
-#: chsh.1.xml:74(para)
+#: chsh.1.xml:77(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:96(para)
+#: chsh.1.xml:112(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 "
@@ -7733,7 +7929,7 @@
 "of <emphasis>[ ]</emphasis> marks."
 msgstr ""
 
-#: chsh.1.xml:107(para)
+#: chsh.1.xml:123(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 "
@@ -7744,15 +7940,15 @@
 "the user from ever changing her login shell back to its original value."
 msgstr ""
 
-#: chsh.1.xml:142(filename)
+#: chsh.1.xml:158(filename)
 msgid "/etc/shells"
 msgstr "/etc/shells"
 
-#: chsh.1.xml:144(para)
+#: chsh.1.xml:160(para)
 msgid "List of valid login shells."
 msgstr "Lista på giltiga inloggningsskal."
 
-#: chsh.1.xml:158(para)
+#: chsh.1.xml:174(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -7766,11 +7962,11 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chpasswd.8.xml:47(refpurpose)
+#: chpasswd.8.xml:50(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "uppdatera lösenord i satsläge"
 
-#: chpasswd.8.xml:61(para)
+#: chpasswd.8.xml:64(para)
 #, fuzzy
 msgid ""
 "The <command>chpasswd</command> command reads a list of user name and "
@@ -7781,7 +7977,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:66(para)
+#: chpasswd.8.xml:69(para)
 msgid ""
 "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -7789,7 +7985,7 @@
 "<emphasis remap=\"I\">användarnamn</emphasis>:<emphasis remap=\"I"
 "\">lösenord</emphasis>"
 
-#: chpasswd.8.xml:70(para)
+#: chpasswd.8.xml:73(para)
 #, fuzzy
 msgid ""
 "By default the passwords must be supplied in clear-text, and are encrypted "
@@ -7799,7 +7995,7 @@
 "Som standard måste det insända lösenordet vara i klartext. "
 "Standardkrypteringsalgoritmen är DES."
 
-#: chpasswd.8.xml:75(para)
+#: chpasswd.8.xml:78(para)
 msgid ""
 "The default encryption algorithm can be defined for the system with the "
 "<option>ENCRYPT_METHOD</option> or <option>MD5_CRYPT_ENAB</option> variables "
@@ -7807,14 +8003,14 @@
 "<option>-e</option>, <option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
-#: chpasswd.8.xml:83(para)
+#: chpasswd.8.xml:86(para)
 msgid ""
 "By default, passwords are encrypted by PAM, but (even if not recommended) "
 "you can select a different encryption method with the <option>-e</option>, "
 "<option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
-#: chpasswd.8.xml:89(para)
+#: chpasswd.8.xml:92(para)
 msgid ""
 "<phrase condition=\"pam\">Except when PAM is used to encrypt the passwords,</"
 "phrase><command>chpasswd</command> first updates all the passwords in "
@@ -7822,7 +8018,7 @@
 "any user."
 msgstr ""
 
-#: chpasswd.8.xml:95(para)
+#: chpasswd.8.xml:98(para)
 msgid ""
 "When PAM is used to encrypt the passwords (and update the passwords in the "
 "system database) then if a password cannot be updated <command>chpasswd</"
@@ -7830,17 +8026,17 @@
 "an error code on exit."
 msgstr ""
 
-#: chpasswd.8.xml:101(para) chgpasswd.8.xml:81(para)
+#: chpasswd.8.xml:104(para) chgpasswd.8.xml:84(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:109(para)
+#: chpasswd.8.xml:112(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:115(term)
+#: chpasswd.8.xml:118(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
@@ -7852,15 +8048,15 @@
 "<option>-c</option>, <option>--comment</option><replaceable>KOMMENTAR</"
 "replaceable>"
 
-#: chpasswd.8.xml:121(para) chgpasswd.8.xml:98(para)
+#: chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
 msgid "The available methods are DES, MD5, and NONE."
 msgstr ""
 
-#: chpasswd.8.xml:128(para)
+#: chpasswd.8.xml:131(para)
 msgid "By default, PAM is used to encrypt the passwords."
 msgstr ""
 
-#: chpasswd.8.xml:131(para)
+#: chpasswd.8.xml:134(para)
 msgid ""
 "By default (if none of the <option>-c</option>, <option>-m</option>, or "
 "<option>-e</option> options are specified), the encryption method is defined "
@@ -7868,19 +8064,19 @@
 "variables of <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: chpasswd.8.xml:142(term) chgpasswd.8.xml:108(term)
+#: chpasswd.8.xml:145(term) chgpasswd.8.xml:111(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: chpasswd.8.xml:144(para) chgpasswd.8.xml:110(para)
+#: chpasswd.8.xml:147(para) chgpasswd.8.xml:113(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Insända lösenord är i ett krypterat format."
 
-#: chpasswd.8.xml:158(term) chgpasswd.8.xml:120(term)
+#: chpasswd.8.xml:161(term) chgpasswd.8.xml:123(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
-#: chpasswd.8.xml:160(para) chgpasswd.8.xml:122(para)
+#: chpasswd.8.xml:163(para) chgpasswd.8.xml:125(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -7888,7 +8084,7 @@
 "Använd MD5-kryptering istället för DES när insända lösenord inte är "
 "krypterade."
 
-#: chpasswd.8.xml:167(term)
+#: chpasswd.8.xml:183(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
@@ -7900,14 +8096,14 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>VARN_DAGAR</"
 "replaceable>"
 
-#: chpasswd.8.xml:187(para)
+#: chpasswd.8.xml:203(para)
 msgid ""
 "By default, the number of rounds is defined by the "
 "<option>SHA_CRYPT_MIN_ROUNDS</option> and <option>SHA_CRYPT_MAX_ROUNDS</"
 "option> variables in <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: chpasswd.8.xml:200(para) chgpasswd.8.xml:158(para)
+#: chpasswd.8.xml:216(para) chgpasswd.8.xml:174(para)
 msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
@@ -7915,17 +8111,17 @@
 "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:244(filename)
+#: chpasswd.8.xml:260(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/chpasswd"
 msgstr "/etc/passwd"
 
-#: chpasswd.8.xml:246(para)
+#: chpasswd.8.xml:262(para)
 msgid "PAM configuration for <command>chpasswd</command>."
 msgstr ""
 
-#: chpasswd.8.xml:254(para)
+#: chpasswd.8.xml:270(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
@@ -7942,11 +8138,11 @@
 "citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: chgpasswd.8.xml:48(refpurpose)
+#: chgpasswd.8.xml:51(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "uppdatera grupplösenord i satsläge"
 
-#: chgpasswd.8.xml:62(para)
+#: chgpasswd.8.xml:65(para)
 #, fuzzy
 msgid ""
 "The <command>chgpasswd</command> command reads a list of group name and "
@@ -7957,7 +8153,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:67(para)
+#: chgpasswd.8.xml:70(para)
 msgid ""
 "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -7965,7 +8161,7 @@
 "<emphasis remap=\"I\">gruppnamn</emphasis>:<emphasis remap=\"I\">lösenord</"
 "emphasis>"
 
-#: chgpasswd.8.xml:71(para)
+#: chgpasswd.8.xml:74(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -7974,20 +8170,20 @@
 "Som standard måste det insända lösenordet vara i klartext. "
 "Standardkrypteringsalgoritmen är DES."
 
-#: chgpasswd.8.xml:75(para)
+#: chgpasswd.8.xml:78(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 "
-"overwiten with the <option>-e</option>, <option>-m</option>, or <option>-c</"
-"option> options."
+"<option>ENCRYPT_METHOD</option> variable of <filename>/etc/login.defs</"
+"filename>, and can be overwiten with the <option>-e</option>, <option>-m</"
+"option>, or <option>-c</option> options."
 msgstr ""
 
-#: chgpasswd.8.xml:89(para)
+#: chgpasswd.8.xml:92(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:209(para)
+#: chgpasswd.8.xml:225(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
@@ -8002,47 +8198,15 @@
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chfn.1.xml:47(refpurpose)
+#: chfn.1.xml:49(refpurpose)
 msgid "change real user name and information"
 msgstr "ändra verkligt användarnamn och information"
 
-#: chfn.1.xml:53(replaceable)
-msgid "full_name"
-msgstr "fullständigt_namn"
-
-#: 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:55(replaceable)
-msgid "work_ph"
-msgstr "arbetstelefon"
-
-#: chfn.1.xml:55(arg)
-msgid "-w <placeholder-1/>"
-msgstr "-w <placeholder-1/>"
-
-#: chfn.1.xml:56(replaceable)
-msgid "home_ph"
-msgstr "hemtelefon"
-
-#: chfn.1.xml:57(replaceable)
-msgid "other"
-msgstr "övrigt"
-
-#: chfn.1.xml:57(arg)
-msgid "-o <placeholder-1/>"
-msgstr "-o <placeholder-1/>"
-
-#: chfn.1.xml:64(para)
+#: chfn.1.xml:66(para)
 msgid ""
-"The <command>chfn</command> command changes user fullname, office number, "
-"office extension, and home phone number information for a user's account. "
-"This information is typically printed by "
+"The <command>chfn</command> command changes user fullname, office room "
+"number, office phone number, and home phone number information for a user's "
+"account. This information is typically printed by "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and similar programs. A normal user may only change the fields "
 "for her own account, subject to the restrictions in <filename>/etc/login."
@@ -8052,7 +8216,7 @@
 "option to change the undefined portions of the GECOS field."
 msgstr ""
 
-#: chfn.1.xml:78(para)
+#: chfn.1.xml:80(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. "
@@ -8061,8 +8225,104 @@
 "field is used to store accounting information used by other applications."
 msgstr ""
 
-#: chfn.1.xml:87(para)
+#: chfn.1.xml:93(para)
+#, fuzzy
+#| msgid "The options which apply to the <command>chsh</command> command are:"
+msgid "The options which apply to the <command>chfn</command> command are:"
+msgstr "Flaggorna som gäller för kommandot <command>chsh</command> är:"
+
+#: chfn.1.xml:98(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
+#| "replaceable>"
 msgid ""
+"<option>-f</option>, <option>--full-name</option><replaceable>FULL_NAME</"
+"replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--user</option><replaceable>INLOGGNINGSNAMN</"
+"replaceable>"
+
+#: chfn.1.xml:102(para)
+#, fuzzy
+#| msgid "Changing the default values"
+msgid "Change the user's full name."
+msgstr "Ändrar standardvärden"
+
+#: chfn.1.xml:106(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-h</option>, <option>--home-phone</option><replaceable>HOME_PHONE</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HEM_KAT</"
+"replaceable>"
+
+#: chfn.1.xml:110(para)
+msgid "Change the user's home phone number."
+msgstr ""
+
+#: chfn.1.xml:114(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-o</option>, <option>--other</option><replaceable>OTHER</replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HEM_KAT</"
+"replaceable>"
+
+#: chfn.1.xml:118(para)
+msgid ""
+"Change the user's other GECOS information. This field is used to store "
+"accounting information used by other applications, and can be changed only "
+"by a superuser."
+msgstr ""
+
+#: chfn.1.xml:126(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-r</option>, <option>--room</option><replaceable>ROOM_NUMBER</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HEM_KAT</"
+"replaceable>"
+
+#: chfn.1.xml:130(para)
+msgid "Change the user's room number."
+msgstr ""
+
+#: chfn.1.xml:147(term)
+#, fuzzy
+#| msgid "<option>-h</option>, <option>--help</option>"
+msgid "<option>-u</option>, <option>--help</option>"
+msgstr "<option>-h</option>, <option>--help</option>"
+
+#: chfn.1.xml:155(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-w</option>, <option>--work-phone</option><replaceable>WORK_PHONE</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HEM_KAT</"
+"replaceable>"
+
+#: chfn.1.xml:159(para)
+msgid "Change the user's office phone number."
+msgstr ""
+
+#: chfn.1.xml:163(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 "
 "the fields. Enter the new value to change the field, or leave the line blank "
@@ -8071,7 +8331,7 @@
 "command> prompts for the current user account."
 msgstr ""
 
-#: chfn.1.xml:132(para)
+#: chfn.1.xml:208(para)
 msgid ""
 "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -8085,22 +8345,22 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chage.1.xml:44(refpurpose)
+#: chage.1.xml:47(refpurpose)
 msgid "change user password expiry information"
 msgstr "ändra åldringsinformation för användarlösenord"
 
-#: chage.1.xml:60(para)
+#: chage.1.xml:63(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:70(para)
+#: chage.1.xml:73(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:75(term)
+#: chage.1.xml:78(term)
 msgid ""
 "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
 "replaceable>"
@@ -8108,14 +8368,14 @@
 "<option>-d</option>, <option>--lastday</option><replaceable>SISTA_DAG</"
 "replaceable>"
 
-#: chage.1.xml:79(para)
+#: chage.1.xml:82(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:87(term)
+#: chage.1.xml:90(term)
 msgid ""
 "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -8123,7 +8383,7 @@
 "<option>-E</option>, <option>--expiredate</option><replaceable>UTGÅNGSDATUM</"
 "replaceable>"
 
-#: chage.1.xml:91(para)
+#: chage.1.xml:94(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 "
@@ -8132,14 +8392,14 @@
 "able to use the system again."
 msgstr ""
 
-#: chage.1.xml:99(para)
+#: chage.1.xml:102(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:113(term)
+#: chage.1.xml:116(term)
 msgid ""
 "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -8147,7 +8407,7 @@
 "<option>-I</option>, <option>--inactive</option><replaceable>INAKTIV</"
 "replaceable>"
 
-#: chage.1.xml:117(para)
+#: chage.1.xml:120(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 "
@@ -8155,17 +8415,17 @@
 "the system administrator before being able to use the system again."
 msgstr ""
 
-#: chage.1.xml:124(para)
+#: chage.1.xml:127(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:136(para)
+#: chage.1.xml:139(para)
 msgid "Show account aging information."
 msgstr "Visa kontots åldringsinformation"
 
-#: chage.1.xml:142(term)
+#: chage.1.xml:145(term)
 msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -8173,7 +8433,7 @@
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAGAR</"
 "replaceable>"
 
-#: chage.1.xml:154(term)
+#: chage.1.xml:157(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -8181,7 +8441,7 @@
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAGAR</"
 "replaceable>"
 
-#: chage.1.xml:158(para)
+#: chage.1.xml:161(para)
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
@@ -8191,14 +8451,14 @@
 "provides the user with advance warning."
 msgstr ""
 
-#: chage.1.xml:167(para)
+#: chage.1.xml:170(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:175(term)
+#: chage.1.xml:191(term)
 msgid ""
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -8206,7 +8466,7 @@
 "<option>-W</option>, <option>--warndays</option><replaceable>VARN_DAGAR</"
 "replaceable>"
 
-#: chage.1.xml:179(para)
+#: chage.1.xml:195(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 "
@@ -8214,7 +8474,7 @@
 "to expire."
 msgstr ""
 
-#: chage.1.xml:188(para)
+#: chage.1.xml:204(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 "
@@ -8223,7 +8483,7 @@
 "<emphasis>[ ]</emphasis> marks."
 msgstr ""
 
-#: chage.1.xml:198(para)
+#: chage.1.xml:214(para)
 msgid ""
 "The <command>chage</command> program requires a shadow password file to be "
 "available."
@@ -8231,22 +8491,22 @@
 "Programmet <command>chage</command> kräver att en skugglösenordsfil finns "
 "tillgänglig."
 
-#: chage.1.xml:202(para)
+#: chage.1.xml:218(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:267(replaceable)
+#: chage.1.xml:283(replaceable)
 msgid "15"
 msgstr "15"
 
-#: chage.1.xml:269(para)
+#: chage.1.xml:285(para)
 msgid "can't find the shadow password file"
 msgstr "kan inte hitta skugglösenordsfilen"
 
-#: chage.1.xml:245(para)
+#: chage.1.xml:261(para)
 msgid ""
 "The <command>chage</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -8259,8 +8519,65 @@
 msgid "translator-credits"
 msgstr "Daniel Nylander <po at danielnylander.se>, 2006."
 
+#~ msgid "-q"
+#~ msgstr "-q"
+
+#~ msgid "-s"
+#~ msgstr "-s"
+
 #, 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>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+#~ "\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+#~ "phrase><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><refentrytitle>usermod</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid "new_users"
+#~ msgstr "nya_användare"
+
+#~ msgid "full_name"
+#~ msgstr "fullständigt_namn"
+
+#~ msgid "-f <placeholder-1/>"
+#~ msgstr "-f <placeholder-1/>"
+
+#~ msgid "room_no"
+#~ msgstr "rumsnummer"
+
+#~ msgid "work_ph"
+#~ msgstr "arbetstelefon"
+
+#~ msgid "-w <placeholder-1/>"
+#~ msgstr "-w <placeholder-1/>"
+
+#~ msgid "home_ph"
+#~ msgstr "hemtelefon"
+
+#~ msgid "other"
+#~ msgstr "övrigt"
+
+#~ msgid "-o <placeholder-1/>"
+#~ msgstr "-o <placeholder-1/>"
+
+#, fuzzy
+#~| msgid ""
 #~| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
 #~| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
 #~| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
@@ -8491,13 +8808,6 @@
 #~ "<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 "

Modified: upstream/trunk/man/po/zh_CN.po
===================================================================
--- upstream/trunk/man/po/zh_CN.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/man/po/zh_CN.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow-man-pages VERSION\n"
-"POT-Creation-Date: 2010-08-29 17:54+0200\n"
+"POT-Creation-Date: 2011-11-13 18:43+0100\n"
 "PO-Revision-Date: 2011-06-03 22:36+0200\n"
 "Last-Translator: YunQiang Su <wzssyqa at gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh at googlegroups.com>\n"
@@ -14,75 +14,104 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: vipw.8.xml:39(refentrytitle) vipw.8.xml:44(refname) vipw.8.xml:53(command)
-#: login.defs.5.xml:477(term)
+#: vipw.8.xml:40(refentrytitle) vipw.8.xml:47(refname) vipw.8.xml:56(command)
+#: login.defs.5.xml:480(term)
 msgid "vipw"
 msgstr "vipw"
 
-#: vipw.8.xml:40(manvolnum) usermod.8.xml:42(manvolnum)
-#: userdel.8.xml:44(manvolnum) userdel.8.xml:203(replaceable)
-#: useradd.8.xml:53(manvolnum) pwconv.8.xml:44(manvolnum)
-#: pwck.8.xml:44(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:130(replaceable)
-#: groupadd.8.xml:42(manvolnum) faillog.8.xml:35(manvolnum)
-#: faillog.5.xml:86(manvolnum) chpasswd.8.xml:42(manvolnum)
-#: chgpasswd.8.xml:43(manvolnum)
+#: vipw.8.xml:41(manvolnum) usermod.8.xml:43(manvolnum)
+#: userdel.8.xml:45(manvolnum) userdel.8.xml:219(replaceable)
+#: useradd.8.xml:54(manvolnum) pwconv.8.xml:45(manvolnum)
+#: pwck.8.xml:45(manvolnum) nologin.8.xml:39(manvolnum)
+#: newusers.8.xml:52(manvolnum) logoutd.8.xml:39(manvolnum)
+#: lastlog.8.xml:40(manvolnum) grpck.8.xml:40(manvolnum)
+#: groupmod.8.xml:40(manvolnum) groupmems.8.xml:40(manvolnum)
+#: groupdel.8.xml:40(manvolnum) groupdel.8.xml:163(replaceable)
+#: groupadd.8.xml:42(manvolnum) faillog.8.xml:39(manvolnum)
+#: faillog.5.xml:92(manvolnum) chpasswd.8.xml:43(manvolnum)
+#: chgpasswd.8.xml:44(manvolnum)
 msgid "8"
 msgstr "8"
 
-#: vipw.8.xml:41(refmiscinfo) usermod.8.xml:43(refmiscinfo)
-#: userdel.8.xml:45(refmiscinfo) useradd.8.xml:54(refmiscinfo)
-#: pwconv.8.xml:45(refmiscinfo) pwck.8.xml:45(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:43(refmiscinfo) faillog.8.xml:36(refmiscinfo)
-#: chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
+#: vipw.8.xml:42(refmiscinfo) usermod.8.xml:44(refmiscinfo)
+#: userdel.8.xml:46(refmiscinfo) useradd.8.xml:55(refmiscinfo)
+#: pwconv.8.xml:46(refmiscinfo) pwck.8.xml:46(refmiscinfo)
+#: nologin.8.xml:40(refmiscinfo) newusers.8.xml:53(refmiscinfo)
+#: logoutd.8.xml:40(refmiscinfo) lastlog.8.xml:41(refmiscinfo)
+#: grpck.8.xml:41(refmiscinfo) groupmod.8.xml:41(refmiscinfo)
+#: groupmems.8.xml:41(refmiscinfo) groupdel.8.xml:41(refmiscinfo)
+#: groupadd.8.xml:43(refmiscinfo) faillog.8.xml:40(refmiscinfo)
+#: chpasswd.8.xml:44(refmiscinfo) chgpasswd.8.xml:45(refmiscinfo)
 msgid "System Management Commands"
 msgstr "系统管理命令"
 
-#: vipw.8.xml:45(refname) vipw.8.xml:59(command)
+#: vipw.8.xml:43(refmiscinfo) usermod.8.xml:45(refmiscinfo)
+#: userdel.8.xml:47(refmiscinfo) useradd.8.xml:56(refmiscinfo)
+#: suauth.5.xml:41(refmiscinfo) su.1.xml:58(refmiscinfo)
+#: sg.1.xml:42(refmiscinfo) shadow.5.xml:41(refmiscinfo)
+#: shadow.3.xml:41(refmiscinfo) pwconv.8.xml:47(refmiscinfo)
+#: pwck.8.xml:47(refmiscinfo) porttime.5.xml:41(refmiscinfo)
+#: passwd.5.xml:41(refmiscinfo) passwd.1.xml:48(refmiscinfo)
+#: nologin.8.xml:41(refmiscinfo) newusers.8.xml:54(refmiscinfo)
+#: newgrp.1.xml:42(refmiscinfo) logoutd.8.xml:41(refmiscinfo)
+#: login.defs.5.xml:104(refmiscinfo) login.access.5.xml:42(refmiscinfo)
+#: login.1.xml:74(refmiscinfo) limits.5.xml:42(refmiscinfo)
+#: lastlog.8.xml:42(refmiscinfo) gshadow.5.xml:40(refmiscinfo)
+#: grpck.8.xml:42(refmiscinfo) groups.1.xml:41(refmiscinfo)
+#: groupmod.8.xml:42(refmiscinfo) groupmems.8.xml:42(refmiscinfo)
+#: groupdel.8.xml:42(refmiscinfo) groupadd.8.xml:44(refmiscinfo)
+#: gpasswd.1.xml:46(refmiscinfo) faillog.8.xml:41(refmiscinfo)
+#: faillog.5.xml:41(refmiscinfo) expiry.1.xml:45(refmiscinfo)
+#: chsh.1.xml:44(refmiscinfo) chpasswd.8.xml:45(refmiscinfo)
+#: chgpasswd.8.xml:46(refmiscinfo) chfn.1.xml:44(refmiscinfo)
+#: chage.1.xml:42(refmiscinfo)
+#, fuzzy
+#| msgid "shadow"
+msgid "shadow-utils"
+msgstr "shadow"
+
+#: vipw.8.xml:48(refname) vipw.8.xml:62(command)
 msgid "vigr"
 msgstr "vigr"
 
-#: vipw.8.xml:46(refpurpose)
+#: vipw.8.xml:49(refpurpose)
 msgid "edit the password, group, shadow-password or shadow-group file"
 msgstr "编辑密码、组、影子密码或影子组文件。"
 
-#: vipw.8.xml:55(replaceable) vipw.8.xml:61(replaceable)
-#: usermod.8.xml:54(replaceable) userdel.8.xml:54(arg)
-#: useradd.8.xml:64(replaceable) useradd.8.xml:76(replaceable)
-#: su.1.xml:66(replaceable) passwd.1.xml:57(replaceable)
-#: newusers.8.xml:63(replaceable) lastlog.8.xml:48(replaceable)
-#: groupmod.8.xml:51(replaceable) groupadd.8.xml:54(replaceable)
-#: faillog.8.xml:47(replaceable) chsh.1.xml:53(replaceable)
-#: chpasswd.8.xml:54(replaceable) chgpasswd.8.xml:55(replaceable)
-#: chage.1.xml:50(replaceable)
+#: vipw.8.xml:58(replaceable) vipw.8.xml:64(replaceable)
+#: usermod.8.xml:57(replaceable) userdel.8.xml:57(arg)
+#: useradd.8.xml:67(replaceable) useradd.8.xml:79(replaceable)
+#: su.1.xml:69(replaceable) pwconv.8.xml:62(replaceable)
+#: pwconv.8.xml:68(replaceable) pwconv.8.xml:74(replaceable)
+#: pwconv.8.xml:80(replaceable) pwck.8.xml:58(arg)
+#: passwd.1.xml:60(replaceable) newusers.8.xml:66(replaceable)
+#: lastlog.8.xml:54(replaceable) grpck.8.xml:53(arg)
+#: groupmod.8.xml:54(replaceable) groupdel.8.xml:54(replaceable)
+#: groupadd.8.xml:56(replaceable) faillog.8.xml:53(replaceable)
+#: chsh.1.xml:56(replaceable) chpasswd.8.xml:57(replaceable)
+#: chgpasswd.8.xml:58(replaceable) chfn.1.xml:56(replaceable)
+#: chage.1.xml:53(replaceable)
 msgid "options"
 msgstr "选项"
 
-#: vipw.8.xml:67(title) usermod.8.xml:61(title) userdel.8.xml:62(title)
-#: useradd.8.xml:82(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:71(title) pwck.8.xml:86(title)
-#: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
-#: nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title)
-#: logoutd.8.xml:50(title) login.defs.5.xml:110(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:63(title) gpasswd.1.xml:72(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:59(title)
+#: vipw.8.xml:70(title) usermod.8.xml:64(title) userdel.8.xml:65(title)
+#: useradd.8.xml:85(title) suauth.5.xml:56(title) su.1.xml:80(title)
+#: sg.1.xml:62(title) shadow.5.xml:50(title) shadow.3.xml:99(title)
+#: shadow.3.xml:155(title) pwconv.8.xml:86(title) pwck.8.xml:73(title)
+#: porttime.5.xml:50(title) passwd.5.xml:50(title) passwd.1.xml:69(title)
+#: nologin.8.xml:56(title) newusers.8.xml:75(title) newgrp.1.xml:58(title)
+#: logoutd.8.xml:56(title) login.defs.5.xml:113(title)
+#: login.access.5.xml:51(title) login.1.xml:106(title) limits.5.xml:52(title)
+#: lastlog.8.xml:60(title) gshadow.5.xml:49(title) grpck.8.xml:64(title)
+#: groups.1.xml:59(title) groupmod.8.xml:61(title) groupmems.8.xml:63(title)
+#: groupdel.8.xml:61(title) groupadd.8.xml:65(title) gpasswd.1.xml:75(title)
+#: faillog.8.xml:59(title) faillog.5.xml:50(title) expiry.1.xml:63(title)
+#: chsh.1.xml:65(title) chpasswd.8.xml:63(title) chgpasswd.8.xml:64(title)
+#: chfn.1.xml:65(title) chage.1.xml:62(title)
 msgid "DESCRIPTION"
 msgstr "描述"
 
-#: vipw.8.xml:68(para)
+#: vipw.8.xml:71(para)
 msgid ""
 "The <command>vipw</command> and <command>vigr</command> commands edits the "
 "files <filename>/etc/passwd</filename> and <filename>/etc/group</filename>, "
@@ -104,98 +133,140 @@
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>。"
 
-#: vipw.8.xml:85(title) usermod.8.xml:69(title) userdel.8.xml:71(title)
-#: useradd.8.xml:100(title) su.1.xml:123(title) pwck.8.xml:170(title)
-#: passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title)
-#: lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title)
-#: groupmems.8.xml:75(title) groupadd.8.xml:72(title) gpasswd.1.xml:112(title)
-#: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:108(title)
-#: chgpasswd.8.xml:88(title) chage.1.xml:69(title)
+#: vipw.8.xml:88(title) usermod.8.xml:72(title) userdel.8.xml:74(title)
+#: useradd.8.xml:103(title) su.1.xml:126(title) pwconv.8.xml:168(title)
+#: pwck.8.xml:157(title) passwd.1.xml:155(title) newusers.8.xml:244(title)
+#: login.1.xml:191(title) lastlog.8.xml:72(title) grpck.8.xml:128(title)
+#: groupmod.8.xml:70(title) groupmems.8.xml:78(title) groupdel.8.xml:69(title)
+#: groupadd.8.xml:74(title) gpasswd.1.xml:115(title) faillog.8.xml:70(title)
+#: expiry.1.xml:72(title) chsh.1.xml:76(title) chpasswd.8.xml:111(title)
+#: chgpasswd.8.xml:91(title) chfn.1.xml:92(title) chage.1.xml:72(title)
 msgid "OPTIONS"
 msgstr "选项"
 
-#: vipw.8.xml:86(para)
+#: vipw.8.xml:89(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:92(term)
+#: vipw.8.xml:95(term)
 msgid "<option>-g</option>, <option>--group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: vipw.8.xml:94(para)
+#: vipw.8.xml:97(para)
 msgid "Edit group database."
 msgstr "编辑 group 数据库。"
 
-#: vipw.8.xml:98(term) userdel.8.xml:101(term) useradd.8.xml:250(term)
-#: passwd.1.xml:192(term) newusers.8.xml:257(term) lastlog.8.xml:82(term)
-#: groupmod.8.xml:98(term) groupmems.8.xml:117(term) groupadd.8.xml:107(term)
-#: gpasswd.1.xml:151(term) faillog.8.xml:97(term) chsh.1.xml:79(term)
-#: chpasswd.8.xml:150(term) chgpasswd.8.xml:114(term) chage.1.xml:107(term)
+#: vipw.8.xml:101(term) userdel.8.xml:104(term) useradd.8.xml:253(term)
+#: pwconv.8.xml:176(term) pwck.8.xml:167(term) passwd.1.xml:195(term)
+#: newusers.8.xml:262(term) lastlog.8.xml:88(term) grpck.8.xml:138(term)
+#: groupmod.8.xml:105(term) groupmems.8.xml:120(term) groupdel.8.xml:76(term)
+#: groupadd.8.xml:109(term) gpasswd.1.xml:154(term) faillog.8.xml:103(term)
+#: expiry.1.xml:93(term) chsh.1.xml:82(term) chpasswd.8.xml:153(term)
+#: chgpasswd.8.xml:117(term) chage.1.xml:110(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
-#: vipw.8.xml:100(para) userdel.8.xml:103(para) useradd.8.xml:252(para)
-#: passwd.1.xml:194(para) newusers.8.xml:259(para) lastlog.8.xml:86(para)
-#: groupmod.8.xml:100(para) groupmems.8.xml:119(para) groupadd.8.xml:109(para)
-#: gpasswd.1.xml:153(para) faillog.8.xml:99(para) chsh.1.xml:81(para)
-#: chpasswd.8.xml:152(para) chgpasswd.8.xml:116(para) chage.1.xml:109(para)
+#: vipw.8.xml:103(para) userdel.8.xml:106(para) useradd.8.xml:255(para)
+#: pwconv.8.xml:178(para) pwck.8.xml:169(para) passwd.1.xml:197(para)
+#: newusers.8.xml:264(para) lastlog.8.xml:92(para) grpck.8.xml:140(para)
+#: groupmod.8.xml:107(para) groupmems.8.xml:122(para) groupdel.8.xml:78(para)
+#: groupadd.8.xml:111(para) gpasswd.1.xml:156(para) faillog.8.xml:105(para)
+#: expiry.1.xml:95(para) chsh.1.xml:84(para) chpasswd.8.xml:155(para)
+#: chgpasswd.8.xml:119(para) chfn.1.xml:151(para) chage.1.xml:112(para)
 msgid "Display help message and exit."
 msgstr "现实帮助信息并退出。"
 
-#: vipw.8.xml:104(term)
+#: vipw.8.xml:107(term)
 msgid "<option>-p</option>, <option>--passwd</option>"
 msgstr "<option>-p</option>, <option>--passwd</option>"
 
-#: vipw.8.xml:106(para)
+#: vipw.8.xml:109(para)
 msgid "Edit passwd database."
 msgstr "编辑 passwd 数据库。"
 
-#: vipw.8.xml:110(term) passwd.1.xml:259(term)
+#: vipw.8.xml:113(term) pwck.8.xml:173(term) passwd.1.xml:262(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:112(para) passwd.1.xml:263(para)
+#: vipw.8.xml:115(para) passwd.1.xml:266(para)
 msgid "Quiet mode."
 msgstr "安静模式。"
 
-#: vipw.8.xml:116(term)
+#: vipw.8.xml:119(term) usermod.8.xml:298(term) userdel.8.xml:127(term)
+#: useradd.8.xml:438(term) pwconv.8.xml:182(term) pwck.8.xml:190(term)
+#: passwd.1.xml:282(term) newusers.8.xml:287(term) lastlog.8.xml:96(term)
+#: grpck.8.xml:154(term) groupmod.8.xml:156(term) groupmems.8.xml:143(term)
+#: groupdel.8.xml:82(term) groupadd.8.xml:184(term) faillog.8.xml:163(term)
+#: chsh.1.xml:88(term) chpasswd.8.xml:170(term) chgpasswd.8.xml:132(term)
+#: chfn.1.xml:134(term) chage.1.xml:178(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-R</option>, <option>--root</option><replaceable>CHROOT_DIR</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+"replaceable>"
+
+#: vipw.8.xml:124(para) usermod.8.xml:303(para) userdel.8.xml:132(para)
+#: useradd.8.xml:443(para) pwconv.8.xml:187(para) pwck.8.xml:195(para)
+#: passwd.1.xml:287(para) newusers.8.xml:292(para) lastlog.8.xml:101(para)
+#: grpck.8.xml:159(para) groupmod.8.xml:161(para) groupmems.8.xml:148(para)
+#: groupdel.8.xml:87(para) groupadd.8.xml:189(para) gpasswd.1.xml:167(para)
+#: faillog.8.xml:168(para) chsh.1.xml:93(para) chpasswd.8.xml:175(para)
+#: chgpasswd.8.xml:137(para) chfn.1.xml:139(para) chage.1.xml:183(para)
+#, fuzzy
+#| msgid ""
+#| "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
+#| "replaceable>."
+msgid ""
+"Apply changes in the <replaceable>CHROOT_DIR</replaceable> directory and use "
+"the configuration files from the <replaceable>CHROOT_DIR</replaceable> "
+"directory."
+msgstr ""
+"向名为 <replaceable>group</replaceable> 的组中添加用户 <replaceable>user</"
+"replaceable>。"
+
+#: vipw.8.xml:132(term)
 msgid "<option>-s</option>, <option>--shadow</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: vipw.8.xml:118(para)
+#: vipw.8.xml:134(para)
 msgid "Edit shadow or gshadow database."
 msgstr "编辑 shadow 或 gshadow 数据库。"
 
-#: vipw.8.xml:122(term)
+#: vipw.8.xml:138(term)
 msgid "<option>-u</option>, <option>--user</option>"
 msgstr "<option>-u</option>, <option>--user</option>"
 
-#: vipw.8.xml:124(para)
+#: vipw.8.xml:140(para)
 msgid "Indicates which user's tcb shadow file to edit."
 msgstr "指定要编辑哪个用户的 tcb 影子文件。"
 
-#: vipw.8.xml:131(title) usermod.8.xml:374(title) userdel.8.xml:127(title)
-#: useradd.8.xml:629(title) su.1.xml:310(title) sg.1.xml:76(title)
-#: pwconv.8.xml:164(title) pwck.8.xml:230(title) passwd.1.xml:356(title)
-#: newusers.8.xml:324(title) newgrp.1.xml:87(title) login.1.xml:272(title)
-#: grpck.8.xml:173(title) groupmod.8.xml:152(title) groupmems.8.xml:162(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:185(title) gpasswd.1.xml:226(title)
-#: chsh.1.xml:120(title) chpasswd.8.xml:207(title) chgpasswd.8.xml:169(title)
-#: chfn.1.xml:99(title) chage.1.xml:210(title)
+#: vipw.8.xml:147(title) usermod.8.xml:404(title) userdel.8.xml:143(title)
+#: useradd.8.xml:645(title) su.1.xml:320(title) sg.1.xml:79(title)
+#: pwconv.8.xml:209(title) pwck.8.xml:234(title) passwd.1.xml:372(title)
+#: newusers.8.xml:342(title) newgrp.1.xml:90(title) login.1.xml:275(title)
+#: grpck.8.xml:191(title) groupmod.8.xml:172(title) groupmems.8.xml:178(title)
+#: groupdel.8.xml:110(title) groupadd.8.xml:200(title)
+#: gpasswd.1.xml:244(title) chsh.1.xml:136(title) chpasswd.8.xml:223(title)
+#: chgpasswd.8.xml:185(title) chfn.1.xml:175(title) chage.1.xml:226(title)
 msgid "CONFIGURATION"
 msgstr "配置文件"
 
-#: vipw.8.xml:132(para) usermod.8.xml:375(para) userdel.8.xml:128(para)
-#: useradd.8.xml:630(para) su.1.xml:311(para) sg.1.xml:77(para)
-#: pwck.8.xml:231(para) passwd.1.xml:357(para) newusers.8.xml:325(para)
-#: newgrp.1.xml:88(para) login.1.xml:273(para) grpck.8.xml:174(para)
-#: groupmod.8.xml:153(para) groupmems.8.xml:163(para) groupdel.8.xml:78(para)
-#: groupadd.8.xml:186(para) gpasswd.1.xml:227(para) chsh.1.xml:121(para)
-#: chpasswd.8.xml:208(para) chgpasswd.8.xml:170(para) chfn.1.xml:100(para)
-#: chage.1.xml:211(para)
+#: vipw.8.xml:148(para) usermod.8.xml:405(para) userdel.8.xml:144(para)
+#: useradd.8.xml:646(para) su.1.xml:321(para) sg.1.xml:80(para)
+#: pwck.8.xml:235(para) passwd.1.xml:373(para) newusers.8.xml:343(para)
+#: newgrp.1.xml:91(para) login.1.xml:276(para) grpck.8.xml:192(para)
+#: groupmod.8.xml:173(para) groupmems.8.xml:179(para) groupdel.8.xml:111(para)
+#: groupadd.8.xml:201(para) gpasswd.1.xml:245(para) chsh.1.xml:137(para)
+#: chpasswd.8.xml:224(para) chgpasswd.8.xml:186(para) chfn.1.xml:176(para)
+#: chage.1.xml:227(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of this tool:"
@@ -221,143 +292,145 @@
 "<citerefentry><refentrytitle>tcb</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry> 影子密码方案。"
 
-#: vipw.8.xml:143(title)
+#: vipw.8.xml:159(title)
 msgid "ENVIRONMENT"
 msgstr "环境变量"
 
-#: vipw.8.xml:146(option)
+#: vipw.8.xml:162(option)
 msgid "VISUAL"
 msgstr "VISUAL"
 
-#: vipw.8.xml:148(para)
+#: vipw.8.xml:164(para)
 msgid "Editor to be used."
 msgstr "要使用的编辑器。"
 
-#: vipw.8.xml:152(option)
+#: vipw.8.xml:168(option)
 msgid "EDITOR"
 msgstr "EDITOR"
 
-#: vipw.8.xml:154(para)
+#: vipw.8.xml:170(para)
 msgid "Editor to be used if <option>VISUAL</option> is not set."
 msgstr "<option>VISUAL</option> 没有设置的情况下，使用的编辑器。"
 
-#: vipw.8.xml:161(title) usermod.8.xml:389(title) userdel.8.xml:144(title)
-#: useradd.8.xml:655(title) suauth.5.xml:168(title) su.1.xml:338(title)
-#: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
-#: pwconv.8.xml:187(title) pwck.8.xml:247(title) porttime.5.xml:105(title)
-#: passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(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:170(title) lastlog.8.xml:147(title)
-#: gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title)
-#: groupmod.8.xml:164(title) groupmems.8.xml:174(title)
-#: groupdel.8.xml:89(title) groupadd.8.xml:199(title) gpasswd.1.xml:241(title)
-#: faillog.8.xml:210(title) faillog.5.xml:71(title) expiry.1.xml:68(title)
-#: chsh.1.xml:133(title) chpasswd.8.xml:223(title) chgpasswd.8.xml:184(title)
-#: chfn.1.xml:113(title) chage.1.xml:222(title)
+#: vipw.8.xml:177(title) usermod.8.xml:419(title) userdel.8.xml:160(title)
+#: useradd.8.xml:671(title) suauth.5.xml:174(title) su.1.xml:348(title)
+#: sg.1.xml:91(title) shadow.5.xml:236(title) shadow.3.xml:207(title)
+#: pwconv.8.xml:232(title) pwck.8.xml:251(title) porttime.5.xml:111(title)
+#: passwd.5.xml:122(title) passwd.1.xml:390(title) newusers.8.xml:375(title)
+#: newgrp.1.xml:102(title) logoutd.8.xml:70(title)
+#: login.access.5.xml:102(title) login.1.xml:319(title)
+#: limits.5.xml:176(title) lastlog.8.xml:166(title) gshadow.5.xml:147(title)
+#: grpck.8.xml:203(title) groups.1.xml:81(title) groupmod.8.xml:184(title)
+#: groupmems.8.xml:190(title) groupdel.8.xml:122(title)
+#: groupadd.8.xml:214(title) gpasswd.1.xml:259(title) faillog.8.xml:229(title)
+#: faillog.5.xml:77(title) expiry.1.xml:102(title) chsh.1.xml:149(title)
+#: chpasswd.8.xml:239(title) chgpasswd.8.xml:200(title) chfn.1.xml:189(title)
+#: chage.1.xml:238(title)
 msgid "FILES"
 msgstr "文件"
 
-#: vipw.8.xml:164(filename) usermod.8.xml:392(filename)
-#: userdel.8.xml:147(filename) useradd.8.xml:670(filename)
-#: sg.1.xml:103(filename) pwck.8.xml:250(filename)
-#: newusers.8.xml:372(filename) newgrp.1.xml:114(filename)
-#: gshadow.5.xml:144(filename) grpck.8.xml:188(filename)
-#: groups.1.xml:78(filename) groupmod.8.xml:167(filename)
-#: groupmems.8.xml:177(filename) groupdel.8.xml:92(filename)
-#: groupadd.8.xml:202(filename) gpasswd.1.xml:50(filename)
-#: gpasswd.1.xml:53(filename) gpasswd.1.xml:244(filename)
-#: chgpasswd.8.xml:187(filename)
+#: vipw.8.xml:180(filename) usermod.8.xml:422(filename)
+#: userdel.8.xml:163(filename) useradd.8.xml:686(filename)
+#: sg.1.xml:106(filename) pwck.8.xml:254(filename)
+#: newusers.8.xml:390(filename) newgrp.1.xml:117(filename)
+#: gshadow.5.xml:150(filename) grpck.8.xml:206(filename)
+#: groups.1.xml:84(filename) groupmod.8.xml:187(filename)
+#: groupmems.8.xml:193(filename) groupdel.8.xml:125(filename)
+#: groupadd.8.xml:217(filename) gpasswd.1.xml:53(filename)
+#: gpasswd.1.xml:56(filename) gpasswd.1.xml:262(filename)
+#: chgpasswd.8.xml:203(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
-#: vipw.8.xml:166(para) usermod.8.xml:394(para) userdel.8.xml:149(para)
-#: useradd.8.xml:672(para) sg.1.xml:105(para) pwck.8.xml:252(para)
-#: newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para)
-#: grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
-#: groupmems.8.xml:179(para) groupdel.8.xml:94(para) groupadd.8.xml:204(para)
-#: gpasswd.1.xml:246(para) chgpasswd.8.xml:189(para)
+#: vipw.8.xml:182(para) usermod.8.xml:424(para) userdel.8.xml:165(para)
+#: useradd.8.xml:688(para) sg.1.xml:108(para) pwck.8.xml:256(para)
+#: newusers.8.xml:392(para) newgrp.1.xml:119(para) gshadow.5.xml:152(para)
+#: grpck.8.xml:208(para) groups.1.xml:86(para) groupmod.8.xml:189(para)
+#: groupmems.8.xml:195(para) groupdel.8.xml:127(para) groupadd.8.xml:219(para)
+#: gpasswd.1.xml:264(para) chgpasswd.8.xml:205(para)
 msgid "Group account information."
 msgstr "组账户信息。"
 
-#: vipw.8.xml:170(filename) usermod.8.xml:398(filename)
-#: useradd.8.xml:676(filename) sg.1.xml:109(filename)
-#: newusers.8.xml:378(filename) newgrp.1.xml:120(filename)
-#: gshadow.5.xml:150(filename) grpck.8.xml:194(filename)
-#: groupmod.8.xml:173(filename) groupmems.8.xml:183(filename)
-#: groupdel.8.xml:98(filename) groupadd.8.xml:208(filename)
-#: gpasswd.1.xml:54(filename) gpasswd.1.xml:250(filename)
-#: chgpasswd.8.xml:193(filename)
+#: vipw.8.xml:186(filename) usermod.8.xml:428(filename)
+#: useradd.8.xml:692(filename) sg.1.xml:112(filename)
+#: newusers.8.xml:396(filename) newgrp.1.xml:123(filename)
+#: gshadow.5.xml:156(filename) grpck.8.xml:212(filename)
+#: groupmod.8.xml:193(filename) groupmems.8.xml:199(filename)
+#: groupdel.8.xml:131(filename) groupadd.8.xml:223(filename)
+#: gpasswd.1.xml:57(filename) gpasswd.1.xml:268(filename)
+#: chgpasswd.8.xml:209(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
-#: vipw.8.xml:172(para) usermod.8.xml:400(para) useradd.8.xml:678(para)
-#: sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para)
-#: gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para)
-#: groupdel.8.xml:100(para) groupadd.8.xml:210(para) gpasswd.1.xml:252(para)
-#: chgpasswd.8.xml:195(para)
+#: vipw.8.xml:188(para) usermod.8.xml:430(para) useradd.8.xml:694(para)
+#: sg.1.xml:114(para) newusers.8.xml:398(para) newgrp.1.xml:125(para)
+#: gshadow.5.xml:158(para) grpck.8.xml:214(para) groupmod.8.xml:195(para)
+#: groupdel.8.xml:133(para) groupadd.8.xml:225(para) gpasswd.1.xml:270(para)
+#: chgpasswd.8.xml:211(para)
 msgid "Secure group account information."
 msgstr "安全组账户信息。"
 
-#: vipw.8.xml:176(filename) usermod.8.xml:404(filename)
-#: userdel.8.xml:159(filename) useradd.8.xml:658(filename)
-#: su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
-#: pwck.8.xml:256(filename) passwd.5.xml:119(filename)
-#: passwd.1.xml:377(filename) newusers.8.xml:360(filename)
-#: newgrp.1.xml:102(filename) login.1.xml:331(filename)
-#: grpck.8.xml:200(filename) expiry.1.xml:71(filename)
-#: chsh.1.xml:136(filename) chpasswd.8.xml:226(filename)
-#: chfn.1.xml:122(filename) chage.1.xml:226(filename)
+#: vipw.8.xml:192(filename) usermod.8.xml:434(filename)
+#: userdel.8.xml:175(filename) useradd.8.xml:674(filename)
+#: su.1.xml:351(filename) sg.1.xml:94(filename) shadow.5.xml:239(filename)
+#: pwck.8.xml:260(filename) passwd.5.xml:125(filename)
+#: passwd.1.xml:393(filename) newusers.8.xml:378(filename)
+#: newgrp.1.xml:105(filename) login.1.xml:334(filename)
+#: grpck.8.xml:218(filename) groupmod.8.xml:199(filename)
+#: expiry.1.xml:105(filename) chsh.1.xml:152(filename)
+#: chpasswd.8.xml:242(filename) chfn.1.xml:198(filename)
+#: chage.1.xml:242(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
-#: vipw.8.xml:178(para) usermod.8.xml:406(para) userdel.8.xml:161(para)
-#: useradd.8.xml:660(para) su.1.xml:343(para) sg.1.xml:93(para)
-#: shadow.5.xml:235(para) pwck.8.xml:258(para) passwd.5.xml:121(para)
-#: passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
-#: login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para)
-#: chsh.1.xml:138(para) chpasswd.8.xml:228(para) chfn.1.xml:124(para)
-#: chage.1.xml:229(para)
+#: vipw.8.xml:194(para) usermod.8.xml:436(para) userdel.8.xml:177(para)
+#: useradd.8.xml:676(para) su.1.xml:353(para) sg.1.xml:96(para)
+#: shadow.5.xml:241(para) pwck.8.xml:262(para) passwd.5.xml:127(para)
+#: passwd.1.xml:395(para) newusers.8.xml:380(para) newgrp.1.xml:107(para)
+#: login.1.xml:336(para) grpck.8.xml:220(para) groupmod.8.xml:201(para)
+#: expiry.1.xml:107(para) chsh.1.xml:154(para) chpasswd.8.xml:244(para)
+#: chfn.1.xml:200(para) chage.1.xml:245(para)
 msgid "User account information."
 msgstr "用户账户信息。"
 
-#: vipw.8.xml:182(filename) usermod.8.xml:410(filename)
-#: userdel.8.xml:165(filename) useradd.8.xml:664(filename)
-#: su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
-#: shadow.3.xml:204(filename) pwck.8.xml:262(filename)
-#: passwd.5.xml:125(filename) passwd.1.xml:383(filename)
-#: newusers.8.xml:366(filename) newgrp.1.xml:108(filename)
-#: login.1.xml:337(filename) expiry.1.xml:77(filename)
-#: chpasswd.8.xml:232(filename) chage.1.xml:234(filename)
+#: vipw.8.xml:198(filename) usermod.8.xml:440(filename)
+#: userdel.8.xml:181(filename) useradd.8.xml:680(filename)
+#: su.1.xml:357(filename) sg.1.xml:100(filename) shadow.5.xml:245(filename)
+#: shadow.3.xml:210(filename) pwck.8.xml:266(filename)
+#: passwd.5.xml:131(filename) passwd.1.xml:399(filename)
+#: newusers.8.xml:384(filename) newgrp.1.xml:111(filename)
+#: login.1.xml:340(filename) expiry.1.xml:111(filename)
+#: chpasswd.8.xml:248(filename) chage.1.xml:250(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
-#: vipw.8.xml:184(para) usermod.8.xml:412(para) userdel.8.xml:167(para)
-#: useradd.8.xml:666(para) su.1.xml:349(para) sg.1.xml:99(para)
-#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:264(para)
-#: passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
-#: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:234(para)
-#: chage.1.xml:237(para)
+#: vipw.8.xml:200(para) usermod.8.xml:442(para) userdel.8.xml:183(para)
+#: useradd.8.xml:682(para) su.1.xml:359(para) sg.1.xml:102(para)
+#: shadow.5.xml:247(para) shadow.3.xml:212(para) pwck.8.xml:268(para)
+#: passwd.1.xml:401(para) newusers.8.xml:386(para) newgrp.1.xml:113(para)
+#: login.1.xml:342(para) expiry.1.xml:113(para) chpasswd.8.xml:250(para)
+#: chage.1.xml:253(para)
 msgid "Secure user account information."
 msgstr "安全用户账户信息。"
 
-#: vipw.8.xml:191(title) usermod.8.xml:419(title) userdel.8.xml:252(title)
-#: useradd.8.xml:772(title) suauth.5.xml:197(title) su.1.xml:409(title)
-#: sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title)
-#: pwconv.8.xml:199(title) pwck.8.xml:322(title) porttime.5.xml:117(title)
-#: passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title)
-#: newusers.8.xml:399(title) newgrp.1.xml:129(title)
-#: login.defs.5.xml:504(title) login.access.5.xml:108(title)
-#: login.1.xml:376(title) limits.5.xml:180(title) gshadow.5.xml:159(title)
-#: grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
-#: groupmems.8.xml:192(title) groupdel.8.xml:146(title)
-#: groupadd.8.xml:290(title) gpasswd.1.xml:259(title) faillog.8.xml:222(title)
-#: faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
-#: chpasswd.8.xml:253(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title)
-#: chage.1.xml:277(title)
+#: vipw.8.xml:207(title) usermod.8.xml:449(title) userdel.8.xml:268(title)
+#: useradd.8.xml:788(title) suauth.5.xml:203(title) su.1.xml:419(title)
+#: sg.1.xml:121(title) shadow.5.xml:264(title) shadow.3.xml:219(title)
+#: pwconv.8.xml:244(title) pwck.8.xml:326(title) porttime.5.xml:123(title)
+#: passwd.5.xml:150(title) passwd.1.xml:471(title) nologin.8.xml:70(title)
+#: newusers.8.xml:417(title) newgrp.1.xml:132(title)
+#: login.defs.5.xml:507(title) login.access.5.xml:114(title)
+#: login.1.xml:379(title) limits.5.xml:186(title) gshadow.5.xml:165(title)
+#: grpck.8.xml:272(title) groups.1.xml:93(title) groupmod.8.xml:259(title)
+#: groupmems.8.xml:208(title) groupdel.8.xml:179(title)
+#: groupadd.8.xml:305(title) gpasswd.1.xml:277(title) faillog.8.xml:241(title)
+#: faillog.5.xml:89(title) expiry.1.xml:120(title) chsh.1.xml:173(title)
+#: chpasswd.8.xml:269(title) chgpasswd.8.xml:224(title) chfn.1.xml:207(title)
+#: chage.1.xml:293(title)
 msgid "SEE ALSO"
 msgstr "参见"
 
-#: vipw.8.xml:192(para)
+#: vipw.8.xml:208(para)
 msgid ""
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -383,43 +456,44 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: usermod.8.xml:41(refentrytitle) usermod.8.xml:46(refname)
-#: usermod.8.xml:52(command) login.defs.5.xml:468(term)
+#: usermod.8.xml:42(refentrytitle) usermod.8.xml:49(refname)
+#: usermod.8.xml:55(command) login.defs.5.xml:471(term)
 msgid "usermod"
 msgstr "usermod"
 
-#: usermod.8.xml:47(refpurpose)
+#: usermod.8.xml:50(refpurpose)
 msgid "modify a user account"
 msgstr "修改一个用户账户"
 
-#: usermod.8.xml:56(replaceable) userdel.8.xml:56(replaceable)
-#: useradd.8.xml:66(replaceable) passwd.1.xml:60(replaceable)
-#: chsh.1.xml:56(replaceable) chage.1.xml:53(replaceable)
+#: usermod.8.xml:59(replaceable) userdel.8.xml:59(replaceable)
+#: useradd.8.xml:69(replaceable) passwd.1.xml:63(replaceable)
+#: chsh.1.xml:59(replaceable) chfn.1.xml:59(replaceable)
+#: chage.1.xml:56(replaceable)
 msgid "LOGIN"
 msgstr "登录"
 
-#: usermod.8.xml:62(para)
+#: usermod.8.xml:65(para)
 msgid ""
 "The <command>usermod</command> command modifies the system account files to "
 "reflect the changes that are specified on the command line."
 msgstr ""
 "<command>usermod</command> 修改系统账户文件和在命令行上指定的相关更改。"
 
-#: usermod.8.xml:70(para)
+#: usermod.8.xml:73(para)
 msgid "The options which apply to the <command>usermod</command> command are:"
 msgstr "<command>usermod</command> 可以接受的选项有："
 
-#: usermod.8.xml:76(term)
+#: usermod.8.xml:79(term)
 msgid "<option>-a</option>, <option>--append</option>"
 msgstr "<option>-a</option>, <option>--append</option>"
 
-#: usermod.8.xml:80(para)
+#: usermod.8.xml:83(para)
 msgid ""
 "Add the user to the supplementary group(s). Use only with the <option>-G</"
 "option> option."
 msgstr "将用户添加到附加组。只能和 <option>-G</option> 选项一起使用。"
 
-#: usermod.8.xml:87(term) useradd.8.xml:128(term)
+#: usermod.8.xml:90(term) useradd.8.xml:131(term)
 msgid ""
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
@@ -427,7 +501,7 @@
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
 
-#: usermod.8.xml:92(para)
+#: usermod.8.xml:95(para)
 msgid ""
 "The new value of the user's password file comment field. It is normally "
 "modified using the <citerefentry><refentrytitle>chfn</"
@@ -436,7 +510,7 @@
 "用户密码文件中注释字段的新值。通常使用 <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> 工具对其进行修改。"
 
-#: usermod.8.xml:101(term) useradd.8.xml:141(term)
+#: usermod.8.xml:104(term) useradd.8.xml:144(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -444,11 +518,11 @@
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
 
-#: usermod.8.xml:106(para)
+#: usermod.8.xml:109(para)
 msgid "The user's new login directory."
 msgstr "用户的新登录目录。"
 
-#: usermod.8.xml:109(para)
+#: usermod.8.xml:112(para)
 msgid ""
 "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 "
@@ -457,7 +531,7 @@
 "如果给了 <option>-m</option> 选项，当前主目录的内容将会移动到新主目录中，如果"
 "不存在，则创建。"
 
-#: usermod.8.xml:118(term) useradd.8.xml:168(term) useradd.8.xml:526(term)
+#: usermod.8.xml:121(term) useradd.8.xml:171(term) useradd.8.xml:542(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -465,7 +539,7 @@
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
 
-#: usermod.8.xml:123(para) useradd.8.xml:173(para)
+#: usermod.8.xml:126(para) useradd.8.xml:176(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>."
@@ -473,51 +547,69 @@
 "用户账户将被禁用的日期。日期以 <emphasis remap=\"I\">YYYY-MM-DD</emphasis> 格"
 "式指定。"
 
-#: usermod.8.xml:130(term) useradd.8.xml:186(term) useradd.8.xml:539(term)
+#: usermod.8.xml:130(para)
 msgid ""
+"An empty <replaceable>EXPIRE_DATE</replaceable> argument will disable the "
+"expiration of the account."
+msgstr ""
+
+#: usermod.8.xml:134(para) usermod.8.xml:156(para)
+#, fuzzy
+#| msgid ""
+#| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
+#| "shadow</filename> by UID."
+msgid ""
+"This option requires a <filename>/etc/shadow</filename> file. A <filename>/"
+"etc/shadow</filename> entry will be created if there were none."
+msgstr ""
+"根据 UID 在 <filename>/etc/passwd</filename> 和 <filename>/etc/shadow</"
+"filename> 对项目进行排序。"
+
+#: usermod.8.xml:142(term) useradd.8.xml:189(term) useradd.8.xml:555(term)
+msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 msgstr ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 
-#: usermod.8.xml:135(para)
+#: usermod.8.xml:147(para)
 msgid ""
 "The number of days after a password expires until the account is permanently "
 "disabled."
 msgstr "密码过期之后，账户被彻底禁用之前的天数。"
 
-#: usermod.8.xml:139(para)
+#: usermod.8.xml:151(para)
 msgid ""
 "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 表示不使用这个功能。"
 
-#: usermod.8.xml:147(term) useradd.8.xml:206(term) useradd.8.xml:555(term)
+#: usermod.8.xml:164(term) useradd.8.xml:209(term) useradd.8.xml:571(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 
-#: usermod.8.xml:152(para)
+#: usermod.8.xml:169(para)
 msgid ""
 "The group name or number of the user's new initial login group. The group "
 "must exist."
 msgstr "用户的新初始登录组的组名或数字代号。此组必须存在。"
 
-#: usermod.8.xml:156(para)
+#: usermod.8.xml:173(para)
 msgid ""
 "Any file from the user's home directory owned by the previous primary group "
 "of the user will be owned by this new group."
 msgstr "用户主目录中，属于原来的主组的文件将转交新组所有。"
 
-#: usermod.8.xml:160(para)
+#: usermod.8.xml:177(para)
 msgid ""
 "The group ownership of files outside of the user's home directory must be "
 "fixed manually."
 msgstr "主目录之外的文件所属的组必须手动修改。"
 
-#: usermod.8.xml:167(term) useradd.8.xml:234(term)
+#: usermod.8.xml:184(term) useradd.8.xml:237(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -527,7 +619,7 @@
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
 "\">,GROUPN</emphasis>]]]"
 
-#: usermod.8.xml:172(para)
+#: usermod.8.xml:189(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. "
@@ -537,7 +629,7 @@
 "用户还属于的附加组列表。组之间使用逗号分隔，没有空格。这些组需要遵守和 "
 "<option>-g</option> 选项中给的组同样的限制。"
 
-#: usermod.8.xml:179(para)
+#: usermod.8.xml:196(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 "
@@ -548,7 +640,7 @@
 "这个行为可以通过 <option>-a</option> 选项修改，这使用户追加到给出的附加组列表"
 "中。"
 
-#: usermod.8.xml:188(term)
+#: usermod.8.xml:205(term)
 msgid ""
 "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
 "replaceable>"
@@ -556,22 +648,28 @@
 "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
 "replaceable>"
 
-#: usermod.8.xml:193(para)
+#: usermod.8.xml:210(para)
+#, fuzzy
+#| msgid ""
+#| "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."
 msgid ""
 "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."
+"particular, the user's home directory or mail spool should probably be "
+"renamed manually to reflect the new login name."
 msgstr ""
 "用户的名称将会从 <replaceable>LOGIN</replaceable> 修改为 "
 "<replaceable>NEW_LOGIN</replaceable>。不会更改别的任何东西。特别是，用户的主"
 "目录名也需要手动修改以和新登录名对应。"
 
-#: usermod.8.xml:203(term)
+#: usermod.8.xml:220(term)
 msgid "<option>-L</option>, <option>--lock</option>"
 msgstr "<option>-L</option>, <option>--lock</option>"
 
-#: usermod.8.xml:207(para)
+#: usermod.8.xml:224(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>-"
@@ -580,7 +678,7 @@
 "锁定用户的密码。这会在用户加密的密码之前放置一个“!”，可以快速禁用密码。您可以"
 "和 <option>-p</option> 或 <option>-U</option> 配合使用此选项。"
 
-#: usermod.8.xml:213(para)
+#: usermod.8.xml:230(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 "
@@ -589,15 +687,15 @@
 "注意：如果希望锁定账户(不仅仅是通过密码访问)，您也需要设置 "
 "<replaceable>EXPIRE_DATE</replaceable> 为 <replaceable>1</replaceable>。"
 
-#: usermod.8.xml:222(term)
+#: usermod.8.xml:239(term)
 msgid "<option>-m</option>, <option>--move-home</option>"
 msgstr "<option>-m</option>, <option>--move-home</option>"
 
-#: usermod.8.xml:226(para)
+#: usermod.8.xml:243(para)
 msgid "Move the content of the user's home directory to the new location."
 msgstr "将用户的主目录移动到新位置。"
 
-#: usermod.8.xml:230(para)
+#: usermod.8.xml:247(para)
 msgid ""
 "This option is only valid in combination with the <option>-d</option> (or "
 "<option>--home</option>) option."
@@ -605,7 +703,7 @@
 "这个选项只有和 <option>-d</option> (或 <option>--home</option>) 选项组合使用"
 "时才有效。"
 
-#: usermod.8.xml:234(para)
+#: usermod.8.xml:251(para)
 msgid ""
 "<command>usermod</command> will try to adapt the ownership of the files and "
 "to copy the modes, ACL and extended attributes, but manual changes might be "
@@ -614,19 +712,19 @@
 "<command>usermod</command> 会改写文件的属主并复制模式、ACL 和扩展属性，但是稍"
 "后也可能需要手动修改。"
 
-#: usermod.8.xml:242(term) useradd.8.xml:374(term) groupmod.8.xml:116(term)
-#: groupadd.8.xml:134(term)
+#: usermod.8.xml:259(term) useradd.8.xml:377(term) groupmod.8.xml:123(term)
+#: groupadd.8.xml:136(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
-#: usermod.8.xml:246(para)
+#: usermod.8.xml:263(para)
 msgid ""
 "When used with the <option>-u</option> option, this option allows to change "
 "the user ID to a non-unique value."
 msgstr "使用 <option>-u</option> 选项时，可以将用户 ID 改为非唯一的值。"
 
-#: usermod.8.xml:253(term) useradd.8.xml:386(term) groupmod.8.xml:127(term)
-#: groupadd.8.xml:144(term)
+#: usermod.8.xml:270(term) useradd.8.xml:389(term) groupmod.8.xml:134(term)
+#: groupadd.8.xml:146(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -634,7 +732,7 @@
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
 
-#: usermod.8.xml:258(para) groupmod.8.xml:132(para)
+#: usermod.8.xml:275(para) groupmod.8.xml:139(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
@@ -642,8 +740,8 @@
 "已经加密过的密码，就像 <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> 返回的那样。"
 
-#: usermod.8.xml:263(para) useradd.8.xml:396(para) groupmod.8.xml:137(para)
-#: groupadd.8.xml:154(para)
+#: usermod.8.xml:280(para) useradd.8.xml:399(para) groupmod.8.xml:144(para)
+#: groupadd.8.xml:156(para)
 msgid ""
 "<emphasis role=\"bold\">Note:</emphasis> This option is not recommended "
 "because the password (or encrypted password) will be visible by users "
@@ -652,7 +750,7 @@
 "<emphasis role=\"bold\">注意：</emphasis>不推荐使用这个选项，因为密码(或加密"
 "过的密码)会被用户通过列出这个过程而看到。"
 
-#: usermod.8.xml:268(para)
+#: usermod.8.xml:285(para)
 msgid ""
 "The password will be written in the local <filename>/etc/passwd</filename> "
 "or <filename>/etc/shadow</filename> file. This might differ from the "
@@ -662,37 +760,37 @@
 "shadow</filename> 文件。这可能会与您的机器有所不同，这根据 PAM 配置中的密码数"
 "据库配置而定。"
 
-#: usermod.8.xml:274(para) useradd.8.xml:401(para) groupmod.8.xml:142(para)
-#: groupadd.8.xml:159(para)
+#: usermod.8.xml:291(para) useradd.8.xml:404(para) groupmod.8.xml:149(para)
+#: groupadd.8.xml:161(para)
 msgid ""
 "You should make sure the password respects the system's password policy."
 msgstr "您应该确保密码符合系统的密码政策。"
 
-#: usermod.8.xml:281(term) useradd.8.xml:435(term) useradd.8.xml:576(term)
-#: su.1.xml:157(term) chsh.1.xml:85(term)
+#: usermod.8.xml:311(term) useradd.8.xml:451(term) useradd.8.xml:592(term)
+#: su.1.xml:167(term) chsh.1.xml:101(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 
-#: usermod.8.xml:286(para) chsh.1.xml:89(para)
+#: usermod.8.xml:316(para) chsh.1.xml:105(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 ""
 "用户的新登录 shell 的名称。将此字段设置为空会让系统选择默认的登录 shell。"
 
-#: usermod.8.xml:293(term) useradd.8.xml:450(term)
+#: usermod.8.xml:323(term) useradd.8.xml:466(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: usermod.8.xml:298(para)
+#: usermod.8.xml:328(para)
 msgid "The new numerical value of the user's ID."
 msgstr "用户 ID 的新数值。"
 
-#: usermod.8.xml:301(para)
+#: usermod.8.xml:331(para)
 msgid ""
 "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 "
@@ -701,24 +799,24 @@
 "这个值必须是唯一的，除非使用了 <option>-o</option> 选项，必须是非负值。 0 到 "
 "99 的值一般保留做系统账户。"
 
-#: usermod.8.xml:307(para)
+#: usermod.8.xml:337(para)
 msgid ""
 "The user's mailbox, and any files which the user owns and which are located "
 "in the user's home directory will have the file user ID changed "
 "automatically."
 msgstr "用户的邮箱，用户主目录中属于此用户的文件的属主 ID 也将自动更改。"
 
-#: usermod.8.xml:312(para)
+#: usermod.8.xml:342(para)
 msgid ""
 "The ownership of files outside of the user's home directory must be fixed "
 "manually."
 msgstr "用户主目录之外文件所有权必须手动修复。"
 
-#: usermod.8.xml:319(term)
+#: usermod.8.xml:349(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:323(para)
+#: usermod.8.xml:353(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</"
@@ -727,7 +825,7 @@
 "解锁用户的密码。这将移除加密的密码之前的“!”。您可以将此选项和 <option>-p</"
 "option> 或 <option>-L</option> 配合使用。"
 
-#: usermod.8.xml:328(para)
+#: usermod.8.xml:358(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 "
@@ -739,7 +837,7 @@
 "replaceable>，或者 <filename>/etc/default/useradd</filename> 中的 "
 "<option>EXPIRE</option> 值)。"
 
-#: usermod.8.xml:339(term) useradd.8.xml:482(term)
+#: usermod.8.xml:369(term) useradd.8.xml:498(term)
 msgid ""
 "<option>-Z</option>, <option>--selinux-user</option><replaceable>SEUSER</"
 "replaceable>"
@@ -747,23 +845,23 @@
 "<option>-Z</option>, <option>--selinux-user</option><replaceable>SEUSER</"
 "replaceable>"
 
-#: usermod.8.xml:344(para)
+#: usermod.8.xml:374(para)
 msgid ""
 "The SELinux user for the user's login. The default is to leave this field "
 "the blank, which causes the system to select the default SELinux user."
 msgstr ""
 "用户登录使用的 SELinux 用户。默认值就留空，会让系统选择默认的 SELinux 用户。"
 
-#: usermod.8.xml:355(title) userdel.8.xml:225(title) useradd.8.xml:605(title)
-#: su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
-#: newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title)
-#: groupdel.8.xml:65(title) groupadd.8.xml:223(title) gpasswd.1.xml:214(title)
-#: faillog.8.xml:199(title) chpasswd.8.xml:199(title)
-#: chgpasswd.8.xml:157(title)
+#: usermod.8.xml:385(title) userdel.8.xml:241(title) useradd.8.xml:621(title)
+#: su.1.xml:312(title) shadow.3.xml:199(title) passwd.1.xml:354(title)
+#: newusers.8.xml:330(title) login.1.xml:241(title) lastlog.8.xml:178(title)
+#: groupdel.8.xml:98(title) groupadd.8.xml:238(title) gpasswd.1.xml:232(title)
+#: faillog.8.xml:218(title) chpasswd.8.xml:215(title)
+#: chgpasswd.8.xml:173(title)
 msgid "CAVEATS"
 msgstr "CAVEATS"
 
-#: usermod.8.xml:356(para)
+#: usermod.8.xml:386(para)
 msgid ""
 "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, the "
@@ -775,7 +873,7 @@
 "进程。<command>usermod</command> 会在 Linux 上进行检查；但是在其它平台上，仅"
 "仅根据 utmp 检查用户是否已经登录。"
 
-#: usermod.8.xml:364(para)
+#: usermod.8.xml:394(para)
 msgid ""
 "You must change the owner of any <command>crontab</command> files or "
 "<command>at</command> jobs manually."
@@ -783,7 +881,7 @@
 "您必须手动更改 <command>crontab</command> 文件或 <command>at</command> 作业的"
 "属主。"
 
-#: usermod.8.xml:368(para)
+#: usermod.8.xml:398(para)
 msgid "You must make any changes involving NIS on the NIS server."
 msgstr "您必须更改 NIS 服务器上的 NIS 相关内容。"
 
@@ -953,7 +1051,7 @@
 "如果是 <replaceable>yes</replaceable>，要创建用户 tcb 目录不会自动设置为 /"
 "etc/tcb/user，但是会根据用户的 UID 计算，根据的算法如下：<placeholder-1/>"
 
-#: usermod.8.xml:420(para)
+#: usermod.8.xml:450(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -991,16 +1089,16 @@
 "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: userdel.8.xml:43(refentrytitle) userdel.8.xml:48(refname)
-#: userdel.8.xml:53(command) login.defs.5.xml:458(term)
+#: userdel.8.xml:44(refentrytitle) userdel.8.xml:51(refname)
+#: userdel.8.xml:56(command) login.defs.5.xml:461(term)
 msgid "userdel"
 msgstr "userdel"
 
-#: userdel.8.xml:49(refpurpose)
+#: userdel.8.xml:52(refpurpose)
 msgid "delete a user account and related files"
 msgstr "删除用户账户和相关文件"
 
-#: userdel.8.xml:63(para)
+#: userdel.8.xml:66(para)
 msgid ""
 "The <command>userdel</command> command modifies the system account files, "
 "deleting all entries that refer to the user name <emphasis remap=\"I"
@@ -1009,15 +1107,15 @@
 "<command>userdel</command> 修改系统账户文件，删除与用户名 <emphasis remap=\"I"
 "\">LOGIN</emphasis> 相关的所以项目。给出的用户名必须存在。"
 
-#: userdel.8.xml:72(para)
+#: userdel.8.xml:75(para)
 msgid "The options which apply to the <command>userdel</command> command are:"
 msgstr "<command>userdel</command> 可以使用的选项有："
 
-#: userdel.8.xml:77(term) groupadd.8.xml:79(term)
+#: userdel.8.xml:80(term) groupadd.8.xml:81(term) expiry.1.xml:84(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option>"
 
-#: userdel.8.xml:81(para)
+#: userdel.8.xml:84(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 "
@@ -1035,17 +1133,17 @@
 "emphasis>，并且如果有一个和用户同名的组，也会删除此组，即使它仍然是别的用户的"
 "主组。"
 
-#: userdel.8.xml:94(para)
+#: userdel.8.xml:97(para)
 msgid ""
 "<emphasis>Note:</emphasis> This option is dangerous and may leave your "
 "system in an inconsistent state."
 msgstr "<emphasis>注意：</emphasis>此选项危险，可能会破坏系统的稳定性。"
 
-#: userdel.8.xml:107(term)
+#: userdel.8.xml:110(term)
 msgid "<option>-r</option>, <option>--remove</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
-#: userdel.8.xml:111(para)
+#: userdel.8.xml:114(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 "
@@ -1054,7 +1152,7 @@
 "用户主目录中的文件将随用户主目录和用户邮箱一起删除。在其它文件系统中的文件必"
 "须手动搜索并删除。"
 
-#: userdel.8.xml:117(para)
+#: userdel.8.xml:120(para)
 msgid ""
 "The mail spool is defined by the <option>MAIL_DIR</option> variable in the "
 "<filename>login.defs</filename> file."
@@ -1166,115 +1264,115 @@
 "<command>userdel</command> 将移除此用户组，<command>useradd</command> 创建用"
 "户时，也会创建一个同名的默认组。"
 
-#: userdel.8.xml:153(filename) useradd.8.xml:694(filename)
-#: su.1.xml:353(filename) pwconv.8.xml:190(filename)
-#: passwd.1.xml:389(filename) newusers.8.xml:384(filename)
-#: login.access.5.xml:99(filename) login.1.xml:367(filename)
-#: groupadd.8.xml:214(filename) chsh.1.xml:148(filename)
-#: chpasswd.8.xml:238(filename) chgpasswd.8.xml:199(filename)
-#: chfn.1.xml:116(filename)
+#: userdel.8.xml:169(filename) useradd.8.xml:710(filename)
+#: su.1.xml:363(filename) pwconv.8.xml:235(filename)
+#: passwd.1.xml:405(filename) newusers.8.xml:402(filename)
+#: login.access.5.xml:105(filename) login.1.xml:370(filename)
+#: groupadd.8.xml:229(filename) chsh.1.xml:164(filename)
+#: chpasswd.8.xml:254(filename) chgpasswd.8.xml:215(filename)
+#: chfn.1.xml:192(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:155(para) useradd.8.xml:696(para) su.1.xml:355(para)
-#: pwconv.8.xml:192(para) passwd.1.xml:391(para) newusers.8.xml:386(para)
-#: login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:216(para)
-#: chsh.1.xml:150(para) chpasswd.8.xml:240(para) chgpasswd.8.xml:201(para)
-#: chfn.1.xml:118(para)
+#: userdel.8.xml:171(para) useradd.8.xml:712(para) su.1.xml:365(para)
+#: pwconv.8.xml:237(para) passwd.1.xml:407(para) newusers.8.xml:404(para)
+#: login.access.5.xml:107(para) login.1.xml:372(para) groupadd.8.xml:231(para)
+#: chsh.1.xml:166(para) chpasswd.8.xml:256(para) chgpasswd.8.xml:217(para)
+#: chfn.1.xml:194(para)
 msgid "Shadow password suite configuration."
 msgstr "Shadow 密码套件配置。"
 
-#: userdel.8.xml:174(title) useradd.8.xml:703(title) su.1.xml:362(title)
-#: pwck.8.xml:271(title) passwd.1.xml:404(title) grpck.8.xml:209(title)
-#: groupmod.8.xml:182(title) groupdel.8.xml:107(title)
-#: groupadd.8.xml:245(title) chage.1.xml:244(title)
+#: userdel.8.xml:190(title) useradd.8.xml:719(title) su.1.xml:372(title)
+#: pwck.8.xml:275(title) passwd.1.xml:420(title) grpck.8.xml:227(title)
+#: groupmod.8.xml:208(title) groupdel.8.xml:140(title)
+#: groupadd.8.xml:260(title) chage.1.xml:260(title)
 msgid "EXIT VALUES"
 msgstr "退出值"
 
-#: userdel.8.xml:179(replaceable) useradd.8.xml:708(replaceable)
-#: su.1.xml:381(replaceable) pwck.8.xml:276(replaceable)
-#: passwd.1.xml:409(replaceable) grpck.8.xml:214(replaceable)
-#: groupmod.8.xml:187(replaceable) groupdel.8.xml:112(replaceable)
-#: groupadd.8.xml:250(replaceable) chage.1.xml:249(replaceable)
+#: userdel.8.xml:195(replaceable) useradd.8.xml:724(replaceable)
+#: su.1.xml:391(replaceable) pwck.8.xml:280(replaceable)
+#: passwd.1.xml:425(replaceable) grpck.8.xml:232(replaceable)
+#: groupmod.8.xml:213(replaceable) groupdel.8.xml:145(replaceable)
+#: groupadd.8.xml:265(replaceable) chage.1.xml:265(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:181(para) useradd.8.xml:710(para) pwck.8.xml:278(para)
-#: passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para)
-#: groupdel.8.xml:114(para) groupadd.8.xml:252(para) chage.1.xml:251(para)
+#: userdel.8.xml:197(para) useradd.8.xml:726(para) pwck.8.xml:282(para)
+#: passwd.1.xml:427(para) grpck.8.xml:234(para) groupmod.8.xml:215(para)
+#: groupdel.8.xml:147(para) groupadd.8.xml:267(para) chage.1.xml:267(para)
 msgid "success"
 msgstr "成功"
 
-#: userdel.8.xml:185(replaceable) useradd.8.xml:714(replaceable)
-#: su.1.xml:55(manvolnum) su.1.xml:387(replaceable) sg.1.xml:39(manvolnum)
-#: pwck.8.xml:282(replaceable) passwd.1.xml:45(manvolnum)
-#: passwd.1.xml:415(replaceable) newgrp.1.xml:39(manvolnum)
-#: login.1.xml:71(manvolnum) grpck.8.xml:220(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:39(manvolnum)
-#: chage.1.xml:255(replaceable)
+#: userdel.8.xml:201(replaceable) useradd.8.xml:730(replaceable)
+#: su.1.xml:56(manvolnum) su.1.xml:397(replaceable) sg.1.xml:40(manvolnum)
+#: pwck.8.xml:286(replaceable) passwd.1.xml:46(manvolnum)
+#: passwd.1.xml:431(replaceable) newgrp.1.xml:40(manvolnum)
+#: login.1.xml:72(manvolnum) grpck.8.xml:238(replaceable)
+#: groups.1.xml:39(manvolnum) gpasswd.1.xml:44(manvolnum)
+#: expiry.1.xml:43(manvolnum) chsh.1.xml:42(manvolnum)
+#: chfn.1.xml:42(manvolnum) chage.1.xml:40(manvolnum)
+#: chage.1.xml:271(replaceable)
 msgid "1"
 msgstr "1"
 
-#: userdel.8.xml:187(para) useradd.8.xml:716(para)
+#: userdel.8.xml:203(para) useradd.8.xml:732(para)
 msgid "can't update password file"
 msgstr "无法更新密码文件"
 
-#: userdel.8.xml:191(replaceable) useradd.8.xml:720(replaceable)
-#: pwck.8.xml:288(replaceable) passwd.1.xml:421(replaceable)
-#: grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable)
-#: groupdel.8.xml:118(replaceable) groupadd.8.xml:256(replaceable)
-#: chage.1.xml:261(replaceable)
+#: userdel.8.xml:207(replaceable) useradd.8.xml:736(replaceable)
+#: pwck.8.xml:292(replaceable) passwd.1.xml:437(replaceable)
+#: grpck.8.xml:244(replaceable) groupmod.8.xml:219(replaceable)
+#: groupdel.8.xml:151(replaceable) groupadd.8.xml:271(replaceable)
+#: chage.1.xml:277(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:193(para) useradd.8.xml:722(para) pwck.8.xml:284(para)
-#: grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
-#: groupadd.8.xml:258(para) chage.1.xml:263(para)
+#: userdel.8.xml:209(para) useradd.8.xml:738(para) pwck.8.xml:288(para)
+#: grpck.8.xml:240(para) groupmod.8.xml:221(para) groupdel.8.xml:153(para)
+#: groupadd.8.xml:273(para) chage.1.xml:279(para)
 msgid "invalid command syntax"
 msgstr "无效的命令语法"
 
-#: userdel.8.xml:197(replaceable) useradd.8.xml:738(replaceable)
-#: pwck.8.xml:312(replaceable) passwd.1.xml:445(replaceable)
-#: groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
+#: userdel.8.xml:213(replaceable) useradd.8.xml:754(replaceable)
+#: pwck.8.xml:316(replaceable) passwd.1.xml:461(replaceable)
+#: groupmod.8.xml:237(replaceable) groupdel.8.xml:157(replaceable)
 msgid "6"
 msgstr "6"
 
-#: userdel.8.xml:199(para)
+#: userdel.8.xml:215(para)
 msgid "specified user doesn't exist"
 msgstr "指定的用户不存在"
 
-#: userdel.8.xml:205(para)
+#: userdel.8.xml:221(para)
 msgid "user currently logged in"
 msgstr "用户已经登录"
 
-#: userdel.8.xml:209(replaceable) useradd.8.xml:750(replaceable)
-#: groupmod.8.xml:223(replaceable) groupdel.8.xml:136(replaceable)
-#: groupadd.8.xml:280(replaceable)
+#: userdel.8.xml:225(replaceable) useradd.8.xml:766(replaceable)
+#: groupmod.8.xml:249(replaceable) groupdel.8.xml:169(replaceable)
+#: groupadd.8.xml:295(replaceable)
 msgid "10"
 msgstr "10"
 
-#: userdel.8.xml:211(para) useradd.8.xml:752(para) groupmod.8.xml:225(para)
-#: groupdel.8.xml:138(para) groupadd.8.xml:282(para)
+#: userdel.8.xml:227(para) useradd.8.xml:768(para) groupmod.8.xml:251(para)
+#: groupdel.8.xml:171(para) groupadd.8.xml:297(para)
 msgid "can't update group file"
 msgstr "无法更新组文件"
 
-#: userdel.8.xml:215(replaceable) useradd.8.xml:756(replaceable)
+#: userdel.8.xml:231(replaceable) useradd.8.xml:772(replaceable)
 msgid "12"
 msgstr "12"
 
-#: userdel.8.xml:217(para)
+#: userdel.8.xml:233(para)
 msgid "can't remove home directory"
 msgstr "无法删除主目录"
 
-#: userdel.8.xml:175(para)
+#: userdel.8.xml:191(para)
 msgid ""
 "The <command>userdel</command> command exits with the following values: "
 "<placeholder-1/>"
 msgstr "<command>userdel</command> 命令使用如下值退出：<placeholder-1/>"
 
-#: userdel.8.xml:226(para)
+#: userdel.8.xml:242(para)
 msgid ""
 "<command>userdel</command> will not allow you to remove an account if there "
 "are running processes which belong to this account. In that case, you may "
@@ -1286,19 +1384,19 @@
 "您可能必须要杀死那写进程或者锁定用户的密码和账户，并稍后再删除账户。<option>-"
 "f</option> 选项可以强制此删除账户。"
 
-#: userdel.8.xml:233(para)
+#: userdel.8.xml:249(para)
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this user."
 msgstr "您应该手动检查所以文件系统，以确保没有遗留此用户的文件。"
 
-#: userdel.8.xml:237(para)
+#: userdel.8.xml:253(para)
 msgid ""
 "You may not remove any NIS attributes on a NIS client. This must be "
 "performed on the NIS server."
 msgstr "您不能在 NIS 客户端上移除任何 NIS 属性。这必须在 NIS 服务器上执行。"
 
-#: userdel.8.xml:240(para)
+#: userdel.8.xml:256(para)
 msgid ""
 "If <option>USERGROUPS_ENAB</option> is defined to <emphasis remap=\"I\">yes</"
 "emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -1314,7 +1412,7 @@
 "<command>userdel</command> 将会检查这个主是否被别的用户用作主组，如果有，将只"
 "发出警告并不删除此组。<option>-f</option> 选项可以强制删除此组。"
 
-#: userdel.8.xml:253(para)
+#: userdel.8.xml:269(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1348,21 +1446,21 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: useradd.8.xml:52(refentrytitle) useradd.8.xml:57(refname)
-#: useradd.8.xml:62(command) useradd.8.xml:69(command)
-#: useradd.8.xml:73(command) login.defs.5.xml:444(term)
+#: useradd.8.xml:53(refentrytitle) useradd.8.xml:60(refname)
+#: useradd.8.xml:65(command) useradd.8.xml:72(command)
+#: useradd.8.xml:76(command) login.defs.5.xml:447(term)
 msgid "useradd"
 msgstr "useradd"
 
-#: useradd.8.xml:58(refpurpose)
+#: useradd.8.xml:61(refpurpose)
 msgid "create a new user or update default new user information"
 msgstr "创建一个新用户或更新默认新用户信息"
 
-#: useradd.8.xml:70(arg) useradd.8.xml:74(arg)
+#: useradd.8.xml:73(arg) useradd.8.xml:77(arg)
 msgid "-D"
 msgstr "-D"
 
-#: useradd.8.xml:83(para)
+#: useradd.8.xml:86(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 "
@@ -1376,7 +1474,7 @@
 "<command>useradd</command> 命令也会更新系统文件和创建新用户的主目录并复制初始"
 "文件。"
 
-#: useradd.8.xml:92(para)
+#: useradd.8.xml:95(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 "
@@ -1385,11 +1483,11 @@
 "默认上，也会为用户创建组 (察看 <option>-g</option>, <option>-N</option>, "
 "<option>-U</option>，和 <option>USERGROUPS_ENAB</option>)。"
 
-#: useradd.8.xml:101(para)
+#: useradd.8.xml:104(para)
 msgid "The options which apply to the <command>useradd</command> command are:"
 msgstr "<command>useradd</command> 可以使用的选项有："
 
-#: useradd.8.xml:105(term) useradd.8.xml:507(term)
+#: useradd.8.xml:108(term) useradd.8.xml:523(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
@@ -1397,7 +1495,7 @@
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
 
-#: useradd.8.xml:110(para)
+#: useradd.8.xml:113(para)
 msgid ""
 "The default base directory for the system if <option>-d</"
 "option><replaceable>HOME_DIR</replaceable> is not specified. "
@@ -1410,7 +1508,7 @@
 "有使用 <option>-m</option> 选项，<replaceable>BASE_DIR</replaceable> 必须已经"
 "存在。"
 
-#: useradd.8.xml:118(para)
+#: useradd.8.xml:121(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>/"
@@ -1420,13 +1518,13 @@
 "useradd</filename> 中的 <option>HOME</option> 变量，或者默认的 <filename>/"
 "home</filename>。"
 
-#: useradd.8.xml:133(para)
+#: useradd.8.xml:136(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:146(para)
+#: useradd.8.xml:149(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 "
@@ -1440,15 +1538,15 @@
 "<replaceable>BASE_DIR</replaceable> 后面，并使用这作为登陆目录。目录不一定必"
 "须已经存在 <replaceable>HOME_DIR</replaceable>，但是会在需要时创建。"
 
-#: useradd.8.xml:158(term)
+#: useradd.8.xml:161(term)
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr "<option>-D</option>, <option>--defaults</option>"
 
-#: useradd.8.xml:162(para)
+#: useradd.8.xml:165(para)
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr "看下边，“更改默认值”子节。"
 
-#: useradd.8.xml:177(para)
+#: useradd.8.xml:180(para)
 msgid ""
 "If not specified, <command>useradd</command> will use the default expiry "
 "date specified by the <option>EXPIRE</option> variable in <filename>/etc/"
@@ -1458,7 +1556,7 @@
 "useradd</filename> 中 <option>EXPIRE</option> 变量指定的默认过期日期，或者一"
 "个空字符串(不过期)。"
 
-#: useradd.8.xml:191(para)
+#: useradd.8.xml:194(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 "
@@ -1466,7 +1564,7 @@
 msgstr ""
 "密码过期后，账户被彻底禁用之前的天数。0 表示立即禁用，-1 表示禁用这个功能。"
 
-#: useradd.8.xml:197(para)
+#: useradd.8.xml:200(para)
 msgid ""
 "If not specified, <command>useradd</command> will use the default inactivity "
 "period specified by the <option>INACTIVE</option> variable in <filename>/etc/"
@@ -1476,14 +1574,14 @@
 "useradd</filename> 中的 <option>INACTIVE</option> 指定的默认禁用周期，或者默"
 "认为 -1。"
 
-#: useradd.8.xml:211(para)
+#: useradd.8.xml:214(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."
 msgstr ""
 "用户初始登陆组的组名或号码。组名必须已经存在。组号码必须指代已经存在的组。"
 
-#: useradd.8.xml:216(para)
+#: useradd.8.xml:219(para)
 msgid ""
 "If not specified, the behavior of <command>useradd</command> will depend on "
 "the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
@@ -1504,7 +1602,7 @@
 "user-group</option>)，useradd 会把新用户的主组设置为 <filename>/etc/default/"
 "useradd</filename> 中 <option>GROUP</option> 变量指定的值，再或者默认是 100。"
 
-#: useradd.8.xml:239(para)
+#: useradd.8.xml:242(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. "
@@ -1515,7 +1613,7 @@
 "用户还属于的附加组列表。每个组都用逗号隔开，没有中间的空格。这里的组受到了 "
 "<option>-g</option> 选项给定的组同样的限制。默认上，用户只属于初始组。"
 
-#: useradd.8.xml:256(term)
+#: useradd.8.xml:259(term)
 msgid ""
 "<option>-k</option>, <option>--skel</option><replaceable>SKEL_DIR</"
 "replaceable>"
@@ -1523,7 +1621,7 @@
 "<option>-k</option>, <option>--skel</option><replaceable>SKEL_DIR</"
 "replaceable>"
 
-#: useradd.8.xml:261(para)
+#: useradd.8.xml:264(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 "
@@ -1532,7 +1630,7 @@
 "骨架目录，包含使用 <command>useradd</command> 创建用户时，要复制到用户主目录"
 "中的文件和目录。"
 
-#: useradd.8.xml:266(para)
+#: useradd.8.xml:269(para)
 msgid ""
 "This option is only valid if the <option>-m</option> (or <option>--create-"
 "home</option>) option is specified."
@@ -1540,7 +1638,7 @@
 "这个选项只有在指定 <option>-m</option> (或 <option>--create-home</option>) 选"
 "项时才有效。"
 
-#: useradd.8.xml:270(para)
+#: useradd.8.xml:273(para)
 msgid ""
 "If this option is not set, the skeleton directory is defined by the "
 "<option>SKEL</option> variable in <filename>/etc/default/useradd</filename> "
@@ -1549,11 +1647,11 @@
 "如果此项没有设置，骨架目录使用 <filename>/etc/default/useradd</filename> 中"
 "的 <option>SKEL</option> 的变量或默认为 <filename>/etc/skel</filename>。"
 
-#: useradd.8.xml:276(para)
+#: useradd.8.xml:279(para)
 msgid "If possible, the ACLs and extended attributes are copied."
 msgstr "如果可以，也复制 ACL 和扩展属性。"
 
-#: useradd.8.xml:282(term) groupadd.8.xml:113(term)
+#: useradd.8.xml:285(term) groupadd.8.xml:115(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -1561,7 +1659,7 @@
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
 
-#: useradd.8.xml:287(para)
+#: useradd.8.xml:290(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (<option>UID_MIN</"
 "option>, <option>UID_MAX</option>, <option>UMASK</option>, "
@@ -1584,15 +1682,15 @@
 "replaceable><option>-K </option><replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable>"
 
-#: useradd.8.xml:311(term)
+#: useradd.8.xml:314(term)
 msgid "<option>-l</option>, <option>--no-log-init</option>"
 msgstr "<option>-l</option>, <option>--no-log-init</option>"
 
-#: useradd.8.xml:313(para)
+#: useradd.8.xml:316(para)
 msgid "Do not add the user to the lastlog and faillog databases."
 msgstr "不要将用户添加到最近登录和登录失败数据库。"
 
-#: useradd.8.xml:316(para)
+#: useradd.8.xml:319(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."
@@ -1600,11 +1698,11 @@
 "默认上，最近登录和登录失败中用户的条目会被重置，以避免重新使用先前删除的用户"
 "的条目。"
 
-#: useradd.8.xml:324(term)
+#: useradd.8.xml:327(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:328(para)
+#: useradd.8.xml:331(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 "
@@ -1613,7 +1711,7 @@
 "如果不存在，则创建用户主目录。骨架目录中的文件和目录(可以使用 <option>-k</"
 "option> 选项指定)，将会复制到主目录。"
 
-#: useradd.8.xml:334(para)
+#: useradd.8.xml:337(para)
 msgid ""
 "By default, if this option is not specified and <option>CREATE_HOME</option> "
 "is not enabled, no home directories are created."
@@ -1621,11 +1719,11 @@
 "默认上，如果没有指定此选项并且 <option>CREATE_HOME</option> 没有启用，不会创"
 "建主目录。"
 
-#: useradd.8.xml:343(option)
+#: useradd.8.xml:346(option)
 msgid "-M"
 msgstr "-M"
 
-#: useradd.8.xml:346(para)
+#: useradd.8.xml:349(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 "
@@ -1634,11 +1732,11 @@
 "不创建用户主目录，即使系统在 <filename>/etc/login.defs</filename> 中的设置 "
 "(<option>CREATE_HOME</option>) 为 <replaceable>yes</replaceable>。"
 
-#: useradd.8.xml:355(term)
+#: useradd.8.xml:358(term)
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr "<option>-N</option>, <option>--no-user-group</option>"
 
-#: useradd.8.xml:359(para)
+#: useradd.8.xml:362(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 "
@@ -1647,7 +1745,7 @@
 "不要创建同名组，而是将用户添加到 <option>-g</option> 选项指定的组，或根据 "
 "<filename>/etc/default/useradd</filename> 中的 <option>GROUP</option> 变量。"
 
-#: useradd.8.xml:365(para) useradd.8.xml:473(para)
+#: useradd.8.xml:368(para) useradd.8.xml:489(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 "
@@ -1658,16 +1756,16 @@
 "选项，默认行为由 <filename>/etc/login.defs</filename> 中的 "
 "<option>USERGROUPS_ENAB</option> 变量指定。"
 
-#: useradd.8.xml:378(para)
+#: useradd.8.xml:381(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr "允许使用重复的 UID 创建用户账户。"
 
-#: useradd.8.xml:379(para)
+#: useradd.8.xml:382(para)
 msgid ""
 "This option is only valid in combination with the <option>-u</option> option."
 msgstr "此选项只有和 <option>-u</option> 选项组合使用才有效。"
 
-#: useradd.8.xml:391(para) groupadd.8.xml:149(para)
+#: useradd.8.xml:394(para) groupadd.8.xml:151(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
@@ -1677,15 +1775,15 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> 的返回值。默认为禁用密"
 "码。"
 
-#: useradd.8.xml:408(term) newusers.8.xml:263(term) groupadd.8.xml:166(term)
+#: useradd.8.xml:411(term) newusers.8.xml:268(term) groupadd.8.xml:168(term)
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr "<option>-r</option>, <option>--system</option>"
 
-#: useradd.8.xml:412(para) newusers.8.xml:267(para)
+#: useradd.8.xml:415(para) newusers.8.xml:272(para)
 msgid "Create a system account."
 msgstr "创建一个系统账户。"
 
-#: useradd.8.xml:415(para)
+#: useradd.8.xml:418(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are chosen in the "
@@ -1695,7 +1793,7 @@
 "the creation of groups)."
 msgstr ""
 
-#: useradd.8.xml:424(para)
+#: useradd.8.xml:427(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."
@@ -1707,7 +1805,7 @@
 "etc/login.defs</filename> (<option>CREATE_HOME</option>) 中是的默认设置是怎"
 "样。如果想为要创建的系统账户创建主目录，需要指定 <option>-m</option> 选项。"
 
-#: useradd.8.xml:440(para)
+#: useradd.8.xml:456(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 specified "
@@ -1718,7 +1816,7 @@
 "filename> 中的 <option>SHELL</option> 变量选择默认的登录 shell，默认为空字符"
 "串。"
 
-#: useradd.8.xml:455(para)
+#: useradd.8.xml:471(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 "
@@ -1730,28 +1828,28 @@
 "必须非负，默认使用大于 999，且大于任何其他用户 ID 最小值。0 到 999 之间的值一"
 "般保留做系统账户。"
 
-#: useradd.8.xml:465(term)
+#: useradd.8.xml:481(term)
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr "<option>-U</option>, <option>--user-group</option>"
 
-#: useradd.8.xml:469(para)
+#: useradd.8.xml:485(para)
 msgid ""
 "Create a group with the same name as the user, and add the user to this "
 "group."
 msgstr "创建一个和用户同名的组，并将用户添加到组中。"
 
-#: useradd.8.xml:487(para)
+#: useradd.8.xml:503(para)
 msgid ""
 "The SELinux user for the user's login. The default is to leave this field "
 "blank, which causes the system to select the default SELinux user."
 msgstr ""
 "用户登陆的 SELinux 用户。默认为留空，这会造成系统选择默认的 SELinux 用户。"
 
-#: useradd.8.xml:497(title)
+#: useradd.8.xml:513(title)
 msgid "Changing the default values"
 msgstr "更改默认值"
 
-#: useradd.8.xml:498(para)
+#: useradd.8.xml:514(para)
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
 "command> will display the current default values. When invoked with <option>-"
@@ -1762,7 +1860,7 @@
 "默认值。<option>-D</option> 和其它选项配合使用时，<command>useradd</command> "
 "将为指定的选项更新默认值。有效的“更改默认值”选项有："
 
-#: useradd.8.xml:512(para)
+#: useradd.8.xml:528(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 "
@@ -1773,7 +1871,7 @@
 "用户的名称将会缀在 <replaceable>BASE_DIR</replaceable> 的后边形成新用户的主目"
 "录名。"
 
-#: useradd.8.xml:519(para)
+#: useradd.8.xml:535(para)
 msgid ""
 "This option sets the <option>HOME</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -1781,11 +1879,11 @@
 "这个选择在 <filename>/etc/default/useradd</filename> 中设置 <option>HOME</"
 "option> 选项。"
 
-#: useradd.8.xml:531(para)
+#: useradd.8.xml:547(para)
 msgid "The date on which the user account is disabled."
 msgstr "禁用此用户账户的日期。"
 
-#: useradd.8.xml:532(para)
+#: useradd.8.xml:548(para)
 msgid ""
 "This option sets the <option>EXPIRE</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -1793,13 +1891,13 @@
 "此选项在 <filename>/etc/default/useradd</filename> 中设置 <option>EXPIRE</"
 "option> 变量。"
 
-#: useradd.8.xml:544(para)
+#: useradd.8.xml:560(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
 msgstr "密码过期到账户被禁用之前的天数。"
 
-#: useradd.8.xml:548(para)
+#: useradd.8.xml:564(para)
 msgid ""
 "This option sets the <option>INACTIVE</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -1807,7 +1905,7 @@
 "这个选项在 <filename>/etc/default/useradd</filename> 中设置 "
 "<option>INACTIVE</option> 变量。"
 
-#: useradd.8.xml:560(para)
+#: useradd.8.xml:576(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> "
@@ -1820,7 +1918,7 @@
 "option> 设置为 <replaceable>no</replaceable> 时)。给出的组必须存在，并且数字"
 "组 ID 必须有一个已经存在的项。"
 
-#: useradd.8.xml:569(para)
+#: useradd.8.xml:585(para)
 msgid ""
 "This option sets the <option>GROUP</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -1828,11 +1926,11 @@
 "这个选项在 <filename>/etc/default/useradd</filename> 中设置 <option>GROUP</"
 "option> 变量。"
 
-#: useradd.8.xml:581(para)
+#: useradd.8.xml:597(para)
 msgid "The name of a new user's login shell."
 msgstr "新用户的登录 shell 名。"
 
-#: useradd.8.xml:584(para)
+#: useradd.8.xml:600(para)
 msgid ""
 "This option sets the <option>SHELL</option> variable in <filename>/etc/"
 "default/useradd</filename>."
@@ -1840,11 +1938,11 @@
 "这个选项在 <filename>/etc/default/useradd</filename> 设置 <option>SHELL</"
 "option> 变量。"
 
-#: useradd.8.xml:596(title)
+#: useradd.8.xml:612(title)
 msgid "NOTES"
 msgstr "注意："
 
-#: useradd.8.xml:597(para)
+#: useradd.8.xml:613(para)
 msgid ""
 "The system administrator is responsible for placing the default user files "
 "in the <filename>/etc/skel/</filename> directory (or any other skeleton "
@@ -1854,13 +1952,13 @@
 "系统管理员负责将默认的用户文件放在 <filename>/etc/skel/</filename> 目录中(或"
 "者命令行上、<filename>/etc/default/useradd</filename> 中指定的任何其它目录)。"
 
-#: useradd.8.xml:606(para)
+#: useradd.8.xml:622(para)
 msgid ""
 "You may not add a user to a NIS or LDAP group. This must be performed on the "
 "corresponding server."
 msgstr "您可能不能想 NIS 组或 LDAP 组添加用户。这只能在相应服务器上进行。"
 
-#: useradd.8.xml:611(para)
+#: useradd.8.xml:627(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 "
@@ -1869,7 +1967,7 @@
 "相似地，如果用户名已经存在于外部用户数据库中，比如 NIS 或 LDAP，"
 "<command>useradd</command> 将拒绝创建用户账户的请求。"
 
-#: useradd.8.xml:617(para)
+#: useradd.8.xml:633(para)
 msgid ""
 "Usernames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
@@ -1878,7 +1976,7 @@
 "用户名必须以一个小写字母或下划线开始，跟随小写字符、数字、下划线或连字符的组"
 "合。可以以美元符号结束。用正则表达式表示就是：[a-z_][a-z0-9_-]*[$]?"
 
-#: useradd.8.xml:623(para)
+#: useradd.8.xml:639(para)
 msgid "Usernames may only be up to 32 characters long."
 msgstr "用户名不能超过 32 个字符长。"
 
@@ -2068,77 +2166,77 @@
 "It is also used by <command>pam_umask</command> as the default umask value."
 msgstr "也被 <command>pam_umask</command> 用作默认 umask 值。"
 
-#: useradd.8.xml:682(filename)
+#: useradd.8.xml:698(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
-#: useradd.8.xml:684(para)
+#: useradd.8.xml:700(para)
 msgid "Default values for account creation."
 msgstr "账户创建的默认值。"
 
-#: useradd.8.xml:688(filename)
+#: useradd.8.xml:704(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
-#: useradd.8.xml:690(para)
+#: useradd.8.xml:706(para)
 msgid "Directory containing default files."
 msgstr "包含默认文件的目录。"
 
-#: useradd.8.xml:726(replaceable) shadow.3.xml:35(manvolnum)
-#: pwck.8.xml:294(replaceable) passwd.1.xml:427(replaceable)
-#: grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable)
-#: groupadd.8.xml:262(replaceable)
+#: useradd.8.xml:742(replaceable) shadow.3.xml:39(manvolnum)
+#: pwck.8.xml:298(replaceable) passwd.1.xml:443(replaceable)
+#: grpck.8.xml:250(replaceable) groupmod.8.xml:225(replaceable)
+#: groupadd.8.xml:277(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:728(para) passwd.1.xml:447(para) groupmod.8.xml:201(para)
-#: groupadd.8.xml:264(para)
+#: useradd.8.xml:744(para) passwd.1.xml:463(para) groupmod.8.xml:227(para)
+#: groupadd.8.xml:279(para)
 msgid "invalid argument to option"
 msgstr "给了选项一个无效的参数"
 
-#: useradd.8.xml:732(replaceable) pwck.8.xml:300(replaceable)
-#: passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable)
-#: groupmod.8.xml:205(replaceable) groupadd.8.xml:268(replaceable)
+#: useradd.8.xml:748(replaceable) pwck.8.xml:304(replaceable)
+#: passwd.1.xml:449(replaceable) grpck.8.xml:256(replaceable)
+#: groupmod.8.xml:231(replaceable) groupadd.8.xml:283(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:734(para)
+#: useradd.8.xml:750(para)
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr "UID 已经使用 (且没有 <option>-o</option>)"
 
-#: useradd.8.xml:740(para) groupmod.8.xml:207(para) groupmod.8.xml:213(para)
-#: groupdel.8.xml:126(para)
+#: useradd.8.xml:756(para) groupmod.8.xml:233(para) groupmod.8.xml:239(para)
+#: groupdel.8.xml:159(para)
 msgid "specified group doesn't exist"
 msgstr "指定的组不存在"
 
-#: useradd.8.xml:744(replaceable) groupmod.8.xml:217(replaceable)
-#: groupadd.8.xml:274(replaceable)
+#: useradd.8.xml:760(replaceable) groupmod.8.xml:243(replaceable)
+#: groupadd.8.xml:289(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:746(para)
+#: useradd.8.xml:762(para)
 msgid "username already in use"
 msgstr "用户名已被使用"
 
-#: useradd.8.xml:758(para)
+#: useradd.8.xml:774(para)
 msgid "can't create home directory"
 msgstr "无法创建主目录"
 
-#: useradd.8.xml:762(replaceable)
+#: useradd.8.xml:778(replaceable)
 msgid "13"
 msgstr "13"
 
-#: useradd.8.xml:764(para)
+#: useradd.8.xml:780(para)
 msgid "can't create mail spool"
 msgstr "无法创建邮箱"
 
-#: useradd.8.xml:704(para)
+#: useradd.8.xml:720(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
 msgstr "<command>useradd</command> 可以返回如下值：<placeholder-1/>"
 
-#: useradd.8.xml:773(para)
+#: useradd.8.xml:789(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -2176,36 +2274,36 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
+#: suauth.5.xml:38(refentrytitle) suauth.5.xml:45(refname)
 msgid "suauth"
 msgstr "suauth"
 
-#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
-#: pwck.8.xml:306(replaceable) porttime.5.xml:35(manvolnum)
-#: passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable)
-#: login.defs.5.xml:101(manvolnum) login.access.5.xml:36(manvolnum)
-#: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
-#: grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
+#: suauth.5.xml:39(manvolnum) shadow.5.xml:39(manvolnum)
+#: pwck.8.xml:310(replaceable) porttime.5.xml:39(manvolnum)
+#: passwd.5.xml:39(manvolnum) passwd.1.xml:455(replaceable)
+#: login.defs.5.xml:102(manvolnum) login.access.5.xml:40(manvolnum)
+#: limits.5.xml:40(manvolnum) gshadow.5.xml:38(manvolnum)
+#: grpck.8.xml:262(replaceable) faillog.5.xml:39(manvolnum)
 msgid "5"
 msgstr "5"
 
-#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo)
-#: porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo)
-#: login.defs.5.xml:102(refmiscinfo) login.access.5.xml:37(refmiscinfo)
-#: limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo)
-#: faillog.5.xml:36(refmiscinfo)
+#: suauth.5.xml:40(refmiscinfo) shadow.5.xml:40(refmiscinfo)
+#: porttime.5.xml:40(refmiscinfo) passwd.5.xml:40(refmiscinfo)
+#: login.defs.5.xml:103(refmiscinfo) login.access.5.xml:41(refmiscinfo)
+#: limits.5.xml:41(refmiscinfo) gshadow.5.xml:39(refmiscinfo)
+#: faillog.5.xml:40(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr "文件格式和转化"
 
-#: suauth.5.xml:40(refpurpose)
+#: suauth.5.xml:46(refpurpose)
 msgid "detailed su control file"
 msgstr "详细的 su 控制文件"
 
-#: suauth.5.xml:45(command) suauth.5.xml:171(filename)
+#: suauth.5.xml:51(command) suauth.5.xml:177(filename)
 msgid "/etc/suauth"
 msgstr "/etc/suauth"
 
-#: suauth.5.xml:51(para)
+#: suauth.5.xml:57(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:"
@@ -2214,7 +2312,7 @@
 "行为，规则是："
 
 #. .RS
-#: suauth.5.xml:58(literallayout)
+#: suauth.5.xml:64(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2226,18 +2324,18 @@
 "    "
 
 #. .fi
-#: suauth.5.xml:62(para)
+#: suauth.5.xml:68(para)
 msgid ""
 "2) the user executing the su command (or any groups he might be a member of)"
 msgstr "2) 执行 su 命令的用户 (或者他可能属于的组)"
 
-#: suauth.5.xml:67(para)
+#: suauth.5.xml:73(para)
 msgid ""
 "The file is formatted like this, with lines starting with a # being treated "
 "as comment lines and ignored;"
 msgstr "文件格式为：以 # 开头的行视为注视，并被忽略；"
 
-#: suauth.5.xml:72(literallayout)
+#: suauth.5.xml:78(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2248,16 +2346,21 @@
 "      to-id:from-id:ACTION\n"
 "    "
 
-#: suauth.5.xml:76(para)
+#: suauth.5.xml:82(para)
+#, fuzzy
+#| 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 \",\""
 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 \",\""
+"a list of usernames delimited by \",\"."
 msgstr ""
 "此处的 to-id 可以是：<emphasis>ALL</emphasis>，逗号(,) 分隔的用户名列表或者 "
 "<emphasis>ALL EXCEPT</emphasis> 后跟逗号分隔的用户名列表。"
 
-#: suauth.5.xml:82(para)
+#: suauth.5.xml:88(para)
 #, fuzzy
 msgid ""
 "from-id is formatted the same as to-id except the extra word "
@@ -2274,38 +2377,38 @@
 "<citerefentry><refentrytitle>/etc/group</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry> 中有一个条目。"
 
-#: suauth.5.xml:93(para)
+#: suauth.5.xml:99(para)
 msgid "Action can be one only of the following currently supported options."
 msgstr "动作只可以使用如下当前支持的选项。"
 
-#: suauth.5.xml:99(emphasis)
+#: suauth.5.xml:105(emphasis)
 msgid "DENY"
 msgstr "DENY"
 
-#: suauth.5.xml:102(para)
+#: suauth.5.xml:108(para)
 msgid "The attempt to su is stopped before a password is even asked for."
 msgstr "su 的尝试在询问密码之前就被拒绝。"
 
-#: suauth.5.xml:109(emphasis)
+#: suauth.5.xml:115(emphasis)
 msgid "NOPASS"
 msgstr "NOPASS"
 
-#: suauth.5.xml:112(para)
+#: suauth.5.xml:118(para)
 msgid ""
 "The attempt to su is automatically successful; no password is asked for."
 msgstr "su 尝试自动成功，而且不询问密码。"
 
-#: suauth.5.xml:120(emphasis)
+#: suauth.5.xml:126(emphasis)
 msgid "OWNPASS"
 msgstr "OWNPASS"
 
-#: suauth.5.xml:123(para)
+#: suauth.5.xml:129(para)
 msgid ""
 "For the su command to be successful, the user must enter his or her own "
 "password. They are told this."
 msgstr "为了成功执行 su，用户必须提供自己的密码。将会提示他们这样。"
 
-#: suauth.5.xml:131(para)
+#: suauth.5.xml:137(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 "
@@ -2317,11 +2420,11 @@
 "一行地依次检查，会使用第一个可用的规则，而不会继续检查文件。这可以让系统管理"
 "员使系统尽量符合其期望。"
 
-#: suauth.5.xml:141(title)
+#: suauth.5.xml:147(title)
 msgid "EXAMPLE"
 msgstr "示例"
 
-#: suauth.5.xml:142(literallayout)
+#: suauth.5.xml:148(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2367,11 +2470,11 @@
 "      #\n"
 "    "
 
-#: suauth.5.xml:178(title) pwconv.8.xml:153(title) login.defs.5.xml:488(title)
+#: suauth.5.xml:184(title) pwconv.8.xml:198(title) login.defs.5.xml:491(title)
 msgid "BUGS"
 msgstr "缺陷"
 
-#: suauth.5.xml:179(para)
+#: suauth.5.xml:185(para)
 msgid ""
 "There could be plenty lurking. The file parser is particularly unforgiving "
 "about syntax errors, expecting no spurious whitespace (apart from beginning "
@@ -2380,11 +2483,11 @@
 "可能会有很多潜在问题。文件解析器尤其不能容忍语法错误，不能有无意义的空白符(除"
 "了行首和行尾)，并且使用特定的标记分割不同的事情。"
 
-#: suauth.5.xml:188(title) shadow.3.xml:183(title)
+#: suauth.5.xml:194(title) shadow.3.xml:189(title)
 msgid "DIAGNOSTICS"
 msgstr ""
 
-#: suauth.5.xml:189(para)
+#: suauth.5.xml:195(para)
 msgid ""
 "An error parsing the file is reported using "
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
@@ -2394,7 +2497,7 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry> 作为 AUTH 中的 ERR 级别"
 "报告。"
 
-#: suauth.5.xml:198(para)
+#: suauth.5.xml:204(para)
 msgid ""
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -2402,30 +2505,30 @@
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command)
-#: login.defs.5.xml:418(term)
+#: su.1.xml:55(refentrytitle) su.1.xml:62(refname) su.1.xml:67(command)
+#: login.defs.5.xml:421(term)
 msgid "su"
 msgstr "su"
 
-#: 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:40(refmiscinfo)
+#: su.1.xml:57(refmiscinfo) sg.1.xml:41(refmiscinfo)
+#: passwd.1.xml:47(refmiscinfo) newgrp.1.xml:41(refmiscinfo)
+#: login.1.xml:73(refmiscinfo) groups.1.xml:40(refmiscinfo)
+#: gpasswd.1.xml:45(refmiscinfo) expiry.1.xml:44(refmiscinfo)
+#: chsh.1.xml:43(refmiscinfo) chfn.1.xml:43(refmiscinfo)
+#: chage.1.xml:41(refmiscinfo)
 msgid "User Commands"
 msgstr "用户命令"
 
-#: su.1.xml:60(refpurpose)
+#: su.1.xml:63(refpurpose)
 msgid "change user ID or become superuser"
 msgstr "更改用户 ID 或成为超级用户"
 
-#: su.1.xml:70(replaceable) login.1.xml:85(replaceable)
-#: login.1.xml:93(replaceable)
+#: su.1.xml:73(replaceable) login.1.xml:88(replaceable)
+#: login.1.xml:96(replaceable)
 msgid "username"
 msgstr "用户名"
 
-#: su.1.xml:78(para)
+#: su.1.xml:81(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</"
@@ -2438,7 +2541,7 @@
 "可选的选项 <option>-</option>，可以用于提供一个类似于用户直接登录的环境，用户"
 "可能期望是这样的。"
 
-#: su.1.xml:87(para)
+#: su.1.xml:90(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 "
@@ -2450,7 +2553,7 @@
 "地，参数 <option>-c</option> 将会使下一个参数被多数命令解释器视为命令。这个命"
 "令会被 <filename>/etc/passwd</filename> 中为目标用户指定的 shell 执行。"
 
-#: su.1.xml:96(para)
+#: su.1.xml:99(para)
 msgid ""
 "You can use the <option>--</option> argument to separate <command>su</"
 "command> options from the arguments supplied to the shell."
@@ -2458,7 +2561,7 @@
 "您可以使用 <option>--</option> 参数将 <command>su</command> 选项和提供给 "
 "shell 的参数分隔开来。"
 
-#: su.1.xml:101(para)
+#: su.1.xml:104(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 "
@@ -2467,7 +2570,7 @@
 "如果合适，将提示用户输入一个密码。输入无效的密码会产生一个错误消息。所有的尝"
 "试，无论成功还是失败，都会被记录，以检测对系统的滥用。"
 
-#: su.1.xml:106(para)
+#: su.1.xml:109(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 "
@@ -2481,7 +2584,7 @@
 "usr/sbin:/usr/bin</filename>。这会随 <filename>/etc/login.defs</filename> 中"
 "的 <option>ENV_PATH</option> 和 <option>ENV_SUPATH</option> 值改变。"
 
-#: su.1.xml:115(para) login.1.xml:166(para)
+#: su.1.xml:118(para) login.1.xml:169(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 "
@@ -2490,11 +2593,11 @@
 "在登录 shell 中以第一个字符是“*”标注的是子系统登录。给定的主目录将被用于用户"
 "实际登录的新文件系统的根。"
 
-#: su.1.xml:124(para)
+#: su.1.xml:127(para)
 msgid "The options which apply to the <command>su</command> command are:"
 msgstr "<command>su</command> 命令可以接受的选项有："
 
-#: su.1.xml:128(term)
+#: su.1.xml:131(term)
 msgid ""
 "<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
 "replaceable>"
@@ -2502,23 +2605,29 @@
 "<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
 "replaceable>"
 
-#: su.1.xml:133(para)
+#: su.1.xml:136(para)
 msgid ""
 "Specify a command that will be invoked by the shell using its <option>-c</"
 "option>."
 msgstr "通过使用其 <option>-c</option> 选项，指定一个由 shell 运行的命令。"
 
-#: su.1.xml:140(term)
+#: su.1.xml:140(para)
+msgid ""
+"The executed command will have no controlling terminal. This option cannot "
+"be used to execute interractive programs which need a controlling TTY."
+msgstr ""
+
+#: su.1.xml:150(term)
 msgid "<option>-</option>, <option>-l</option>, <option>--login</option>"
 msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
 
-#: su.1.xml:144(para)
+#: su.1.xml:154(para)
 msgid ""
 "Provide an environment similar to what the user would expect had the user "
 "logged in directly."
 msgstr "提供一个类似于用户直接登录的环境，用户可能会希望这样。"
 
-#: su.1.xml:148(para)
+#: su.1.xml:158(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 "
@@ -2527,15 +2636,15 @@
 "使用了 <option>-</option> 时，它必须是 <command>su</command> 的最后一个参数。"
 "其它形式(<option>-l</option> 和 <option>--login</option>) 没有这个限制。"
 
-#: su.1.xml:162(para)
+#: su.1.xml:172(para)
 msgid "The shell that will be invoked."
 msgstr "将使用的 shell。"
 
-#: su.1.xml:170(para)
+#: su.1.xml:180(para)
 msgid "The shell specified with --shell."
 msgstr "通过 --shell 指定的 shell。"
 
-#: su.1.xml:173(para)
+#: su.1.xml:183(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
@@ -2543,25 +2652,25 @@
 "如果使用了 <option>--preserve-environment</option>，shell 将由 <envar>"
 "$SHELL</envar> 环境变量指定。"
 
-#: su.1.xml:180(para)
+#: su.1.xml:190(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
 msgstr "在 <filename>/etc/passwd</filename> 的相应项中为目标用户指定的 shell。"
 
-#: su.1.xml:186(para)
+#: su.1.xml:196(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
 msgstr ""
 "如果无法通过以上办法找到一个 shell，则使用 <filename>/bin/sh</filename>。"
 
-#: su.1.xml:163(para)
+#: su.1.xml:173(para)
 msgid ""
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr "使用的 shell 在如下中选择(高优先级在前)：<placeholder-1/>"
 
-#: su.1.xml:191(para)
+#: su.1.xml:201(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>/"
@@ -2574,7 +2683,7 @@
 "<option>--shell</option> 选项或 <envar>$SHELL</envar> 环境变量不会带入账户，"
 "除非 <command>su</command> 是被 root 调用的。"
 
-#: su.1.xml:202(term)
+#: su.1.xml:212(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2582,11 +2691,11 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:211(envar)
+#: su.1.xml:221(envar)
 msgid "$PATH"
 msgstr "$PATH"
 
-#: su.1.xml:213(para)
+#: su.1.xml:223(para)
 msgid ""
 "reset according to the <filename>/etc/login.defs</filename> options "
 "<option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
@@ -2594,22 +2703,22 @@
 "根据 <filename>/etc/login.defs</filename> 中的 <option>ENV_PATH</option> or "
 "<option>ENV_SUPATH</option> 选项重设 (请往下看)"
 
-#: su.1.xml:222(envar)
+#: su.1.xml:232(envar)
 msgid "$IFS"
 msgstr "$IFS"
 
-#: su.1.xml:224(para)
+#: su.1.xml:234(para)
 msgid ""
 "reset to <quote><space><tab><newline></quote>, if it was "
 "set."
 msgstr ""
 "如果已经设置了，重设 <quote><space><tab><newline></quote>。"
 
-#: su.1.xml:207(para)
+#: su.1.xml:217(para)
 msgid "Preserve the current environment, except for: <placeholder-1/>"
 msgstr "保留当前环境，除非：<placeholder-1/>"
 
-#: su.1.xml:233(para)
+#: su.1.xml:243(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
@@ -2617,7 +2726,7 @@
 "如果用户的 shell 受限，此选项无效 (除非是 root 调用的 <command>su</"
 "command>)。"
 
-#: su.1.xml:242(para)
+#: su.1.xml:252(para)
 msgid ""
 "The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, "
 "<envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> "
@@ -2627,13 +2736,13 @@
 "<envar>$LOGNAME</envar>, <envar>$PATH</envar>, 和 <envar>$IFS</envar> 这些环"
 "境变量会被重置。"
 
-#: su.1.xml:251(para)
+#: su.1.xml:261(para)
 msgid ""
 "If <option>--login</option> is not used, the environment is copied, except "
 "for the variables above."
 msgstr "如果没有使用 <option>--login</option>，复制环境，上述几个变量除外。"
 
-#: su.1.xml:258(para)
+#: su.1.xml:268(para)
 msgid ""
 "If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>"
 "$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> "
@@ -2643,7 +2752,7 @@
 "$COLORTERM</envar>, <envar>$DISPLAY</envar> 和 <envar>$XAUTHORITY</envar>，这"
 "些环境变量也会被重置。"
 
-#: su.1.xml:268(para)
+#: su.1.xml:278(para)
 msgid ""
 "If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</"
 "envar>, and <envar>$MAIL</envar> environment variables are set according to "
@@ -2656,7 +2765,7 @@
 "filename> 中的选项 <option>ENV_TZ</option>, <option>ENV_HZ</option>, "
 "<option>MAIL_DIR</option> 和 <option>MAIL_FILE</option> 重置 (请看下边)。"
 
-#: su.1.xml:281(para)
+#: su.1.xml:291(para)
 msgid ""
 "If <option>--login</option> is used, other environment variables might be "
 "set by the <option>ENVIRON_FILE</option> file (see below)."
@@ -2664,17 +2773,17 @@
 "如果使用了 <option>--login</option>，其它环境变量可能会根据 "
 "<option>ENVIRON_FILE</option> 文件来设置(请看下边)。"
 
-#: su.1.xml:289(para)
+#: su.1.xml:299(para)
 msgid "Other environments might be set by PAM modules."
 msgstr "其它环境可能由 PAM 模块设置。"
 
-#: su.1.xml:237(para)
+#: su.1.xml:247(para)
 msgid ""
 "Note that the default behavior for the environment is the following: "
 "<placeholder-1/>"
 msgstr "注意，环境的默认行为如下：<placeholder-1/>"
 
-#: su.1.xml:303(para)
+#: su.1.xml:313(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -2723,9 +2832,13 @@
 msgstr "<option>DEFAULT_HOME</option> (boolean)"
 
 #: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+#, fuzzy
+#| msgid ""
+#| "Indicate if login is allowed if we can't cd to the home directory. "
+#| "Default in no."
 msgid ""
 "Indicate if login is allowed if we can't cd to the home directory. Default "
-"in no."
+"is no."
 msgstr "如果不能 cd 到主目录时，说明是否允许登录。默认是不说明。"
 
 #: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
@@ -2842,10 +2955,15 @@
 
 #: 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)
+#, fuzzy
+#| 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."
 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."
+"will not be translated."
 msgstr ""
 "此字符串用于提示输入密码。默认是 \"Password: \"，或者翻译了的结果(汉语中翻译"
 "为了“密码：”)。如果设置了此变量，提示不会被翻译。"
@@ -2878,7 +2996,12 @@
 msgstr "<option>QUOTAS_ENAB</option> (boolean)"
 
 #: 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."
+#, fuzzy
+#| msgid ""
+#| "Enable setting of ulimit, umask, and niceness from passwd gecos field."
+msgid ""
+"Enable setting of resource limits from <filename>/etc/limits</filename> and "
+"ulimit, umask, and niceness from the user's passwd gecos field."
 msgstr "允许在 passwd 的 gecos 字段设置 ulimit、umask 和 niceness。"
 
 #: su.1.xml:32(term) login.defs.5.xml:32(term)
@@ -2930,19 +3053,19 @@
 "sulog file logging."
 msgstr "除了 sulog 文件日志，也为 <command>su</command> 活动启用“syslog”日志。"
 
-#: su.1.xml:363(para)
+#: su.1.xml:373(para)
 msgid ""
 "On success, <command>su</command> returns the exit value of the command it "
 "executed."
 msgstr "成功时，<command>su</command> 返回执行的命令的退出值。"
 
-#: su.1.xml:367(para)
+#: su.1.xml:377(para)
 msgid ""
 "If this command was terminated by a signal, <command>su</command> returns "
 "the number of this signal plus 128."
 msgstr "如果命令被信号结束，<command>su</command> 返回此信号的编号加 128。"
 
-#: su.1.xml:371(para)
+#: su.1.xml:381(para)
 msgid ""
 "If su has to kill the command (because it was asked to terminate, and the "
 "command did not terminate in time), <command>su</command> returns 255."
@@ -2950,37 +3073,37 @@
 "如果 su 必须要杀死此命令(因为已经要求它结束，可是却没有及时结束)，"
 "<command>su</command> 返回 255。"
 
-#: su.1.xml:383(para)
+#: su.1.xml:393(para)
 msgid "success (<option>--help</option> only)"
 msgstr "成功 (只有 <option>--help</option>)"
 
-#: su.1.xml:389(para)
+#: su.1.xml:399(para)
 msgid "System or authentication failure"
 msgstr "系统或者认证失败"
 
-#: su.1.xml:393(replaceable)
+#: su.1.xml:403(replaceable)
 msgid "126"
 msgstr "126"
 
-#: su.1.xml:395(para)
+#: su.1.xml:405(para)
 msgid "The requested command was not found"
 msgstr "要求的命令不存在"
 
-#: su.1.xml:399(replaceable)
+#: su.1.xml:409(replaceable)
 msgid "127"
 msgstr "127"
 
-#: su.1.xml:401(para)
+#: su.1.xml:411(para)
 msgid "The requested command could not be executed"
 msgstr "请求的命令不能执行"
 
-#: su.1.xml:376(para)
+#: su.1.xml:386(para)
 msgid ""
 "Some exit values from <command>su</command> are independent from the "
 "executed command: <placeholder-1/>"
 msgstr "<command>su</command> 中的某些退出值与执行的命令无关：<placeholder-1/>"
 
-#: su.1.xml:410(para)
+#: su.1.xml:420(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -2996,27 +3119,27 @@
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>."
 
-#: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command)
+#: sg.1.xml:39(refentrytitle) sg.1.xml:46(refname) sg.1.xml:52(command)
 msgid "sg"
 msgstr "sg"
 
-#: sg.1.xml:44(refpurpose)
+#: sg.1.xml:47(refpurpose)
 msgid "execute command as different group ID"
 msgstr "以不同的组 ID 执行命令"
 
-#: sg.1.xml:50(arg) newgrp.1.xml:49(arg)
+#: sg.1.xml:53(arg) newgrp.1.xml:52(arg)
 msgid "-"
 msgstr "-"
 
-#: sg.1.xml:52(arg) expiry.1.xml:53(arg)
+#: sg.1.xml:55(arg)
 msgid "-c"
 msgstr "-c"
 
-#: sg.1.xml:51(arg)
+#: sg.1.xml:54(arg)
 msgid "group <placeholder-1/> command"
 msgstr "组 <placeholder-1/> 命令"
 
-#: sg.1.xml:60(para)
+#: sg.1.xml:63(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/"
@@ -3044,7 +3167,7 @@
 msgid "Enable \"syslog\" logging of <command>sg</command> activity."
 msgstr "允许“syslog”记录 <command>sg</command> 的活动。"
 
-#: sg.1.xml:119(para)
+#: sg.1.xml:122(para)
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -3070,18 +3193,17 @@
 "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry></phrase>."
 
-#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
-#: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
-#: pwck.8.xml:63(replaceable) pwck.8.xml:78(replaceable)
-#: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
+#: shadow.5.xml:38(refentrytitle) shadow.5.xml:45(refname)
+#: shadow.3.xml:38(refentrytitle) shadow.3.xml:45(refname)
+#: pwck.8.xml:65(replaceable) grpck.8.xml:57(replaceable)
 msgid "shadow"
 msgstr "shadow"
 
-#: shadow.5.xml:40(refpurpose)
+#: shadow.5.xml:46(refpurpose)
 msgid "shadowed password file"
 msgstr "影子化了的密码文件"
 
-#: shadow.5.xml:45(para)
+#: shadow.5.xml:51(para)
 msgid ""
 "<filename>shadow</filename> is a file which contains the password "
 "information for the system's accounts and optional aging information."
@@ -3089,32 +3211,32 @@
 "<filename>shadow</filename> 是一个文件，它包含系统账户的密码信息和可选的年龄"
 "信息。"
 
-#: shadow.5.xml:51(para) gshadow.5.xml:49(para)
+#: shadow.5.xml:57(para) gshadow.5.xml:55(para)
 msgid ""
 "This file must not be readable by regular users if password security is to "
 "be maintained."
 msgstr "如果没有维护好密码安全，此文件绝对不能让普通用户可读。"
 
-#: shadow.5.xml:56(para)
+#: shadow.5.xml:62(para)
 msgid ""
 "Each line of this file contains 9 fields, separated by colons (<quote>:</"
 "quote>), in the following order:"
 msgstr ""
 "此文件的每行包括 9 个字段，使用半角冒号 (<quote>:</quote>) 分隔，顺序如下："
 
-#: shadow.5.xml:63(emphasis) passwd.5.xml:53(para)
+#: shadow.5.xml:69(emphasis) passwd.5.xml:59(para)
 msgid "login name"
 msgstr "登录名"
 
-#: shadow.5.xml:65(para)
+#: shadow.5.xml:71(para)
 msgid "It must be a valid account name, which exist on the system."
 msgstr "必须是有效的账户名，且已经存在于系统中。"
 
-#: shadow.5.xml:71(emphasis) gshadow.5.xml:68(emphasis)
+#: shadow.5.xml:77(emphasis) gshadow.5.xml:74(emphasis)
 msgid "encrypted password"
 msgstr "加密了的密码"
 
-#: shadow.5.xml:73(para) gshadow.5.xml:70(para)
+#: shadow.5.xml:79(para) gshadow.5.xml:76(para)
 msgid ""
 "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry> for details on how this string is interpreted."
@@ -3122,7 +3244,7 @@
 "请参考 <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry> 来了解关于解析此字符串的细节信息。"
 
-#: shadow.5.xml:78(para)
+#: shadow.5.xml:84(para)
 msgid ""
 "If the password field contains some string that is not a valid result of "
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
@@ -3133,7 +3255,7 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> 合法结果的字符，比如 ! "
 "或 *，用户将无法使用 unix 密码登录(但是可以通过其它方法登录系统)。"
 
-#: shadow.5.xml:85(para)
+#: shadow.5.xml:91(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 "
@@ -3144,7 +3266,7 @@
 "<filename>/etc/shadow</filename> 文件的应用程序，在密码字段为空时，可能决定禁"
 "止任何访问。"
 
-#: shadow.5.xml:92(para) gshadow.5.xml:92(para)
+#: shadow.5.xml:98(para) gshadow.5.xml:98(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 "
@@ -3152,58 +3274,58 @@
 msgstr ""
 "以叹号开始的密码字段意味着密码被锁定。该行的剩余字符表示锁定之前的密码。"
 
-#: shadow.5.xml:102(emphasis)
+#: shadow.5.xml:108(emphasis)
 msgid "date of last password change"
 msgstr "最后一次更改密码的日期"
 
-#: shadow.5.xml:105(para)
+#: shadow.5.xml:111(para)
 msgid ""
 "The date of the last password change, expressed as the number of days since "
 "Jan 1, 1970."
 msgstr "最近一次更改密码的时间，表示从1970年1月1日开始的天数。"
 
-#: shadow.5.xml:109(para)
+#: shadow.5.xml:115(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 "0 有特殊意思，表示用户应该在下次登录系统时更改密码。"
 
-#: shadow.5.xml:114(para)
+#: shadow.5.xml:120(para)
 msgid "An empty field means that password aging features are disabled."
 msgstr "空字段表示密码年龄功能被禁用。"
 
-#: shadow.5.xml:121(emphasis)
+#: shadow.5.xml:127(emphasis)
 msgid "minimum password age"
 msgstr "密码的最小年龄"
 
-#: shadow.5.xml:123(para)
+#: shadow.5.xml:129(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)
+#: shadow.5.xml:134(para)
 msgid "An empty field and value 0 mean that there are no minimum password age."
 msgstr "空字段或 0 表示没有最小密码年龄。"
 
-#: shadow.5.xml:135(emphasis)
+#: shadow.5.xml:141(emphasis)
 msgid "maximum password age"
 msgstr "最大密码年龄"
 
-#: shadow.5.xml:137(para)
+#: shadow.5.xml:143(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)
+#: shadow.5.xml:147(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)
+#: shadow.5.xml:152(para)
 msgid ""
 "An empty field means that there are no maximum password age, no password "
 "warning period, and no password inactivity period (see below)."
@@ -3211,32 +3333,32 @@
 "空字段表示没有最大密码年龄，没有密码警告时间段，没有密码禁用时间段(请看下"
 "边)。"
 
-#: shadow.5.xml:151(para)
+#: shadow.5.xml:157(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)
+#: shadow.5.xml:165(emphasis)
 msgid "password warning period"
 msgstr "密码警告时间段"
 
-#: shadow.5.xml:162(para)
+#: shadow.5.xml:168(para)
 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 "密码过期之前，提前警告用户的的天数(请参考上边的密码的最大年龄)。"
 
-#: shadow.5.xml:167(para)
+#: shadow.5.xml:173(para)
 msgid ""
 "An empty field and value 0 mean that there are no password warning period."
 msgstr "空字段或者 0 表示没有密码警告期。"
 
-#: shadow.5.xml:175(emphasis)
+#: shadow.5.xml:181(emphasis)
 msgid "password inactivity period"
 msgstr "密码禁用期"
 
-#: shadow.5.xml:178(para)
+#: shadow.5.xml:184(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 "
@@ -3245,7 +3367,7 @@
 "密码过期(查看上边的密码最大年龄)后，仍然接受此密码的天数(在此期间，用户应该在"
 "下次登录时修改密码)。"
 
-#: shadow.5.xml:184(para)
+#: shadow.5.xml:190(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 "
@@ -3254,22 +3376,22 @@
 "密码到期并且过了这个宽限期之后，使用用户的当前的密码将会不能登录。用户需要联"
 "系系统管理员。"
 
-#: shadow.5.xml:189(para)
+#: shadow.5.xml:195(para)
 msgid ""
 "An empty field means that there are no enforcement of an inactivity period."
 msgstr "空字段表示没有强制密码过期。"
 
-#: shadow.5.xml:197(emphasis)
+#: shadow.5.xml:203(emphasis)
 msgid "account expiration date"
 msgstr "账户过期日期"
 
-#: shadow.5.xml:200(para)
+#: shadow.5.xml:206(para)
 msgid ""
 "The date of expiration of the account, expressed as the number of days since "
 "Jan 1, 1970."
 msgstr "账户过期的日期，表示从1970年1月1日开始的天数。"
 
-#: shadow.5.xml:204(para)
+#: shadow.5.xml:210(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 "
@@ -3278,40 +3400,40 @@
 "注意，账户过期不同于密码过期。账户过期时，用户将不被允许登录；密码过期时，用"
 "户将不被允许使用其密码登录。"
 
-#: shadow.5.xml:210(para)
+#: shadow.5.xml:216(para)
 msgid "An empty field means that the account will never expire."
 msgstr "空字段表示账户永不过期。"
 
-#: shadow.5.xml:213(para)
+#: shadow.5.xml:219(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 "应该避免使用 0，因为它既能理解成永不过期也能理解成在1970年1月1日过期。"
 
-#: shadow.5.xml:221(emphasis)
+#: shadow.5.xml:227(emphasis)
 msgid "reserved field"
 msgstr "保留字段"
 
-#: shadow.5.xml:223(para)
+#: shadow.5.xml:229(para)
 msgid "This field is reserved for future use."
 msgstr "此字段保留作将来使用。"
 
-#: shadow.5.xml:245(filename)
+#: shadow.5.xml:251(filename)
 msgid "/etc/shadow-"
 msgstr "/etc/shadow-"
 
-#: shadow.5.xml:247(para)
+#: shadow.5.xml:253(para)
 msgid "Backup file for /etc/shadow."
 msgstr "/etc/shadow 的备份文件。"
 
-#: shadow.5.xml:248(para) passwd.5.xml:134(para)
+#: shadow.5.xml:254(para) passwd.5.xml:140(para)
 msgid ""
 "Note that this file is used by the tools of the shadow toolsuite, but not by "
 "all user and password management tools."
 msgstr ""
 "注意，此文件由 shadow 工具集使用，而不是所有的用户和密码管理工具都会使用。"
 
-#: shadow.5.xml:259(para)
+#: shadow.5.xml:265(para)
 msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -3343,88 +3465,88 @@
 "<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: shadow.3.xml:36(refmiscinfo)
+#: shadow.3.xml:40(refmiscinfo)
 msgid "Library Calls"
 msgstr "库函数调用"
 
-#: shadow.3.xml:40(refname)
+#: shadow.3.xml:46(refname)
 msgid "getspnam"
 msgstr "getspnam"
 
-#: shadow.3.xml:41(refpurpose)
+#: shadow.3.xml:47(refpurpose)
 msgid "encrypted password file routines"
 msgstr "加密密码文件工具函数"
 
-#: shadow.3.xml:45(title)
+#: shadow.3.xml:51(title)
 msgid "SYNTAX"
 msgstr "SYNTAX"
 
-#: shadow.3.xml:47(emphasis)
+#: shadow.3.xml:53(emphasis)
 msgid "#include <shadow.h>"
 msgstr "#include <shadow.h>"
 
-#: shadow.3.xml:51(emphasis)
+#: shadow.3.xml:57(emphasis)
 msgid "struct spwd *getspent();"
 msgstr "struct spwd *getspent();"
 
-#: shadow.3.xml:55(emphasis)
+#: shadow.3.xml:61(emphasis)
 msgid "struct spwd *getspnam(char"
 msgstr "struct spwd *getspnam(char"
 
-#: shadow.3.xml:56(emphasis)
+#: shadow.3.xml:62(emphasis)
 msgid "*name"
 msgstr "*name"
 
-#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis)
-#: shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:62(emphasis) shadow.3.xml:75(emphasis)
+#: shadow.3.xml:80(emphasis) shadow.3.xml:86(emphasis)
 msgid ");"
 msgstr ");"
 
-#: shadow.3.xml:60(emphasis)
+#: shadow.3.xml:66(emphasis)
 msgid "void setspent();"
 msgstr "void setspent();"
 
-#: shadow.3.xml:64(emphasis)
+#: shadow.3.xml:70(emphasis)
 msgid "void endspent();"
 msgstr "void endspent();"
 
-#: shadow.3.xml:68(emphasis)
+#: shadow.3.xml:74(emphasis)
 msgid "struct spwd *fgetspent(FILE"
 msgstr "struct spwd *fgetspent(FILE"
 
-#: shadow.3.xml:69(emphasis) shadow.3.xml:80(emphasis)
+#: shadow.3.xml:75(emphasis) shadow.3.xml:86(emphasis)
 msgid "*fp"
 msgstr "*fp"
 
-#: shadow.3.xml:73(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "struct spwd *sgetspent(char"
 msgstr "struct spwd *sgetspent(char"
 
-#: shadow.3.xml:74(emphasis)
+#: shadow.3.xml:80(emphasis)
 msgid "*cp"
 msgstr "*cp"
 
-#: shadow.3.xml:78(emphasis)
+#: shadow.3.xml:84(emphasis)
 msgid "int putspent(struct spwd"
 msgstr "int putspent(struct spwd"
 
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "*p,"
 msgstr "*p,"
 
-#: shadow.3.xml:79(emphasis)
+#: shadow.3.xml:85(emphasis)
 msgid "FILE"
 msgstr "FILE"
 
-#: shadow.3.xml:84(emphasis)
+#: shadow.3.xml:90(emphasis)
 msgid "int lckpwdf();"
 msgstr "int lckpwdf();"
 
-#: shadow.3.xml:88(emphasis)
+#: shadow.3.xml:94(emphasis)
 msgid "int ulckpwdf();"
 msgstr "int ulckpwdf();"
 
-#: shadow.3.xml:94(para)
+#: shadow.3.xml:100(para)
 msgid ""
 "<emphasis remap=\"I\">shadow</emphasis> manipulates the contents of the "
 "shadow password file, <filename>/etc/shadow</filename>. The structure in the "
@@ -3434,7 +3556,7 @@
 "shadow</filename> 的内容。<emphasis remap=\"I\">#include</emphasis> 文件中的"
 "结构是："
 
-#: shadow.3.xml:99(programlisting)
+#: shadow.3.xml:105(programlisting)
 #, no-wrap
 msgid ""
 "struct spwd {\n"
@@ -3451,51 +3573,51 @@
 "    "
 msgstr ""
 
-#: shadow.3.xml:111(para)
+#: shadow.3.xml:117(para)
 msgid "The meanings of each field are:"
 msgstr "每个字段的含义是："
 
-#: shadow.3.xml:114(para)
+#: shadow.3.xml:120(para)
 msgid "sp_namp - pointer to null-terminated user name"
 msgstr "sp_namp - 指向以 null 结束的用户名的指针"
 
-#: shadow.3.xml:117(para)
+#: shadow.3.xml:123(para)
 msgid "sp_pwdp - pointer to null-terminated password"
 msgstr "sp_pwdp - 指向 null 结束的密码的指针"
 
-#: shadow.3.xml:120(para)
+#: shadow.3.xml:126(para)
 msgid "sp_lstchg - days since Jan 1, 1970 password was last changed"
 msgstr ""
 
-#: shadow.3.xml:123(para)
+#: shadow.3.xml:129(para)
 msgid "sp_min - days before which password may not be changed"
 msgstr ""
 
-#: shadow.3.xml:126(para)
+#: shadow.3.xml:132(para)
 msgid "sp_max - days after which password must be changed"
 msgstr ""
 
-#: shadow.3.xml:129(para)
+#: shadow.3.xml:135(para)
 msgid ""
 "sp_warn - days before password is to expire that user is warned of pending "
 "password expiration"
 msgstr ""
 
-#: shadow.3.xml:134(para)
+#: shadow.3.xml:140(para)
 msgid ""
 "sp_inact - days after password expires that account is considered inactive "
 "and disabled"
 msgstr ""
 
-#: shadow.3.xml:139(para)
+#: shadow.3.xml:145(para)
 msgid "sp_expire - days since Jan 1, 1970 when account will be disabled"
 msgstr ""
 
-#: shadow.3.xml:142(para)
+#: shadow.3.xml:148(para)
 msgid "sp_flag - reserved for future use"
 msgstr ""
 
-#: shadow.3.xml:150(para)
+#: shadow.3.xml:156(para)
 msgid ""
 "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, "
 "<emphasis>fgetspent</emphasis>, and <emphasis>sgetspent</emphasis> each "
@@ -3508,7 +3630,7 @@
 "the file for an entry matching <emphasis>name</emphasis>."
 msgstr ""
 
-#: shadow.3.xml:163(para)
+#: shadow.3.xml:169(para)
 msgid ""
 "<emphasis>setspent</emphasis> and <emphasis>endspent</emphasis> may be used "
 "to begin and end, respectively, access to the shadow password file."
@@ -3516,7 +3638,7 @@
 "<emphasis>setspent</emphasis> 和 <emphasis>endspent</emphasis> 分别用来开始和"
 "结束对影子密码文件的访问。"
 
-#: shadow.3.xml:169(para)
+#: shadow.3.xml:175(para)
 msgid ""
 "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines "
 "should be used to insure exclusive access to the <filename>/etc/shadow</"
@@ -3534,7 +3656,7 @@
 "第二把锁。总计 15 秒之后，无论哪个失败，<emphasis>lckpwdf</emphasis> 都返回 "
 "-1。两把锁都获取成功时，返回 0。"
 
-#: shadow.3.xml:184(para)
+#: shadow.3.xml:190(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 "
@@ -3543,13 +3665,13 @@
 "如果没有更多条目了或者处理时出错，此函数返回 NULL。使用 <emphasis>int</"
 "emphasis> 类型返回值的函数返回 0 表示成功，-1 表示失败。"
 
-#: shadow.3.xml:194(para)
+#: shadow.3.xml:200(para)
 msgid ""
 "These routines may only be used by the superuser as access to the shadow "
 "password file is restricted."
 msgstr "这些函数只能由超级用户使用，因为对影子密码文件的访问是受限的。"
 
-#: shadow.3.xml:214(para)
+#: shadow.3.xml:220(para)
 msgid ""
 "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -3559,31 +3681,31 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: pwconv.8.xml:43(refentrytitle) pwconv.8.xml:48(refname)
-#: pwconv.8.xml:57(command) login.defs.5.xml:401(term)
+#: pwconv.8.xml:44(refentrytitle) pwconv.8.xml:51(refname)
+#: pwconv.8.xml:60(command) login.defs.5.xml:404(term)
 msgid "pwconv"
 msgstr "pwconv"
 
-#: pwconv.8.xml:49(refname) pwconv.8.xml:60(command)
-#: login.defs.5.xml:410(term)
+#: pwconv.8.xml:52(refname) pwconv.8.xml:66(command)
+#: login.defs.5.xml:413(term)
 msgid "pwunconv"
 msgstr "pwunconv"
 
-#: pwconv.8.xml:50(refname) pwconv.8.xml:63(command)
-#: login.defs.5.xml:314(term)
+#: pwconv.8.xml:53(refname) pwconv.8.xml:72(command)
+#: login.defs.5.xml:317(term)
 msgid "grpconv"
 msgstr "grpconv"
 
-#: pwconv.8.xml:51(refname) pwconv.8.xml:66(command)
-#: login.defs.5.xml:320(term)
+#: pwconv.8.xml:54(refname) pwconv.8.xml:78(command)
+#: login.defs.5.xml:323(term)
 msgid "grpunconv"
 msgstr "grpunconv"
 
-#: pwconv.8.xml:52(refpurpose)
+#: pwconv.8.xml:55(refpurpose)
 msgid "convert to and from shadow passwords and groups"
 msgstr "在影子密码和组以及其它直接转换"
 
-#: pwconv.8.xml:72(para)
+#: pwconv.8.xml:87(para)
 msgid ""
 "The <command>pwconv</command> command creates <emphasis remap=\"I\">shadow</"
 "emphasis> from <emphasis remap=\"I\">passwd</emphasis> and an optionally "
@@ -3593,7 +3715,7 @@
 "及可选并已经存在的 <emphasis remap=\"I\">shadow</emphasis> 来创建 <emphasis "
 "remap=\"I\">shadow</emphasis>。"
 
-#: pwconv.8.xml:77(para)
+#: pwconv.8.xml:92(para)
 msgid ""
 "<command>pwconv</command> does not work with <option>USE_TCB</option> "
 "enabled. To convert to tcb passwords, you should first use <command>pwconv</"
@@ -3608,7 +3730,7 @@
 "后再使用 <command>tcb_convert</command> 转换到 tcb 密码(并且在 "
 "<filename>login.defs</filename> 中重新启用 <option>USE_TCB</option>)。"
 
-#: pwconv.8.xml:87(para)
+#: pwconv.8.xml:102(para)
 msgid ""
 "The <command>pwunconv</command> command creates <emphasis remap=\"I"
 "\">passwd</emphasis> from <emphasis remap=\"I\">passwd</emphasis> and "
@@ -3619,7 +3741,7 @@
 "和 <emphasis remap=\"I\">shadow</emphasis> 来创建 <emphasis remap=\"I"
 "\">passwd</emphasis>，然后移除 <emphasis remap=\"I\">shadow</emphasis>。"
 
-#: pwconv.8.xml:93(para)
+#: pwconv.8.xml:108(para)
 msgid ""
 "<command>pwunconv</command> does not work with <option>USE_TCB</option> "
 "enabled. You should first switch back from tcb to shadowed passwords using "
@@ -3631,7 +3753,7 @@
 "<command>pwunconv</command> 在 <filename>login.defs</filename> 中禁用 "
 "<option>USE_TCB</option>。"
 
-#: pwconv.8.xml:102(para)
+#: pwconv.8.xml:117(para)
 msgid ""
 "The <command>grpconv</command> command creates <emphasis remap=\"I"
 "\">gshadow</emphasis> from <emphasis remap=\"I\">group</emphasis> and an "
@@ -3641,7 +3763,7 @@
 "在的 <emphasis remap=\"I\">gshadow</emphasis> 创建 <emphasis remap=\"I"
 "\">gshadow</emphasis>。"
 
-#: pwconv.8.xml:108(para)
+#: pwconv.8.xml:123(para)
 msgid ""
 "The <command>grpunconv</command> command creates <emphasis remap=\"I"
 "\">group</emphasis> from <emphasis remap=\"I\">group</emphasis> and "
@@ -3652,7 +3774,7 @@
 "和 <emphasis remap=\"I\">gshadow</emphasis> 创建 <emphasis remap=\"I"
 "\">group</emphasis>，然后移除 <emphasis remap=\"I\">gshadow</emphasis>。"
 
-#: pwconv.8.xml:115(para)
+#: pwconv.8.xml:130(para)
 msgid ""
 "These four programs all operate on the normal and shadow password and group "
 "files: <filename>/etc/passwd</filename>, <filename>/etc/group</filename>, "
@@ -3662,7 +3784,7 @@
 "filename>, <filename>/etc/group</filename>, <filename>/etc/shadow</filename> "
 "和 <filename>/etc/gshadow</filename>。"
 
-#: pwconv.8.xml:122(para)
+#: pwconv.8.xml:137(para)
 msgid ""
 "Each program acquires the necessary locks before conversion. "
 "<command>pwconv</command> and <command>grpconv</command> are similar. First, "
@@ -3679,7 +3801,7 @@
 "的条目；最后，将主文件中的密码替换为“x”。这两个工具可以用于初始转换以及根据手"
 "动编辑的主文件更新影子文件。"
 
-#: pwconv.8.xml:133(para)
+#: pwconv.8.xml:148(para)
 msgid ""
 "<command>pwconv</command> will use the values of <emphasis remap=\"I"
 "\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis>, "
@@ -3691,7 +3813,7 @@
 "\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis> "
 "和 <emphasis remap=\"I\">PASS_WARN_AGE</emphasis> 值。"
 
-#: pwconv.8.xml:142(para)
+#: pwconv.8.xml:157(para)
 msgid ""
 "Likewise <command>pwunconv</command> and <command>grpunconv</command> are "
 "similar. Passwords in the main file are updated from the shadowed file. "
@@ -3705,8 +3827,20 @@
 "最后，移除影子文件。一些密码年龄信息会因为 <command>pwunconv</command> 而丢"
 "失。它只转换它可以转换的。"
 
-#: pwconv.8.xml:154(para)
+#: pwconv.8.xml:169(para)
+#, fuzzy
+#| msgid ""
+#| "The options which apply to the <command>vipw</command> and <command>vigr</"
+#| "command> commands are:"
 msgid ""
+"The options which apply to the <command>pwconv</command>, <command>pwunconv</"
+"command>, <command>grpconv</command>, and <command>grpunconv</command> "
+"commands are:"
+msgstr ""
+"<command>vipw</command> 和 <command>vigr</command> 命令可以接受的选项有："
+
+#: pwconv.8.xml:199(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. "
 "Please run <command>pwck</command> and <command>grpck</command> to correct "
@@ -3716,7 +3850,7 @@
 "以奇怪的方式失败。在转换自，或转换到影子密码或组文件前，请运行 "
 "<command>pwck</command> 和 <command>grpck</command> 来修正此类错误。"
 
-#: pwconv.8.xml:165(para)
+#: pwconv.8.xml:210(para)
 msgid ""
 "The following configuration variable in <filename>/etc/login.defs</filename> "
 "changes the behavior of <command>grpconv</command> and <command>grpunconv</"
@@ -3725,7 +3859,7 @@
 "<filename>/etc/login.defs</filename> 中的如下配置变量改变 <command>grpconv</"
 "command> 和 <command>grpunconv</command> 的行为："
 
-#: pwconv.8.xml:173(para)
+#: pwconv.8.xml:218(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of <command>pwconv</command>:"
@@ -3733,7 +3867,7 @@
 "<filename>/etc/login.defs</filename> 中的如下配置变量改变 <command>pwconv</"
 "command> 的行为："
 
-#: pwconv.8.xml:200(para)
+#: pwconv.8.xml:245(para)
 msgid ""
 "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -3753,37 +3887,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>tcb_unconvert</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry></phrase>."
 
-#: pwck.8.xml:43(refentrytitle) pwck.8.xml:48(refname) pwck.8.xml:54(command)
-#: pwck.8.xml:69(command) login.defs.5.xml:392(term)
+#: pwck.8.xml:44(refentrytitle) pwck.8.xml:51(refname) pwck.8.xml:57(command)
+#: login.defs.5.xml:395(term)
 msgid "pwck"
 msgstr "pwck"
 
-#: pwck.8.xml:49(refpurpose)
+#: pwck.8.xml:52(refpurpose)
 msgid "verify integrity of password files"
 msgstr "检查密码文件的完整性"
 
-#: pwck.8.xml:55(arg) pwck.8.xml:70(arg) pwck.8.xml:177(option)
-msgid "-q"
-msgstr "-q"
-
-#: pwck.8.xml:56(arg) pwck.8.xml:198(option) grpck.8.xml:58(arg)
-#: grpck.8.xml:149(option)
-msgid "-s"
-msgstr "-s"
-
-#: pwck.8.xml:59(replaceable) pwck.8.xml:74(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:381(term)
+#: pwck.8.xml:61(replaceable) passwd.5.xml:38(refentrytitle)
+#: passwd.5.xml:45(refname) passwd.1.xml:45(refentrytitle)
+#: passwd.1.xml:52(refname) passwd.1.xml:58(command)
+#: login.defs.5.xml:384(term)
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:71(arg) pwck.8.xml:188(option) login.1.xml:222(option)
-#: grpck.8.xml:49(arg) grpck.8.xml:139(option)
-msgid "-r"
-msgstr "-r"
-
-#: pwck.8.xml:87(para)
+#: pwck.8.xml:74(para)
 msgid ""
 "The <command>pwck</command> command verifies the integrity of the users and "
 "authentication information. It checks that all entries in <filename>/etc/"
@@ -3799,35 +3919,35 @@
 "filename> 中的文件)</phrase> 格式正确、数据有效。将会提示用户删除格式不正确或"
 "者有其它错误的项。"
 
-#: pwck.8.xml:99(para) grpck.8.xml:80(para)
+#: pwck.8.xml:86(para) grpck.8.xml:75(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr "检查的项目有："
 
-#: pwck.8.xml:102(para) grpck.8.xml:84(para)
+#: pwck.8.xml:89(para) grpck.8.xml:79(para)
 msgid "the correct number of fields"
 msgstr "正确的字段数"
 
-#: pwck.8.xml:105(para)
+#: pwck.8.xml:92(para)
 msgid "a unique and valid user name"
 msgstr "一个唯一且有效的用户名"
 
-#: pwck.8.xml:108(para)
+#: pwck.8.xml:95(para)
 msgid "a valid user and group identifier"
 msgstr "一个有效的用户和组标识符"
 
-#: pwck.8.xml:111(para)
+#: pwck.8.xml:98(para)
 msgid "a valid primary group"
 msgstr "有效的主组"
 
-#: pwck.8.xml:114(para)
+#: pwck.8.xml:101(para)
 msgid "a valid home directory"
 msgstr "有效的主目录"
 
-#: pwck.8.xml:117(para)
+#: pwck.8.xml:104(para)
 msgid "a valid login shell"
 msgstr "有效的登录 shell"
 
-#: pwck.8.xml:121(para)
+#: pwck.8.xml:108(para)
 msgid ""
 "<filename>shadow</filename> checks are enabled when a second file parameter "
 "is specified or when <filename>/etc/shadow</filename> exists on the system."
@@ -3835,33 +3955,33 @@
 "当指定第二个文件参数或 <filename>/etc/shadow</filename> 在系统中存在时，启用 "
 "<filename>shadow</filename> 检查。"
 
-#: pwck.8.xml:126(para)
+#: pwck.8.xml:113(para)
 msgid "These checks are the following:"
 msgstr "这些检查是："
 
-#: pwck.8.xml:131(para)
+#: pwck.8.xml:118(para)
 msgid ""
 "every passwd entry has a matching shadow entry, and every shadow entry has a "
 "matching passwd entry"
 msgstr "每个密码项都有对应的影子相，反之亦然。"
 
-#: pwck.8.xml:137(para)
+#: pwck.8.xml:124(para)
 msgid "passwords are specified in the shadowed file"
 msgstr "密码在影子化了的文件中指定"
 
-#: pwck.8.xml:140(para)
+#: pwck.8.xml:127(para)
 msgid "shadow entries have the correct number of fields"
 msgstr "影子项有正确的字段数。"
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:130(para)
 msgid "shadow entries are unique in shadow"
 msgstr "影子项在影子文件中是唯一的"
 
-#: pwck.8.xml:146(para)
+#: pwck.8.xml:133(para)
 msgid "the last password changes are not in the future"
 msgstr "最后一次的密码更改时间不是被设成了一个将来的时间。"
 
-#: pwck.8.xml:150(para)
+#: pwck.8.xml:137(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 "
@@ -3872,7 +3992,7 @@
 "<command>usermod</command> command to correct the error."
 msgstr ""
 
-#: pwck.8.xml:161(para)
+#: pwck.8.xml:148(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> "
@@ -3881,21 +4001,43 @@
 "操作 <filename>/etc/passwd</filename> 文件的这些命令不能警告损坏或重复的条"
 "目，这些情况下，应该使用 <command>pwck</command> 来移除这写有问题的条目。"
 
-#: pwck.8.xml:171(para)
+#: pwck.8.xml:158(para) grpck.8.xml:129(para)
+#, fuzzy
+#| msgid ""
+#| "Except for the <option>-A</option> and <option>-M</option> options, the "
+#| "options cannot be combined."
+msgid ""
+"The <option>-r</option> and <option>-s</option> options cannot be combined."
+msgstr ""
+"除了 <option>-A</option> 和 <option>-M</option> 选项，其它选项不能联合使用。"
+
+#: pwck.8.xml:162(para)
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr "<command>pwck</command> 选项可以接受的选项有："
 
-#: pwck.8.xml:180(para)
+#: pwck.8.xml:175(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
 msgstr "只报告错误。不显示那些不需要用户操作的警告。"
 
-#: pwck.8.xml:191(para)
+#: pwck.8.xml:182(term) grpck.8.xml:144(term)
+#, fuzzy
+#| msgid "<option>-r</option>, <option>--remove</option>"
+msgid "<option>-r</option>, <option>--read-only</option>"
+msgstr "<option>-r</option>, <option>--remove</option>"
+
+#: pwck.8.xml:184(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr "在只读模式下执行 <command>pwck</command>。"
 
-#: pwck.8.xml:201(para)
+#: pwck.8.xml:203(term) grpck.8.xml:167(term)
+#, fuzzy
+#| msgid "<option>-s</option>, <option>--shadow</option>"
+msgid "<option>-s</option>, <option>--sort</option>"
+msgstr "<option>-s</option>, <option>--shadow</option>"
+
+#: pwck.8.xml:205(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
@@ -3903,11 +4045,11 @@
 "根据 UID 在 <filename>/etc/passwd</filename> 和 <filename>/etc/shadow</"
 "filename> 对项目进行排序。"
 
-#: pwck.8.xml:205(para)
+#: pwck.8.xml:209(para)
 msgid "This option has no effect when <option>USE_TCB</option> is enabled."
 msgstr "启用 <option>USE_TCB</option> 是，本选项无效。"
 
-#: pwck.8.xml:212(para)
+#: pwck.8.xml:216(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename><phrase condition=\"tcb"
@@ -3921,7 +4063,7 @@
 "<replaceable>passwd</replaceable> 和 <replaceable>shadow</replaceable> 参数来"
 "选择替代文件。"
 
-#: pwck.8.xml:221(para)
+#: pwck.8.xml:225(para)
 msgid ""
 "Note that when <option>USE_TCB</option> is enabled, you cannot specify an "
 "alternative <replaceable>shadow</replaceable> file. In future releases, this "
@@ -3930,33 +4072,33 @@
 "注意，<option>USE_TCB</option> 启用时，您不能指定另外的 <replaceable>shadow</"
 "replaceable>。以后的版本中，此参数可能会被替换成一个另外的 TCB 目录。"
 
-#: pwck.8.xml:290(para)
+#: pwck.8.xml:294(para)
 msgid "one or more bad password entries"
 msgstr "一个或多个错误的密码条目"
 
-#: pwck.8.xml:296(para)
+#: pwck.8.xml:300(para)
 msgid "can't open password files"
 msgstr "无法打开密码文件"
 
-#: pwck.8.xml:302(para)
+#: pwck.8.xml:306(para)
 msgid "can't lock password files"
 msgstr "无法锁定密码文件"
 
-#: pwck.8.xml:308(para)
+#: pwck.8.xml:312(para)
 msgid "can't update password files"
 msgstr "无法更新密码文件"
 
-#: pwck.8.xml:314(para)
+#: pwck.8.xml:318(para)
 msgid "can't sort password files"
 msgstr "无法在密码文件中排序"
 
-#: pwck.8.xml:272(para)
+#: pwck.8.xml:276(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
 msgstr "<command>pwck</command> 命令有如下返回值：<placeholder-1/>"
 
-#: pwck.8.xml:323(para)
+#: pwck.8.xml:327(para)
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>grpck</"
@@ -3976,15 +4118,15 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
+#: porttime.5.xml:38(refentrytitle) porttime.5.xml:45(refname)
 msgid "porttime"
 msgstr "porttime"
 
-#: porttime.5.xml:40(refpurpose)
+#: porttime.5.xml:46(refpurpose)
 msgid "port access time file"
 msgstr "端口访问时间文件"
 
-#: porttime.5.xml:45(para)
+#: porttime.5.xml:51(para)
 msgid ""
 "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, "
 "user names, and permitted login times."
@@ -3992,7 +4134,7 @@
 "<emphasis remap=\"I\">porttime</emphasis> 包含一个 tty 设备、用户名和允许登录"
 "时间的列表。"
 
-#: porttime.5.xml:50(para)
+#: porttime.5.xml:56(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 "
@@ -4005,7 +4147,7 @@
 "示匹配所有终端。第二个字段是逗号分隔的用户名列表，或者星号表示匹配所有用户"
 "名。第三个字段是逗号分隔的访问许可时间。"
 
-#: porttime.5.xml:59(para)
+#: porttime.5.xml:65(para)
 msgid ""
 "Each access time entry consists of zero or more days of the week, "
 "abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</"
@@ -4022,11 +4164,11 @@
 "五，<emphasis>Al</emphasis> 可以用于表示没一天。如果没有制定周几，将会假定为 "
 "<emphasis>Al</emphasis>。"
 
-#: porttime.5.xml:73(title)
+#: porttime.5.xml:79(title)
 msgid "EXAMPLES"
 msgstr "示例"
 
-#: porttime.5.xml:74(para)
+#: porttime.5.xml:80(para)
 msgid ""
 "The following entry allows access to user <emphasis remap=\"B\">jfh</"
 "emphasis> on every port during weekdays from 9am to 5pm."
@@ -4034,11 +4176,11 @@
 "下面的条目允许在工作日的上午九点到下午五点在任何端口上访问用户 <emphasis "
 "remap=\"B\">jfh</emphasis>。"
 
-#: porttime.5.xml:80(para)
+#: porttime.5.xml:86(para)
 msgid "*:jfh:Wk0900-1700"
 msgstr "*:jfh:Wk0900-1700"
 
-#: porttime.5.xml:82(para)
+#: porttime.5.xml:88(para)
 msgid ""
 "The following entries allow access only to the users <emphasis>root</"
 "emphasis> and <emphasis>oper</emphasis> on <filename>/dev/console</filename> "
@@ -4051,7 +4193,7 @@
 "porttime</filename> 文件是一个访问时间的有序列表。任何匹配第二条的其他用户都"
 "不会被允许访问。"
 
-#: porttime.5.xml:91(programlisting)
+#: porttime.5.xml:97(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -4064,26 +4206,26 @@
 "      console:*:\n"
 "    "
 
-#: porttime.5.xml:96(para)
+#: porttime.5.xml:102(para)
 msgid ""
 "The following entry allows access for the user <emphasis>games</emphasis> on "
 "any port during non-working hours."
 msgstr ""
 "如下项允许，在非工作时间在任何端口上使用用户 <emphasis>games</emphasis>。"
 
-#: porttime.5.xml:101(para)
+#: porttime.5.xml:107(para)
 msgid "*:games:Wk1700-0900,SaSu0000-2400"
 msgstr "*:games:Wk1700-0900,SaSu0000-2400"
 
-#: porttime.5.xml:108(filename) logoutd.8.xml:67(filename)
+#: porttime.5.xml:114(filename) logoutd.8.xml:73(filename)
 msgid "/etc/porttime"
 msgstr "/etc/porttime"
 
-#: porttime.5.xml:110(para) logoutd.8.xml:69(para)
+#: porttime.5.xml:116(para) logoutd.8.xml:75(para)
 msgid "File containing port access."
 msgstr "包含了端口访问信息的文件。"
 
-#: porttime.5.xml:118(para) login.access.5.xml:109(para)
+#: porttime.5.xml:124(para) login.access.5.xml:115(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -4091,11 +4233,11 @@
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: passwd.5.xml:40(refpurpose)
+#: passwd.5.xml:46(refpurpose)
 msgid "the password file"
 msgstr "密码文件"
 
-#: passwd.5.xml:45(para)
+#: passwd.5.xml:51(para)
 msgid ""
 "<filename>/etc/passwd</filename> contains one line for each user account, "
 "with seven fields delimited by colons (<quote>:</quote>). These fields are:"
@@ -4103,31 +4245,31 @@
 "<filename>/etc/passwd</filename> 为每个用户账户包含一行，包含使用冒号 "
 "(<quote>:</quote>) 分隔的七个字段，分别是："
 
-#: passwd.5.xml:56(para)
+#: passwd.5.xml:62(para)
 msgid "optional encrypted password"
 msgstr "可选的加密后的密码"
 
-#: passwd.5.xml:59(para)
+#: passwd.5.xml:65(para)
 msgid "numerical user ID"
 msgstr "数字用户 ID"
 
-#: passwd.5.xml:62(para)
+#: passwd.5.xml:68(para)
 msgid "numerical group ID"
 msgstr "数字组 ID"
 
-#: passwd.5.xml:65(para)
+#: passwd.5.xml:71(para)
 msgid "user name or comment field"
 msgstr "用户名和注释字段"
 
-#: passwd.5.xml:68(para)
+#: passwd.5.xml:74(para)
 msgid "user home directory"
 msgstr "用户主目录"
 
-#: passwd.5.xml:71(para)
+#: passwd.5.xml:77(para)
 msgid "optional user command interpreter"
 msgstr "可选的用户命令解释器"
 
-#: passwd.5.xml:75(para)
+#: passwd.5.xml:81(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 "
@@ -4155,7 +4297,7 @@
 "密过的密码，如 <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> 中的说明。"
 
-#: passwd.5.xml:94(para)
+#: passwd.5.xml:100(para)
 msgid ""
 "The comment field is used by various system utilities, such as "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
@@ -4164,7 +4306,7 @@
 "此注释字段被多个系统工具使用，例如 <citerefentry><refentrytitle>finger</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>。"
 
-#: passwd.5.xml:100(para)
+#: passwd.5.xml:106(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 "
@@ -4173,7 +4315,7 @@
 "主目录字段提供了初始工作目录的名称。<command>login</command> 程序根据此信息设"
 "置 <envar>$HOME</envar> 环境变量。"
 
-#: passwd.5.xml:106(para)
+#: passwd.5.xml:112(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 "
@@ -4185,19 +4327,19 @@
 "<command>login</command> 程序使用此信息设置 <envar>$SHELL</envar> 环境变量的"
 "值。如果字段为空，默认值为 <filename>/bin/sh</filename>。"
 
-#: passwd.5.xml:127(para)
+#: passwd.5.xml:133(para)
 msgid "optional encrypted password file"
 msgstr "可选的加密后的密码文件"
 
-#: passwd.5.xml:131(filename)
+#: passwd.5.xml:137(filename)
 msgid "/etc/passwd-"
 msgstr "/etc/passwd-"
 
-#: passwd.5.xml:133(para)
+#: passwd.5.xml:139(para)
 msgid "Backup file for /etc/passwd."
 msgstr "/etc/passwd 的备份文件。"
 
-#: passwd.5.xml:145(para)
+#: passwd.5.xml:151(para)
 msgid ""
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getent</"
@@ -4233,11 +4375,11 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: passwd.1.xml:50(refpurpose)
+#: passwd.1.xml:53(refpurpose)
 msgid "change user password"
 msgstr "更改用户密码"
 
-#: passwd.1.xml:67(para)
+#: passwd.1.xml:70(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 "
@@ -4248,11 +4390,11 @@
 "己账户的密码，而超级用户可以更改任何账户的密码。<command>passwd</command> 也"
 "更改账户或相关的密码有效期。"
 
-#: passwd.1.xml:76(title)
+#: passwd.1.xml:79(title)
 msgid "Password Changes"
 msgstr "密码更改"
 
-#: passwd.1.xml:77(para)
+#: passwd.1.xml:80(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 "
@@ -4263,7 +4405,7 @@
 "用户只有一次机会输入正确密码。允许超级用户略过这个步骤，以便更改忘记了的密"
 "码。"
 
-#: passwd.1.xml:85(para)
+#: passwd.1.xml:88(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, "
@@ -4272,7 +4414,7 @@
 "输入了密码之后，会检查密码年龄信息，以查看此时是否允许用户更改密码。如果不允"
 "许，<command>passwd</command> 拒绝更改密码，然后退出。"
 
-#: passwd.1.xml:92(para)
+#: passwd.1.xml:95(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 "
@@ -4280,7 +4422,7 @@
 msgstr ""
 "提示用户输入两次新密码。第二次和第一次进行比较，并且需要相同才能更改密码。"
 
-#: passwd.1.xml:98(para)
+#: passwd.1.xml:101(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 "
@@ -4289,19 +4431,19 @@
 "然后，测试密码的负责程度。一般来讲，密码应该包含 6 到 8 位字符，从下边的一个"
 "或多个集合中选择："
 
-#: passwd.1.xml:106(para)
+#: passwd.1.xml:109(para)
 msgid "lower case alphabetics"
 msgstr "小写字母"
 
-#: passwd.1.xml:109(para)
+#: passwd.1.xml:112(para)
 msgid "digits 0 thru 9"
 msgstr "数字 0 到 9"
 
-#: passwd.1.xml:112(para)
+#: passwd.1.xml:115(para)
 msgid "punctuation marks"
 msgstr "标点符号"
 
-#: passwd.1.xml:116(para)
+#: passwd.1.xml:119(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 "
@@ -4310,11 +4452,11 @@
 "必须要留意不能包含系统默认的擦除和杀死字符。<command>passwd</command> 会拒绝"
 "复杂度不满足要求的密码。"
 
-#: passwd.1.xml:125(title)
+#: passwd.1.xml:128(title)
 msgid "Hints for user passwords"
 msgstr "关于用户密码的提示"
 
-#: passwd.1.xml:126(para)
+#: passwd.1.xml:129(para)
 msgid ""
 "The security of a password depends upon the strength of the encryption "
 "algorithm and the size of the key space. The legacy <emphasis>UNIX</"
@@ -4327,7 +4469,7 @@
 "emphasis> 系统加密算法基于 NBS DES 算法。推荐使用更新的算法(查看 "
 "<option>ENCRYPT_METHOD</option>)。密钥空间的大小依赖于选择的密码的随机性。"
 
-#: passwd.1.xml:135(para)
+#: passwd.1.xml:138(para)
 msgid ""
 "Compromises in password security normally result from careless password "
 "selection or handling. For this reason, you should not select a password "
@@ -4339,7 +4481,7 @@
 "词典中或者必须要写下来才能记住的密码。密码也不应该是一个名字、许可证号、生日"
 "或者街道号。所有这些可以用于猜测来损害系统安全。"
 
-#: passwd.1.xml:144(para)
+#: passwd.1.xml:147(para)
 msgid ""
 "You can find advices on how to choose a strong password on http://en."
 "wikipedia.org/wiki/Password_strength"
@@ -4347,25 +4489,25 @@
 "您可以在在 http://zh.wikipedia.org/zh-cn/密码强度 找到怎样选择强壮密码的建"
 "议。"
 
-#: passwd.1.xml:153(para)
+#: passwd.1.xml:156(para)
 msgid "The options which apply to the <command>passwd</command> command are:"
 msgstr "<command>passwd</command> 命令可以接受的选项有："
 
-#: passwd.1.xml:158(term) faillog.8.xml:71(term)
+#: passwd.1.xml:161(term) faillog.8.xml:77(term)
 msgid "<option>-a</option>, <option>--all</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
-#: passwd.1.xml:162(para)
+#: passwd.1.xml:165(para)
 msgid ""
 "This option can be used only with <option>-S</option> and causes show status "
 "for all users."
 msgstr "此选项只能和 <option>-S</option> 一起使用，来显示所有用户的状态。"
 
-#: passwd.1.xml:169(term)
+#: passwd.1.xml:172(term)
 msgid "<option>-d</option>, <option>--delete</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: passwd.1.xml:173(para)
+#: passwd.1.xml:176(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."
@@ -4373,17 +4515,17 @@
 "删除用户密码(让它为空)。这是禁用一个用户密码的快速方法。它将设置给出名称的账"
 "户。"
 
-#: passwd.1.xml:181(term)
+#: passwd.1.xml:184(term)
 msgid "<option>-e</option>, <option>--expire</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
-#: passwd.1.xml:185(para)
+#: passwd.1.xml:188(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:198(term)
+#: passwd.1.xml:201(term)
 msgid ""
 "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -4391,7 +4533,7 @@
 "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 
-#: passwd.1.xml:202(para)
+#: passwd.1.xml:205(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 "
@@ -4401,11 +4543,11 @@
 "此选项用于在密码过期一定天数之后禁用账户。一个用户账户密码已经过期 "
 "<replaceable>INACTIVE</replaceable> 天之后，用户将不能再登录进账户。"
 
-#: passwd.1.xml:211(term)
+#: passwd.1.xml:214(term)
 msgid "<option>-k</option>, <option>--keep-tokens</option>"
 msgstr "<option>-k</option>, <option>--keep-tokens</option>"
 
-#: passwd.1.xml:215(para)
+#: passwd.1.xml:218(para)
 msgid ""
 "Indicate password change should be performed only for expired authentication "
 "tokens (passwords). The user wishes to keep their non-expired tokens as "
@@ -4414,11 +4556,11 @@
 "表示密码更改只应该因为认证口令(密码)过期更改。用户希望保持他们尚未过期的口"
 "令。"
 
-#: passwd.1.xml:223(term)
+#: passwd.1.xml:226(term)
 msgid "<option>-l</option>, <option>--lock</option>"
 msgstr "<option>-l</option>, <option>--lock</option>"
 
-#: passwd.1.xml:227(para)
+#: passwd.1.xml:230(para)
 msgid ""
 "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 "
@@ -4427,7 +4569,7 @@
 "锁定指定账户的密码。此选项通过将密码更改为一个不可能与加密值匹配的值来禁用(它"
 "在密码开头添加一个“!”)。"
 
-#: passwd.1.xml:233(para)
+#: passwd.1.xml:236(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 "
@@ -4438,11 +4580,11 @@
 "禁用此账户，管理员需要使用 <command>usermod --expiredate 1</command> (设置账"
 "户的过期时间为1970年1月2日)。"
 
-#: passwd.1.xml:240(para)
+#: passwd.1.xml:243(para)
 msgid "Users with a locked password are not allowed to change their password."
 msgstr "被锁定了密码的用户不允许更改密码。"
 
-#: passwd.1.xml:247(term)
+#: passwd.1.xml:250(term)
 msgid ""
 "<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -4450,7 +4592,7 @@
 "<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 
-#: passwd.1.xml:251(para) chage.1.xml:146(para)
+#: passwd.1.xml:254(para) chage.1.xml:149(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -4459,7 +4601,7 @@
 "在密码更改之间的最小天数设置为 <replaceable>MIN_DAYS</replaceable>。此字段中"
 "的 0 值表示用户可以在任何时间更改其密码。"
 
-#: passwd.1.xml:269(term)
+#: passwd.1.xml:272(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -4467,15 +4609,15 @@
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
 
-#: passwd.1.xml:273(para)
+#: passwd.1.xml:276(para)
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr "在 <replaceable>REPOSITORY</replaceable> 中更改密码"
 
-#: passwd.1.xml:279(term)
+#: passwd.1.xml:295(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
-#: passwd.1.xml:283(para)
+#: passwd.1.xml:299(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 "
@@ -4490,11 +4632,11 @@
 "后一次更改密码的日期。接下来的四个字段分别是密码的最小年龄、最大年龄、警告期"
 "和禁用期。这些年龄以天为单位计算。"
 
-#: passwd.1.xml:297(term)
+#: passwd.1.xml:313(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
-#: passwd.1.xml:301(para)
+#: passwd.1.xml:317(para)
 msgid ""
 "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 "
@@ -4503,7 +4645,7 @@
 "解锁指定用户的密码。此操作通过将密码改回先前值(改回使用 <option>-l</option> "
 "之前的值)重新启用密码。"
 
-#: passwd.1.xml:310(term)
+#: passwd.1.xml:326(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -4511,7 +4653,7 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
 
-#: passwd.1.xml:314(para)
+#: passwd.1.xml:330(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 "
@@ -4521,7 +4663,7 @@
 "设置在要求更改密码之前警告的天数。<replaceable>WARN_DAYS</replaceable> 选项是"
 "在密码过期之前提前警告的天数。"
 
-#: passwd.1.xml:323(term)
+#: passwd.1.xml:339(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -4529,7 +4671,7 @@
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
 
-#: passwd.1.xml:327(para)
+#: passwd.1.xml:343(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -4537,20 +4679,20 @@
 "设置密码仍然有效的最大天数。<replaceable>MAX_DAYS</replaceable> 之后，密码会"
 "要求更改。"
 
-#: passwd.1.xml:339(para)
+#: passwd.1.xml:355(para)
 msgid ""
 "Password complexity checking may vary from site to site. The user is urged "
 "to select a password as complex as he or she feels comfortable with."
 msgstr "密码复杂性检查在每台机器间不同。用户应该选择适合的尽量复杂的密码。"
 
-#: passwd.1.xml:344(para)
+#: passwd.1.xml:360(para)
 msgid ""
 "Users may not be able to change their password on a system if NIS is enabled "
 "and they are not logged into the NIS server."
 msgstr ""
 "在启动了 NIS 的系统上，如果没有登录 NIS 服务器，用户或许不能更改自己的密码。"
 
-#: passwd.1.xml:349(para)
+#: passwd.1.xml:365(para)
 msgid ""
 "<command>passwd</command> uses PAM to authenticate users and to change their "
 "passwords."
@@ -4625,8 +4767,13 @@
 
 #: 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)
+#, fuzzy
+#| msgid ""
+#| "This variable is superceded by the <option>ENCRYPT_METHOD</option> "
+#| "variable or by any command line option used to configure the encryption "
+#| "algorithm."
 msgid ""
-"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"This variable is superseded by the <option>ENCRYPT_METHOD</option> variable "
 "or by any command line option used to configure the encryption algorithm."
 msgstr ""
 "此变量已经被 <option>ENCRYPT_METHOD</option> 变量或者用于配置加密算法的命令行"
@@ -4720,7 +4867,9 @@
 
 #: 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."
+#, fuzzy
+#| msgid "The values must be inside the 1000-999999999 range."
+msgid "The values must be inside the 1000-999,999,999 range."
 msgstr "值必须在 1000 - 999999999 之间。"
 
 #: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para)
@@ -4742,68 +4891,80 @@
 "如果 <option>SHA_CRYPT_MIN_ROUNDS</option> > "
 "<option>SHA_CRYPT_MAX_ROUNDS</option>，将会使用大的那个。"
 
-#: passwd.1.xml:395(filename)
+#: passwd.1.xml:411(filename)
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/pam.d/passwd"
 
-#: passwd.1.xml:397(para)
+#: passwd.1.xml:413(para)
 msgid "PAM configuration for <command>passwd</command>."
 msgstr "<command>passwd</command> 的 PAM 配置。"
 
-#: passwd.1.xml:417(para) chage.1.xml:257(para)
+#: passwd.1.xml:433(para) chage.1.xml:273(para)
 msgid "permission denied"
 msgstr "权限不够"
 
-#: passwd.1.xml:423(para)
+#: passwd.1.xml:439(para)
 msgid "invalid combination of options"
 msgstr "无效的选项组合"
 
-#: passwd.1.xml:429(para)
+#: passwd.1.xml:445(para)
 msgid "unexpected failure, nothing done"
 msgstr "意外的失败，什么也没有做。"
 
-#: passwd.1.xml:435(para)
+#: passwd.1.xml:451(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr "意外的失败，<filename>passwd</filename> 文件丢失"
 
-#: passwd.1.xml:441(para)
+#: passwd.1.xml:457(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr "<filename>passwd</filename> 文件忙，请重试"
 
-#: passwd.1.xml:405(para)
+#: passwd.1.xml:421(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
 msgstr "<command>passwd</command> 命令退出，并返回如下值：<placeholder-1/>"
 
-#: passwd.1.xml:456(para)
+#: passwd.1.xml:472(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></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>usermod</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
-"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
-"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>chpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <phrase condition=\"no_pam"
+"\"><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, </phrase><citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"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>, <phrase condition="
-"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
-"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname)
-#: nologin.8.xml:45(command)
+#: nologin.8.xml:38(refentrytitle) nologin.8.xml:45(refname)
+#: nologin.8.xml:51(command)
 msgid "nologin"
 msgstr "nologin"
 
-#: nologin.8.xml:40(refpurpose)
+#: nologin.8.xml:46(refpurpose)
 msgid "politely refuse a login"
 msgstr "礼貌地拒绝登录"
 
-#: nologin.8.xml:51(para)
+#: nologin.8.xml:57(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 "
@@ -4812,7 +4973,7 @@
 "<command>nologin</command> 命令显示一个信息，说账户不可用然后返回非零值。它用"
 "于代替已经禁用的账户的 shell 字段。"
 
-#: nologin.8.xml:56(para)
+#: nologin.8.xml:62(para)
 msgid ""
 "To disable all logins, investigate <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
@@ -4820,7 +4981,7 @@
 "如果要禁用所有登录，请参考 <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>。"
 
-#: nologin.8.xml:65(para)
+#: nologin.8.xml:71(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
@@ -4830,54 +4991,62 @@
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: nologin.8.xml:76(title)
+#: nologin.8.xml:82(title)
 msgid "HISTORY"
 msgstr "历史"
 
-#: nologin.8.xml:77(para)
+#: nologin.8.xml:83(para)
 msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr "<command>nologin</command> 首次出现于 BSD 4.4。"
 
-#: newusers.8.xml:50(refentrytitle) newusers.8.xml:55(refname)
-#: newusers.8.xml:61(command) login.defs.5.xml:365(term)
+#: newusers.8.xml:51(refentrytitle) newusers.8.xml:58(refname)
+#: newusers.8.xml:64(command) login.defs.5.xml:368(term)
 msgid "newusers"
 msgstr "newusers"
 
-#: newusers.8.xml:56(refpurpose)
+#: newusers.8.xml:59(refpurpose)
 msgid "update and create new users in batch"
 msgstr "批量更新和创建新用户"
 
-#: newusers.8.xml:64(replaceable)
-msgid "new_users"
-msgstr "新用户"
+#: newusers.8.xml:69(replaceable)
+msgid "file"
+msgstr ""
 
-#: newusers.8.xml:71(para)
+#: newusers.8.xml:76(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 "
+#| "exceptions explained below:"
 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 exceptions "
-"explained below:"
+"The <command>newusers</command> command reads a <replaceable>file</"
+"replaceable> (or the standard input by default) and uses this information to "
+"update a set 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 exceptions explained below:"
 msgstr ""
 "<command>newusers</command> 命令读取用户名和明文密码对文件，并使用此信息更新"
 "一系列现有用户或创建新用户。每行和标准的 password 文件使用同样的格式(参考 "
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>)，除了下边这些区别："
 
-#: newusers.8.xml:79(para)
+#: newusers.8.xml:84(para)
 msgid "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
 msgstr "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
 
-#: newusers.8.xml:84(emphasis)
+#: newusers.8.xml:89(emphasis)
 msgid "pw_name"
 msgstr "pw_name"
 
-#: newusers.8.xml:87(para)
+#: newusers.8.xml:92(para)
 msgid "This is the name of the user."
 msgstr "这是用户的用户名。"
 
-#: newusers.8.xml:90(para)
+#: newusers.8.xml:95(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, "
@@ -4886,36 +5055,36 @@
 "既可以是新用户名也可以是现有用户名(也可以是 <command>newusers</command> 以前"
 "创建的用户)。现有用户时，将会更改用户信息，否则会创建新用户。"
 
-#: newusers.8.xml:101(emphasis)
+#: newusers.8.xml:106(emphasis)
 msgid "pw_passwd"
 msgstr "pw_passwd"
 
-#: newusers.8.xml:104(para)
+#: newusers.8.xml:109(para)
 msgid ""
 "This field will be encrypted and used as the new value of the encrypted "
 "password."
 msgstr "此字段将被加密然后用于加密后密码的新值。"
 
-#: newusers.8.xml:112(emphasis)
+#: newusers.8.xml:117(emphasis)
 msgid "pw_uid"
 msgstr "pw_uid"
 
-#: newusers.8.xml:115(para)
+#: newusers.8.xml:120(para)
 msgid "This field is used to define the UID of the user."
 msgstr "此字段用于定义用户的 UID。"
 
-#: newusers.8.xml:118(para)
+#: newusers.8.xml:123(para)
 msgid ""
 "If the field is empty, an new (unused) UID will be defined automatically by "
 "<command>newusers</command>."
 msgstr ""
 "如果此字段为空，<command>newusers</command> 会自动确定一个新的(未使用的)UID。"
 
-#: newusers.8.xml:122(para)
+#: newusers.8.xml:127(para)
 msgid "If this field contains a number, this number will be used as the UID."
 msgstr "如果此字段包含一个数字，此数字会用于 UID。"
 
-#: newusers.8.xml:126(para)
+#: newusers.8.xml:131(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 "
@@ -4924,21 +5093,21 @@
 "如果此字段包含已经使用了的用户名(或者 <command>newusers</command> 在前边已经"
 "创建的一个用户)，将会使用指定用户的 UID。"
 
-#: newusers.8.xml:132(para)
+#: newusers.8.xml:137(para)
 msgid ""
 "If the UID of an existing user is changed, the files ownership of the user's "
 "file should be fixed manually."
 msgstr "如果一个现有用户更改了 UID，此用户的文件所有权需要手动修复。"
 
-#: newusers.8.xml:140(emphasis)
+#: newusers.8.xml:145(emphasis)
 msgid "pw_gid"
 msgstr "pw_gid"
 
-#: newusers.8.xml:143(para)
+#: newusers.8.xml:148(para)
 msgid "This field is used to define the primary group ID for the user."
 msgstr "此字段用于定义用户的主组 ID。"
 
-#: newusers.8.xml:146(para)
+#: newusers.8.xml:151(para)
 msgid ""
 "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 "
@@ -4947,7 +5116,7 @@
 "如果此字段包含一个现有组的组名(或者 <command>newusers</command> 在前边创建的"
 "一个组)，此组的 GID 会被用于做此用户的主组 ID。"
 
-#: newusers.8.xml:152(para)
+#: newusers.8.xml:157(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 "
@@ -4956,7 +5125,7 @@
 "如果此字段是一个数字，此数字会被用作此用户的主组 ID。如果没有对应此 GID 的现"
 "有组，将会使用此 GID 创建一个新组，名称和用户名相同。"
 
-#: newusers.8.xml:158(para)
+#: newusers.8.xml:163(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> "
@@ -4966,35 +5135,42 @@
 "如果此字段为空，将会使用用户名作为组名，<command>newusers</command> 自动确定"
 "的一个 GID 作为主组 ID 来创建一个新组。"
 
-#: newusers.8.xml:164(para)
+#: newusers.8.xml:169(para)
+#, fuzzy
+#| 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."
 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 "
+"created before 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."
+"and GID for the new group."
 msgstr ""
 "如果此字段包含一个不存在的组的名字(也没有由 <command>newusers</command>)，在"
 "前边创建，将使用指定的组名和 <command>newusers</command> 自动确定的 GID 创建"
 "一个组，并作为用户的主组。"
 
-#: newusers.8.xml:176(emphasis)
+#: newusers.8.xml:181(emphasis)
 msgid "pw_gecos"
 msgstr "pw_gecos"
 
-#: newusers.8.xml:179(para)
+#: newusers.8.xml:184(para)
 msgid "This field is copied in the GECOS field of the user."
 msgstr "此字段复制到用户的 GECOS 字段。"
 
-#: newusers.8.xml:186(emphasis)
+#: newusers.8.xml:191(emphasis)
 msgid "pw_dir"
 msgstr "pw_dir"
 
-#: newusers.8.xml:189(para)
+#: newusers.8.xml:194(para)
 msgid "This field is used to define the home directory of the user."
 msgstr "此字段用于定义用户的主目录。"
 
-#: newusers.8.xml:192(para)
+#: newusers.8.xml:197(para)
 msgid ""
 "If this field does not specify an existing directory, the specified "
 "directory is created, with ownership set to the user being created or "
@@ -5003,7 +5179,7 @@
 "如果此字段指定的不是现有的目录，将会创建指定的目录，所有权设置为创建或更新的"
 "用户及其主组。"
 
-#: newusers.8.xml:197(para)
+#: newusers.8.xml:202(para)
 msgid ""
 "If the home directory of an existing user is changed, <command>newusers</"
 "command> does not move or copy the content of the old directory to the new "
@@ -5012,17 +5188,17 @@
 "如果现有用户的主目录变更，<command>newusers</command> 不会移动或者复制旧目录"
 "的内容到新位置。这需要手动完成。"
 
-#: newusers.8.xml:207(emphasis)
+#: newusers.8.xml:212(emphasis)
 msgid "pw_shell"
 msgstr "pw_shell"
 
-#: newusers.8.xml:210(para)
+#: newusers.8.xml:215(para)
 msgid ""
 "This field defines the shell of the user. No checks are performed on this "
 "field."
 msgstr "此字段定义了用户的 shell。对此字段不进行任何检查。"
 
-#: newusers.8.xml:218(para)
+#: newusers.8.xml:223(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 "
@@ -5033,7 +5209,7 @@
 "写入用户或组数据库。如果发生错误(除非是在最后写入数据库过程中)，不会有任何更"
 "改。"
 
-#: newusers.8.xml:224(para)
+#: newusers.8.xml:229(para)
 msgid ""
 "During this first pass, users are created with a locked password (and "
 "passwords are not changed for the users which are not created). A second "
@@ -5041,25 +5217,25 @@
 "password are reported, but will not stop the other password updates."
 msgstr ""
 
-#: newusers.8.xml:232(para)
+#: newusers.8.xml:237(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:240(para)
+#: newusers.8.xml:245(para)
 msgid "The options which apply to the <command>newusers</command> command are:"
 msgstr "<command>newusers</command> 命令可以使用的选项有："
 
-#: newusers.8.xml:245(term) chgpasswd.8.xml:95(term)
+#: newusers.8.xml:250(term) chgpasswd.8.xml:98(term)
 msgid "<option>-c</option>, <option>--crypt-method</option>"
 msgstr "<option>-c</option>, <option>--crypt-method</option>"
 
-#: newusers.8.xml:247(para) chpasswd.8.xml:120(para) chgpasswd.8.xml:97(para)
+#: newusers.8.xml:252(para) chpasswd.8.xml:123(para) chgpasswd.8.xml:100(para)
 msgid "Use the specified method to encrypt the passwords."
 msgstr "使用指定的方法加密密码。"
 
-#: newusers.8.xml:248(para) chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
+#: newusers.8.xml:253(para) chpasswd.8.xml:127(para) chgpasswd.8.xml:104(para)
 msgid ""
 "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc "
 "support these methods."
@@ -5067,7 +5243,7 @@
 "可用的方法有 DES, MD5, NONE, and SHA256 或 SHA512，前提是您的 libc 支持这写方"
 "法。"
 
-#: newusers.8.xml:270(para)
+#: newusers.8.xml:275(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are chosen in the "
@@ -5077,30 +5253,30 @@
 "the creation of groups)."
 msgstr ""
 
-#: newusers.8.xml:284(term) chgpasswd.8.xml:129(term)
+#: newusers.8.xml:302(term) chgpasswd.8.xml:145(term)
 msgid "<option>-s</option>, <option>--sha-rounds</option>"
 msgstr "<option>-s</option>, <option>--sha-rounds</option>"
 
-#: newusers.8.xml:286(para) chpasswd.8.xml:172(para) chgpasswd.8.xml:131(para)
+#: newusers.8.xml:304(para) chpasswd.8.xml:188(para) chgpasswd.8.xml:147(para)
 msgid "Use the specified number of rounds to encrypt the passwords."
 msgstr "使用指定次数的轮转来加密密码。"
 
-#: newusers.8.xml:289(para) chpasswd.8.xml:175(para) chgpasswd.8.xml:134(para)
+#: newusers.8.xml:307(para) chpasswd.8.xml:191(para) chgpasswd.8.xml:150(para)
 msgid ""
 "The value 0 means that the system will choose the default number of rounds "
 "for the crypt method (5000)."
 msgstr "值 0 表示让系统为加密方法选择默认的轮转次数 (5000)。"
 
-#: newusers.8.xml:293(para) chpasswd.8.xml:179(para) chgpasswd.8.xml:138(para)
+#: newusers.8.xml:311(para) chpasswd.8.xml:195(para) chgpasswd.8.xml:154(para)
 msgid ""
 "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr "会强制最小 1,000，最大 9,9999,9999"
 
-#: newusers.8.xml:297(para) chpasswd.8.xml:183(para) chgpasswd.8.xml:142(para)
+#: newusers.8.xml:315(para) chpasswd.8.xml:199(para) chgpasswd.8.xml:158(para)
 msgid "You can only use this option with the SHA256 or SHA512 crypt method."
 msgstr "您只可以对 SHA256 或 SHA512 使用此选项。"
 
-#: newusers.8.xml:301(para) chgpasswd.8.xml:146(para)
+#: newusers.8.xml:319(para) chgpasswd.8.xml:162(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>."
@@ -5108,26 +5284,26 @@
 "默认，轮转数由 <filename>/etc/login.defs</filename> 文件中的 "
 "SHA_CRYPT_MIN_ROUNDS 和 SHA_CRYPT_MAX_ROUNDS 变量确定。"
 
-#: newusers.8.xml:313(para)
+#: newusers.8.xml:331(para)
 msgid ""
 "The input file must be protected since it contains unencrypted passwords."
 msgstr "输入文件必须受到保护，因为它包含未加密的密码。"
 
-#: newusers.8.xml:317(para) chgpasswd.8.xml:162(para)
+#: newusers.8.xml:335(para) chgpasswd.8.xml:178(para)
 msgid ""
 "You should make sure the passwords and the encryption method respect the "
 "system's password policy."
 msgstr "您需要确保你吗和加密方法符合系统的密码策略。"
 
-#: newusers.8.xml:390(filename)
+#: newusers.8.xml:408(filename)
 msgid "/etc/pam.d/newusers"
 msgstr "/etc/pam.d/newusers"
 
-#: newusers.8.xml:392(para)
+#: newusers.8.xml:410(para)
 msgid "PAM configuration for <command>newusers</command>."
 msgstr "<command>newusers</command> 的 PAM 配置。"
 
-#: newusers.8.xml:400(para)
+#: newusers.8.xml:418(para)
 msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5141,22 +5317,21 @@
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname)
-#: newgrp.1.xml:49(command)
+#: newgrp.1.xml:39(refentrytitle) newgrp.1.xml:46(refname)
+#: newgrp.1.xml:52(command)
 msgid "newgrp"
 msgstr "newgrp"
 
-#: newgrp.1.xml:44(refpurpose)
+#: newgrp.1.xml:47(refpurpose)
 msgid "log in to a new group"
 msgstr "登录到一个新组"
 
-#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
-#: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
-#: groupadd.8.xml:57(replaceable) gpasswd.1.xml:66(replaceable)
+#: newgrp.1.xml:53(replaceable) grpck.8.xml:55(replaceable)
+#: groupadd.8.xml:59(replaceable) gpasswd.1.xml:69(replaceable)
 msgid "group"
 msgstr "group"
 
-#: newgrp.1.xml:56(para)
+#: newgrp.1.xml:59(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, "
@@ -5165,7 +5340,7 @@
 "remains unchanged."
 msgstr ""
 
-#: newgrp.1.xml:64(para)
+#: newgrp.1.xml:67(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 "
@@ -5179,7 +5354,7 @@
 "as a member."
 msgstr ""
 
-#: newgrp.1.xml:78(para)
+#: newgrp.1.xml:81(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 "
@@ -5187,7 +5362,7 @@
 "considered."
 msgstr ""
 
-#: newgrp.1.xml:130(para)
+#: newgrp.1.xml:133(para)
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -5213,16 +5388,18 @@
 "\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry></phrase>."
 
-#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname)
-#: logoutd.8.xml:45(command)
+#: logoutd.8.xml:38(refentrytitle) logoutd.8.xml:45(refname)
+#: logoutd.8.xml:51(command)
 msgid "logoutd"
 msgstr "logoutd"
 
-#: logoutd.8.xml:40(refpurpose)
-msgid "Enforce login time restrictions"
+#: logoutd.8.xml:46(refpurpose)
+#, fuzzy
+#| msgid "Enforce login time restrictions"
+msgid "enforce login time restrictions"
 msgstr "强制开启登录时间限制"
 
-#: logoutd.8.xml:51(para)
+#: logoutd.8.xml:57(para)
 msgid ""
 "<command>logoutd</command> enforces the login time and port restrictions "
 "specified in <filename>/etc/porttime</filename>. <command>logoutd</command> "
@@ -5233,23 +5410,23 @@
 "porttime</filename> is terminated."
 msgstr ""
 
-#: logoutd.8.xml:73(filename) login.1.xml:319(filename)
+#: logoutd.8.xml:79(filename) login.1.xml:322(filename)
 msgid "/var/run/utmp"
 msgstr "/var/run/utmp"
 
-#: logoutd.8.xml:75(para) login.1.xml:321(para)
+#: logoutd.8.xml:81(para) login.1.xml:324(para)
 msgid "List of current login sessions."
 msgstr "当前登录会话的列表。"
 
-#: login.defs.5.xml:100(refentrytitle) login.defs.5.xml:105(refname)
+#: login.defs.5.xml:101(refentrytitle) login.defs.5.xml:108(refname)
 msgid "login.defs"
 msgstr "login.defs"
 
-#: login.defs.5.xml:106(refpurpose)
+#: login.defs.5.xml:109(refpurpose)
 msgid "shadow password suite configuration"
 msgstr "影子密码套件配置"
 
-#: login.defs.5.xml:111(para)
+#: login.defs.5.xml:114(para)
 msgid ""
 "The <filename>/etc/login.defs</filename> file defines the site-specific "
 "configuration for the shadow password suite. This file is required. Absence "
@@ -5257,7 +5434,7 @@
 "undesirable operation."
 msgstr ""
 
-#: login.defs.5.xml:118(para)
+#: login.defs.5.xml:121(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 "
@@ -5266,7 +5443,7 @@
 "the first non-white character of the line."
 msgstr ""
 
-#: login.defs.5.xml:126(para)
+#: login.defs.5.xml:129(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 "
@@ -5279,7 +5456,7 @@
 "and long numeric parameters is machine-dependent."
 msgstr ""
 
-#: login.defs.5.xml:141(para)
+#: login.defs.5.xml:144(para)
 msgid "The following configuration items are provided:"
 msgstr "提供如下配置项："
 
@@ -5457,9 +5634,15 @@
 msgstr "密码错误时，重试的最大次数。"
 
 #: login.defs.5.xml:37(para) login.1.xml:37(para)
+#, fuzzy
+#| msgid ""
+#| "This will most likely be overridden 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."
 msgid ""
 "This will most likely be overridden by PAM, since the default pam_unix "
-"module has it's own built in of 3 retries. However, this is a safe fallback "
+"module has its 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 ""
@@ -5496,7 +5679,7 @@
 "inhibited."
 msgstr ""
 
-#: login.defs.5.xml:184(para)
+#: login.defs.5.xml:187(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 "
@@ -5508,7 +5691,11 @@
 msgstr "<option>PORTTIME_CHECKS_ENAB</option> (boolean)"
 
 #: login.defs.5.xml:34(para) login.1.xml:34(para)
-msgid "Enable checking of time restrictions specified in /etc/porttime."
+#, fuzzy
+#| msgid "Enable checking of time restrictions specified in /etc/porttime."
+msgid ""
+"Enable checking of time restrictions specified in <filename>/etc/porttime</"
+"filename>."
 msgstr "启用在 /etc/porttime 中指定的时间限制检查。"
 
 #: login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -5564,32 +5751,32 @@
 msgid "Default <command>ulimit</command> value."
 msgstr "默认 <command>ulimit</command> 值。"
 
-#: login.defs.5.xml:215(title)
+#: login.defs.5.xml:218(title)
 msgid "CROSS REFERENCES"
 msgstr "交叉引用"
 
-#: login.defs.5.xml:216(para)
+#: login.defs.5.xml:219(para)
 msgid ""
 "The following cross references show which programs in the shadow password "
 "suite use which parameters."
 msgstr "如下交叉引用显示影子密码套件哪个程序使用哪个参数。"
 
-#: login.defs.5.xml:223(term) chage.1.xml:38(refentrytitle)
-#: chage.1.xml:43(refname) chage.1.xml:48(command)
+#: login.defs.5.xml:226(term) chage.1.xml:39(refentrytitle)
+#: chage.1.xml:46(refname) chage.1.xml:51(command)
 msgid "chage"
 msgstr "chage"
 
-#: login.defs.5.xml:225(para) login.defs.5.xml:413(phrase)
-#: login.defs.5.xml:480(phrase)
+#: login.defs.5.xml:228(para) login.defs.5.xml:416(phrase)
+#: login.defs.5.xml:483(phrase)
 msgid "USE_TCB"
 msgstr "USE_TCB"
 
-#: login.defs.5.xml:229(term) chfn.1.xml:41(refentrytitle)
-#: chfn.1.xml:46(refname) chfn.1.xml:52(command)
+#: login.defs.5.xml:232(term) chfn.1.xml:41(refentrytitle)
+#: chfn.1.xml:48(refname) chfn.1.xml:54(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:231(para)
+#: login.defs.5.xml:234(para)
 msgid ""
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
@@ -5597,12 +5784,12 @@
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
 
-#: login.defs.5.xml:239(term) chgpasswd.8.xml:42(refentrytitle)
-#: chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
+#: login.defs.5.xml:242(term) chgpasswd.8.xml:43(refentrytitle)
+#: chgpasswd.8.xml:50(refname) chgpasswd.8.xml:56(command)
 msgid "chgpasswd"
 msgstr "chgpasswd"
 
-#: login.defs.5.xml:241(para) login.defs.5.xml:272(para)
+#: login.defs.5.xml:244(para) login.defs.5.xml:275(para)
 msgid ""
 "ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB <phrase condition="
 "\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
@@ -5610,75 +5797,75 @@
 "ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB <phrase condition="
 "\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 
-#: login.defs.5.xml:249(term) chpasswd.8.xml:41(refentrytitle)
-#: chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
+#: login.defs.5.xml:252(term) chpasswd.8.xml:42(refentrytitle)
+#: chpasswd.8.xml:49(refname) chpasswd.8.xml:55(command)
 msgid "chpasswd"
 msgstr "chpasswd"
 
-#: login.defs.5.xml:252(phrase)
+#: login.defs.5.xml:255(phrase)
 msgid "ENCRYPT_METHOD MD5_CRYPT_ENAB"
 msgstr "ENCRYPT_METHOD MD5_CRYPT_ENAB"
 
-#: login.defs.5.xml:254(phrase)
+#: login.defs.5.xml:257(phrase)
 msgid "SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS"
 msgstr "SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS"
 
-#: login.defs.5.xml:260(term) chsh.1.xml:40(refentrytitle)
-#: chsh.1.xml:45(refname) chsh.1.xml:51(command)
+#: login.defs.5.xml:263(term) chsh.1.xml:41(refentrytitle)
+#: chsh.1.xml:48(refname) chsh.1.xml:54(command)
 msgid "chsh"
 msgstr "chsh"
 
-#: login.defs.5.xml:262(para)
+#: login.defs.5.xml:265(para)
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr "CHSH_AUTH LOGIN_STRING"
 
-#: login.defs.5.xml:270(term) gpasswd.1.xml:42(refentrytitle)
-#: gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
+#: login.defs.5.xml:273(term) gpasswd.1.xml:43(refentrytitle)
+#: gpasswd.1.xml:50(refname) gpasswd.1.xml:64(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
-#: login.defs.5.xml:280(term) groupadd.8.xml:41(refentrytitle)
-#: groupadd.8.xml:46(refname) groupadd.8.xml:52(command)
+#: login.defs.5.xml:283(term) groupadd.8.xml:41(refentrytitle)
+#: groupadd.8.xml:48(refname) groupadd.8.xml:54(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:282(para)
+#: login.defs.5.xml:285(para)
 msgid "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 msgstr "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 
-#: login.defs.5.xml:289(term) groupdel.8.xml:38(refentrytitle)
-#: groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
+#: login.defs.5.xml:292(term) groupdel.8.xml:39(refentrytitle)
+#: groupdel.8.xml:46(refname) groupdel.8.xml:52(command)
 msgid "groupdel"
 msgstr "groupdel"
 
-#: login.defs.5.xml:291(para) login.defs.5.xml:297(para)
-#: login.defs.5.xml:303(para) login.defs.5.xml:310(para)
-#: login.defs.5.xml:316(para) login.defs.5.xml:322(para)
+#: login.defs.5.xml:294(para) login.defs.5.xml:300(para)
+#: login.defs.5.xml:306(para) login.defs.5.xml:313(para)
+#: login.defs.5.xml:319(para) login.defs.5.xml:325(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr "MAX_MEMBERS_PER_GROUP"
 
-#: login.defs.5.xml:295(term) groupmems.8.xml:38(refentrytitle)
-#: groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
+#: login.defs.5.xml:298(term) groupmems.8.xml:39(refentrytitle)
+#: groupmems.8.xml:46(refname) groupmems.8.xml:52(command)
 msgid "groupmems"
 msgstr "groupmems"
 
-#: login.defs.5.xml:301(term) groupmod.8.xml:38(refentrytitle)
-#: groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
+#: login.defs.5.xml:304(term) groupmod.8.xml:39(refentrytitle)
+#: groupmod.8.xml:46(refname) groupmod.8.xml:52(command)
 msgid "groupmod"
 msgstr "groupmod"
 
-#: login.defs.5.xml:308(term) grpck.8.xml:38(refentrytitle)
-#: grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
+#: login.defs.5.xml:311(term) grpck.8.xml:39(refentrytitle)
+#: grpck.8.xml:46(refname) grpck.8.xml:52(command)
 msgid "grpck"
 msgstr "grpck"
 
-#: login.defs.5.xml:328(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)
+#: login.defs.5.xml:331(term) login.1.xml:71(refentrytitle)
+#: login.1.xml:78(refname) login.1.xml:84(command) login.1.xml:92(command)
+#: login.1.xml:99(command)
 msgid "login"
 msgstr "login"
 
-#: login.defs.5.xml:330(para)
+#: login.defs.5.xml:333(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</"
@@ -5704,15 +5891,15 @@
 "TTYGROUP TTYPERM TTYTYPE_FILE <phrase condition=\"no_pam\">ULIMIT UMASK</"
 "phrase> USERGROUPS_ENAB"
 
-#: login.defs.5.xml:357(term)
+#: login.defs.5.xml:360(term)
 msgid "newgrp / sg"
 msgstr "newgrp / sg"
 
-#: login.defs.5.xml:359(para)
+#: login.defs.5.xml:362(para)
 msgid "SYSLOG_SG_ENAB"
 msgstr "SYSLOG_SG_ENAB"
 
-#: login.defs.5.xml:367(para)
+#: login.defs.5.xml:370(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"
@@ -5724,7 +5911,7 @@
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase> SYS_GID_MAX "
 "SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX UID_MIN UMASK"
 
-#: login.defs.5.xml:383(para)
+#: login.defs.5.xml:386(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"
@@ -5734,7 +5921,7 @@
 "PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN <phrase condition=\"sha_crypt"
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 
-#: login.defs.5.xml:394(para)
+#: login.defs.5.xml:397(para)
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb"
 "\">TCB_AUTH_GROUP TCB_SYMLINKS USE_TCB</phrase>"
@@ -5742,7 +5929,7 @@
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb"
 "\">TCB_AUTH_GROUP TCB_SYMLINKS USE_TCB</phrase>"
 
-#: login.defs.5.xml:403(para)
+#: login.defs.5.xml:406(para)
 msgid ""
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">USE_TCB</"
 "phrase>"
@@ -5750,7 +5937,7 @@
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"tcb\">USE_TCB</"
 "phrase>"
 
-#: login.defs.5.xml:420(para)
+#: login.defs.5.xml:423(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH "
@@ -5766,15 +5953,15 @@
 "\"no_pam\">SU_WHEEL_ONLY</phrase> SYSLOG_SU_ENAB <phrase condition=\"no_pam"
 "\">USERGROUPS_ENAB</phrase>"
 
-#: login.defs.5.xml:435(term)
+#: login.defs.5.xml:438(term)
 msgid "sulogin"
 msgstr "sulogin"
 
-#: login.defs.5.xml:437(para)
+#: login.defs.5.xml:440(para)
 msgid "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 msgstr "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 
-#: login.defs.5.xml:446(para)
+#: login.defs.5.xml:449(para)
 msgid ""
 "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 "
@@ -5786,7 +5973,7 @@
 "UID_MAX UID_MIN UMASK <phrase condition=\"tcb\">TCB_AUTH_GROUP TCB_SYMLINK "
 "USE_TCB</phrase>"
 
-#: login.defs.5.xml:460(para)
+#: login.defs.5.xml:463(para)
 msgid ""
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB <phrase "
 "condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
@@ -5794,7 +5981,7 @@
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB <phrase "
 "condition=\"tcb\">TCB_SYMLINKS USE_TCB</phrase>"
 
-#: login.defs.5.xml:470(para)
+#: login.defs.5.xml:473(para)
 msgid ""
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP <phrase condition=\"tcb"
 "\">TCB_SYMLINKS USE_TCB</phrase>"
@@ -5802,7 +5989,7 @@
 "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP <phrase condition=\"tcb"
 "\">TCB_SYMLINKS USE_TCB</phrase>"
 
-#: login.defs.5.xml:489(para)
+#: login.defs.5.xml:492(para)
 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 "
@@ -5814,7 +6001,7 @@
 "corresponding PAM configuration files instead."
 msgstr ""
 
-#: login.defs.5.xml:505(para)
+#: login.defs.5.xml:508(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5836,22 +6023,22 @@
 "citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
+#: login.access.5.xml:39(refentrytitle) login.access.5.xml:46(refname)
 msgid "login.access"
 msgstr "login.access"
 
-#: login.access.5.xml:41(refpurpose)
+#: login.access.5.xml:47(refpurpose)
 msgid "login access control table"
 msgstr "登录访问控制表"
 
-#: login.access.5.xml:46(para)
+#: login.access.5.xml:52(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:52(para)
+#: login.access.5.xml:58(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, "
@@ -5860,13 +6047,13 @@
 "whether the login will be accepted or refused."
 msgstr ""
 
-#: login.access.5.xml:60(para)
+#: login.access.5.xml:66(para)
 msgid ""
 "Each line of the login access control table has three fields separated by a "
 "\":\" character:"
 msgstr "登录访问控制表的每一行有“:”分隔的三个字段："
 
-#: login.access.5.xml:65(para)
+#: login.access.5.xml:71(para)
 msgid ""
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
 "emphasis>:<emphasis remap=\"I\">origins</emphasis>"
@@ -5874,7 +6061,7 @@
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
 "emphasis>:<emphasis remap=\"I\">origins</emphasis>"
 
-#: login.access.5.xml:69(para)
+#: login.access.5.xml:75(para)
 msgid ""
 "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or "
 "\"<emphasis>-</emphasis>\" (access denied) character. The second field "
@@ -5888,50 +6075,50 @@
 "@netgroupname in host or user patterns."
 msgstr ""
 
-#: login.access.5.xml:83(para)
+#: login.access.5.xml:89(para)
 msgid ""
 "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
 "compact rules."
 msgstr "<emphasis>EXCEPT</emphasis> 操作符让编写非常复杂的规则，成为可能。"
 
-#: login.access.5.xml:88(para)
+#: login.access.5.xml:94(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:76(refpurpose)
+#: login.1.xml:79(refpurpose)
 msgid "begin session on the system"
 msgstr "在系统上启动回话"
 
-#: 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)
+#: login.1.xml:85(arg) login.1.xml:93(arg) login.1.xml:100(arg)
+#: login.1.xml:217(option) groupmems.8.xml:57(arg)
 msgid "-p"
 msgstr "-p"
 
-#: login.1.xml:83(replaceable) login.1.xml:91(replaceable)
-#: login.1.xml:98(replaceable)
+#: login.1.xml:86(replaceable) login.1.xml:94(replaceable)
+#: login.1.xml:101(replaceable)
 msgid "host"
 msgstr "主机"
 
-#: login.1.xml:83(arg) login.1.xml:91(arg) chfn.1.xml:56(arg)
+#: login.1.xml:86(arg) login.1.xml:94(arg)
 msgid "-h <placeholder-1/>"
 msgstr "-h <placeholder-1/>"
 
-#: login.1.xml:86(replaceable)
+#: login.1.xml:89(replaceable)
 msgid "ENV=VAR"
 msgstr "ENV=VAR"
 
-#: login.1.xml:92(arg) login.1.xml:192(option) expiry.1.xml:54(arg)
+#: login.1.xml:95(arg) login.1.xml:195(option)
 msgid "-f"
 msgstr "-f"
 
-#: login.1.xml:98(arg) chfn.1.xml:54(arg)
+#: login.1.xml:101(arg)
 msgid "-r <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
-#: login.1.xml:104(para)
+#: login.1.xml:107(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 "
@@ -5945,7 +6132,7 @@
 "produce an error message."
 msgstr ""
 
-#: login.1.xml:118(para)
+#: login.1.xml:121(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 "
@@ -5953,7 +6140,7 @@
 "communications link is severed."
 msgstr ""
 
-#: login.1.xml:125(para)
+#: login.1.xml:128(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 "
@@ -5962,7 +6149,7 @@
 "citerefentry> for more information."
 msgstr ""
 
-#: login.1.xml:134(para)
+#: login.1.xml:137(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 "
@@ -5973,7 +6160,7 @@
 "the condition of your mailbox."
 msgstr ""
 
-#: login.1.xml:145(para)
+#: login.1.xml:148(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>, "
@@ -5983,14 +6170,14 @@
 "entries in the GECOS field."
 msgstr ""
 
-#: login.1.xml:154(para)
+#: login.1.xml:157(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:160(para)
+#: login.1.xml:163(para)
 msgid ""
 "An initialization script for your command interpreter may also be executed. "
 "Please see the appropriate manual section for more information on this "
@@ -5999,7 +6186,7 @@
 "命令解释器的初始化脚本也可能执行。请参考手册中相应的章节来获取关于此功能的更"
 "多信息。"
 
-#: login.1.xml:172(para) login.1.xml:248(para)
+#: login.1.xml:175(para) login.1.xml:251(para)
 msgid ""
 "The <command>login</command> program is NOT responsible for removing users "
 "from the utmp file. It is the responsibility of "
@@ -6012,31 +6199,35 @@
 "\"."
 msgstr ""
 
-#: login.1.xml:195(para)
+#: login.1.xml:198(para)
 msgid "Do not perform authentication, user is preauthenticated."
 msgstr "不要执行认证，用户已经预认证过。"
 
-#: login.1.xml:198(para)
+#: login.1.xml:201(para)
 msgid "Note: In that case, <replaceable>username</replaceable> is mandatory."
 msgstr "注意：此时，<replaceable>username</replaceable> 是强制的。"
 
-#: login.1.xml:206(option)
+#: login.1.xml:209(option)
 msgid "-h"
 msgstr "-h"
 
-#: login.1.xml:209(para)
+#: login.1.xml:212(para)
 msgid "Name of the remote host for this login."
 msgstr "此登录的远程主机名。"
 
-#: login.1.xml:217(para)
+#: login.1.xml:220(para)
 msgid "Preserve environment."
 msgstr "保留环境。"
 
-#: login.1.xml:225(para)
+#: login.1.xml:225(option)
+msgid "-r"
+msgstr "-r"
+
+#: login.1.xml:228(para)
 msgid "Perform autologin protocol for rlogin."
 msgstr "为 rlogin (远程登录)执行 autologin (自动登录)协议。"
 
-#: login.1.xml:230(para)
+#: login.1.xml:233(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."
@@ -6044,7 +6235,7 @@
 "<option>-r</option>, <option>-h</option> and <option>-f</option> 只能用于 "
 "root 使用 <command>login</command> 时。"
 
-#: login.1.xml:239(para)
+#: login.1.xml:242(para)
 msgid ""
 "This version of <command>login</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -6052,12 +6243,12 @@
 "此版本的 <command>login</command> 有很多编译选项，只有一部分可以在任何站点使"
 "用。"
 
-#: login.1.xml:244(para)
+#: login.1.xml:247(para)
 msgid ""
 "The location of files is subject to differences in system configuration."
 msgstr "文件的位置由系统配置决定。"
 
-#: login.1.xml:260(para)
+#: login.1.xml:263(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 "
@@ -6066,47 +6257,47 @@
 "trusted path and prevent this kind of attack."
 msgstr ""
 
-#: login.1.xml:325(filename)
+#: login.1.xml:328(filename)
 msgid "/var/log/wtmp"
 msgstr "/var/log/wtmp"
 
-#: login.1.xml:327(para)
+#: login.1.xml:330(para)
 msgid "List of previous login sessions."
 msgstr "先前的登录会话列表。"
 
-#: login.1.xml:343(filename)
+#: login.1.xml:346(filename)
 msgid "/etc/motd"
 msgstr "/etc/motd"
 
-#: login.1.xml:345(para)
+#: login.1.xml:348(para)
 msgid "System message of the day file."
 msgstr ""
 
-#: login.1.xml:349(filename)
+#: login.1.xml:352(filename)
 msgid "/etc/nologin"
 msgstr "/etc/nologin"
 
-#: login.1.xml:351(para)
+#: login.1.xml:354(para)
 msgid "Prevent non-root users from logging in."
 msgstr "阻止非 root 用户登录。"
 
-#: login.1.xml:355(filename)
+#: login.1.xml:358(filename)
 msgid "/etc/ttytype"
 msgstr "/etc/ttytype"
 
-#: login.1.xml:357(para)
+#: login.1.xml:360(para)
 msgid "List of terminal types."
 msgstr "终端类型列表。"
 
-#: login.1.xml:361(filename)
+#: login.1.xml:364(filename)
 msgid "$HOME/.hushlogin"
 msgstr "$HOME/.hushlogin"
 
-#: login.1.xml:363(para)
+#: login.1.xml:366(para)
 msgid "Suppress printing of system messages."
 msgstr "阻止现实系统信息。"
 
-#: login.1.xml:377(para)
+#: login.1.xml:380(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -6136,15 +6327,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getty</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
+#: limits.5.xml:39(refentrytitle) limits.5.xml:46(refname)
 msgid "limits"
 msgstr "limits"
 
-#: limits.5.xml:41(refpurpose)
+#: limits.5.xml:47(refpurpose)
 msgid "resource limits definition"
 msgstr "资源限制描述"
 
-#: limits.5.xml:47(para)
+#: limits.5.xml:53(para)
 msgid ""
 "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</"
 "filename> by default or LIMITS_FILE defined <filename>config.h</filename>) "
@@ -6152,29 +6343,29 @@
 "and readable by root account only."
 msgstr ""
 
-#: limits.5.xml:55(para)
+#: limits.5.xml:61(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:61(para)
+#: limits.5.xml:67(para)
 msgid "Each line describes a limit for a user in the form:"
 msgstr "每行以如下格式对一个用户描述限制："
 
-#: limits.5.xml:64(emphasis)
+#: limits.5.xml:70(emphasis)
 msgid "user LIMITS_STRING"
 msgstr "user LIMITS_STRING"
 
-#: limits.5.xml:67(para)
+#: limits.5.xml:73(para)
 msgid "or in the form:"
 msgstr "或如下格式："
 
-#: limits.5.xml:70(emphasis)
+#: limits.5.xml:76(emphasis)
 msgid "@group LIMITS_STRING"
 msgstr "@group LIMITS_STRING"
 
-#: limits.5.xml:73(para)
+#: limits.5.xml:79(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 "
@@ -6183,50 +6374,26 @@
 "<emphasis>LIMITS_STRING</emphasis> 是一个串联的资源限制列表。每条限制由一个字"
 "母指示符和跟随的数字限制组成。"
 
-#: limits.5.xml:79(para)
+#: limits.5.xml:85(para)
 msgid "The valid identifiers are:"
 msgstr "可用的指示符有："
 
-#: limits.5.xml:82(para)
+#: limits.5.xml:88(para)
 msgid "A: max address space (KB)"
 msgstr "A：最大地址空间 (KB)"
 
-#: limits.5.xml:83(para)
+#: limits.5.xml:89(para)
 msgid "C: max core file size (KB)"
 msgstr "C：最大转储文件大小 (KB)"
 
-#: limits.5.xml:84(para)
+#: limits.5.xml:90(para)
 msgid "D: max data size (KB)"
 msgstr "D：最大数据大小 (KB)"
 
-#: limits.5.xml:85(para)
+#: limits.5.xml:91(para)
 msgid "F: maximum filesize (KB)"
 msgstr "F：最大文件尺寸 (KB)"
 
-#: limits.5.xml:86(para)
-msgid "M: max locked-in-memory address space (KB)"
-msgstr ""
-
-#: limits.5.xml:87(para)
-msgid "N: max number of open files"
-msgstr "N：最大的文件打开数"
-
-#: limits.5.xml:88(para)
-msgid "R: max resident set size (KB)"
-msgstr ""
-
-#: limits.5.xml:89(para)
-msgid "S: max stack size (KB)"
-msgstr "S：最大栈尺寸 (KB)"
-
-#: limits.5.xml:90(para)
-msgid "T: max CPU time (MIN)"
-msgstr "T：最大 CPU 时间 (分钟)"
-
-#: limits.5.xml:91(para)
-msgid "U: max number of processes"
-msgstr "U：最大处理器数目"
-
 #: limits.5.xml:92(para)
 msgid ""
 "K: file creation mask, set by <citerefentry><refentrytitle>umask</"
@@ -6236,10 +6403,26 @@
 "refentrytitle><manvolnum>2</manvolnum></citerefentry> 设置。"
 
 #: limits.5.xml:97(para)
+msgid "I: max nice value (0..39 which translates to 20..-19)"
+msgstr "I：最高 nice 级别，(0...39 对应 20...-19)"
+
+#: limits.5.xml:99(para)
 msgid "L: max number of logins for this user"
 msgstr "L：此用户的最大登录数"
 
-#: limits.5.xml:98(para)
+#: limits.5.xml:100(para)
+msgid "M: max locked-in-memory address space (KB)"
+msgstr ""
+
+#: limits.5.xml:101(para)
+msgid "N: max number of open files"
+msgstr "N：最大的文件打开数"
+
+#: limits.5.xml:102(para)
+msgid "O: max real time priority"
+msgstr "O：最大实时优先级"
+
+#: limits.5.xml:103(para)
 msgid ""
 "P: process priority, set by <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
@@ -6247,15 +6430,23 @@
 "P：进程优先级，由 <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry> 设置。"
 
-#: limits.5.xml:103(para)
-msgid "I: max nice value (0..39 which translates to 20..-19)"
-msgstr "I：最高 nice 级别，(0...39 对应 20...-19)"
+#: limits.5.xml:108(para)
+msgid "R: max resident set size (KB)"
+msgstr ""
 
-#: limits.5.xml:105(para)
-msgid "O: max real time priority"
-msgstr "O：最大实时优先级"
+#: limits.5.xml:109(para)
+msgid "S: max stack size (KB)"
+msgstr "S：最大栈尺寸 (KB)"
 
-#: limits.5.xml:108(para)
+#: limits.5.xml:110(para)
+msgid "T: max CPU time (MIN)"
+msgstr "T：最大 CPU 时间 (分钟)"
+
+#: limits.5.xml:111(para)
+msgid "U: max number of processes"
+msgstr "U：最大处理器数目"
+
+#: limits.5.xml:114(para)
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
 "<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
@@ -6264,7 +6455,7 @@
 "例如，<emphasis remap=\"I\">L2D2048N5</emphasis> 就是有效的 "
 "<emphasis>LIMITS_STRING</emphasis>。为了阅读方便，如下项表示同样的意思："
 
-#: limits.5.xml:114(programlisting)
+#: limits.5.xml:120(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -6277,7 +6468,7 @@
 "      username L2 D2048 N5\n"
 "    "
 
-#: limits.5.xml:119(para)
+#: limits.5.xml:125(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 "
@@ -6285,7 +6476,7 @@
 "<command>login</command> program."
 msgstr ""
 
-#: limits.5.xml:126(para)
+#: limits.5.xml:132(para)
 msgid ""
 "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
 "have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
@@ -6293,50 +6484,50 @@
 "default entry."
 msgstr ""
 
-#: limits.5.xml:133(para)
+#: limits.5.xml:139(para)
 msgid ""
 "The limits specified in the form \"<replaceable>@group</replaceable>\" apply "
 "to the members of the specified <replaceable>group</replaceable>."
 msgstr ""
 
-#: limits.5.xml:139(para)
+#: limits.5.xml:145(para)
 msgid ""
-"If a line with limits for an user exist, only the first line for this user "
-"will be considered."
+"If more than one line with limits for an user exist, only the first line for "
+"this user will be considered."
 msgstr ""
 
-#: limits.5.xml:144(para)
+#: limits.5.xml:150(para)
 msgid ""
 "If no lines are specified for an user, the last <replaceable>@group</"
 "replaceable> line matching a group whose the user is a member of will be "
-"conisdered, or the last line with default limits if no groups contain the "
-"user)."
+"considered, or the last line with default limits if no groups contain the "
+"user."
 msgstr ""
 
-#: limits.5.xml:151(para)
+#: limits.5.xml:157(para)
 msgid ""
 "To completely disable limits for a user, a single dash \"<emphasis>-</"
 "emphasis>\" will do."
 msgstr "要完全禁用对一个用户的限制，可以仅仅只使用一个短线“-”。"
 
-#: limits.5.xml:156(para)
+#: limits.5.xml:162(para)
 msgid ""
 "To disable a limit for a user, a single dash \"<replaceable>-</replaceable>"
 "\" can be used instead of the numerical value for this limit."
 msgstr ""
 
-#: limits.5.xml:162(para)
+#: limits.5.xml:168(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:173(filename)
+#: limits.5.xml:179(filename)
 msgid "/etc/limits"
 msgstr "/etc/limits"
 
-#: limits.5.xml:181(para)
+#: limits.5.xml:187(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>setpriority</"
@@ -6350,16 +6541,16 @@
 "<citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
-#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname)
-#: lastlog.8.xml:46(command)
+#: lastlog.8.xml:39(refentrytitle) lastlog.8.xml:46(refname)
+#: lastlog.8.xml:52(command)
 msgid "lastlog"
 msgstr "lastlog"
 
-#: lastlog.8.xml:41(refpurpose)
+#: lastlog.8.xml:47(refpurpose)
 msgid "reports the most recent login of all users or of a given user"
 msgstr "报告所有用户的最近登录情况，或者指定用户的最近登录情况"
 
-#: lastlog.8.xml:55(para)
+#: lastlog.8.xml:61(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</"
@@ -6368,34 +6559,34 @@
 "be printed, sorted by their order in <filename>/etc/passwd</filename>."
 msgstr ""
 
-#: lastlog.8.xml:67(para)
+#: lastlog.8.xml:73(para)
 msgid "The options which apply to the <command>lastlog</command> command are:"
 msgstr "<command>lastlog</command> 命令可以接受的选项有："
 
-#: lastlog.8.xml:72(term)
+#: lastlog.8.xml:78(term)
 msgid ""
 "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 
-#: lastlog.8.xml:76(para)
+#: lastlog.8.xml:82(para)
 msgid ""
 "Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
 msgstr "只显示老于 <emphasis remap=\"I\">DAYS</emphasis> 的最近登录记录。"
 
-#: lastlog.8.xml:90(term) faillog.8.xml:157(term)
+#: lastlog.8.xml:109(term) faillog.8.xml:176(term)
 msgid ""
 "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
 
-#: lastlog.8.xml:95(para)
+#: lastlog.8.xml:114(para)
 msgid ""
 "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
 "emphasis>."
 msgstr "只现实新于 <emphasis remap=\"I\">DAYS</emphasis> 的最近登录记录。"
 
-#: lastlog.8.xml:102(term) faillog.8.xml:168(term)
+#: lastlog.8.xml:121(term) faillog.8.xml:187(term)
 msgid ""
 "<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>|"
 "<replaceable>RANGE</replaceable>"
@@ -6403,11 +6594,11 @@
 "<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>|"
 "<replaceable>RANGE</replaceable>"
 
-#: lastlog.8.xml:107(para)
+#: lastlog.8.xml:126(para)
 msgid "Print the lastlog record of the specified user(s)."
 msgstr "现实指定用户的最近登录记录。"
 
-#: lastlog.8.xml:110(para) faillog.8.xml:178(para)
+#: lastlog.8.xml:129(para) faillog.8.xml:197(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</"
@@ -6416,7 +6607,7 @@
 "UID_MAX</replaceable>), or a min value (<replaceable>UID_MIN-</replaceable>)."
 msgstr ""
 
-#: lastlog.8.xml:122(para)
+#: lastlog.8.xml:141(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."
@@ -6424,18 +6615,18 @@
 "如果用户从来没有登录过，将会显示 <emphasis>** 从未登录 **</emphasis> 而不是端"
 "口和时间。"
 
-#: lastlog.8.xml:127(para)
+#: lastlog.8.xml:146(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:197(title)
+#: lastlog.8.xml:154(title) groups.1.xml:71(title) chsh.1.xml:122(title)
+#: chage.1.xml:213(title)
 msgid "NOTE"
 msgstr "注意"
 
-#: lastlog.8.xml:136(para)
+#: lastlog.8.xml:155(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, "
@@ -6445,15 +6636,15 @@
 "its real size with \"<command>ls -s</command>\"."
 msgstr ""
 
-#: lastlog.8.xml:150(filename)
+#: lastlog.8.xml:169(filename)
 msgid "/var/log/lastlog"
 msgstr "/var/log/lastlog"
 
-#: lastlog.8.xml:152(para)
+#: lastlog.8.xml:171(para)
 msgid "Database times of previous user logins."
 msgstr ""
 
-#: lastlog.8.xml:160(para)
+#: lastlog.8.xml:179(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 "
@@ -6461,33 +6652,33 @@
 "processes entries with UIDs 171-799)."
 msgstr ""
 
-#: gshadow.5.xml:33(refentrytitle) gshadow.5.xml:38(refname)
+#: gshadow.5.xml:37(refentrytitle) gshadow.5.xml:44(refname)
 msgid "gshadow"
 msgstr "gshadow"
 
-#: gshadow.5.xml:39(refpurpose)
+#: gshadow.5.xml:45(refpurpose)
 msgid "shadowed group file"
 msgstr "影子化了的组文件"
 
-#: gshadow.5.xml:44(para)
+#: gshadow.5.xml:50(para)
 msgid ""
 "<filename>/etc/gshadow</filename> contains the shadowed information for "
 "group accounts."
 msgstr "<filename>/etc/gshadow</filename> 包含影子化了的组账户信息。"
 
-#: gshadow.5.xml:54(para)
+#: gshadow.5.xml:60(para)
 msgid "Each line of this file contains the following colon-separated fields:"
 msgstr "此文件的每行包含逗号分隔的如下字段："
 
-#: gshadow.5.xml:60(emphasis)
+#: gshadow.5.xml:66(emphasis)
 msgid "group name"
 msgstr "组名"
 
-#: gshadow.5.xml:62(para)
+#: gshadow.5.xml:68(para)
 msgid "It must be a valid group name, which exist on the system."
 msgstr "必须是系统中已经存在的有效组。"
 
-#: gshadow.5.xml:75(para)
+#: gshadow.5.xml:81(para)
 msgid ""
 "If the password field contains some string that is not a valid result of "
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
@@ -6495,7 +6686,7 @@
 "password to access the group (but group members do not need the password)."
 msgstr ""
 
-#: gshadow.5.xml:82(para)
+#: gshadow.5.xml:88(para)
 msgid ""
 "The password is used when an user who is not a member of the group wants to "
 "gain the permissions of this group (see <citerefentry><refentrytitle>newgrp</"
@@ -6505,49 +6696,49 @@
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> )。"
 
-#: gshadow.5.xml:88(para)
+#: gshadow.5.xml:94(para)
 msgid ""
 "This field may be empty, in which case only the group members can gain the "
 "group permissions."
 msgstr "此字段可以为空，此时，只有组成员可以获取组权限。"
 
-#: gshadow.5.xml:98(para)
+#: gshadow.5.xml:104(para)
 msgid ""
 "This password supersedes any password specified in <filename>/etc/group</"
 "filename>."
 msgstr "此密码取代 <filename>/etc/group</filename> 中指定的任何密码。"
 
-#: gshadow.5.xml:106(emphasis)
+#: gshadow.5.xml:112(emphasis)
 msgid "administrators"
 msgstr "管理员"
 
-#: gshadow.5.xml:108(para) gshadow.5.xml:124(para)
+#: gshadow.5.xml:114(para) gshadow.5.xml:130(para)
 msgid "It must be a comma-separated list of user names."
 msgstr "必须是一个逗号分隔的用户名列表。"
 
-#: gshadow.5.xml:111(para)
+#: gshadow.5.xml:117(para)
 msgid "Administrators can change the password or the members of the group."
 msgstr "管理员可以更改组密码和成员。"
 
-#: gshadow.5.xml:115(para)
+#: gshadow.5.xml:121(para)
 msgid ""
 "Administrators also have the same permissions as the members (see below)."
 msgstr "管理员也有成员一样的权限(请看下边)。"
 
-#: gshadow.5.xml:122(emphasis)
+#: gshadow.5.xml:128(emphasis)
 msgid "members"
 msgstr "成员"
 
-#: gshadow.5.xml:127(para)
+#: gshadow.5.xml:133(para)
 msgid "Members can access the group without being prompted for a password."
 msgstr "成员可以免密码访问组。"
 
-#: gshadow.5.xml:131(para)
+#: gshadow.5.xml:137(para)
 msgid ""
 "You should use the same list of users as in <filename>/etc/group</filename>."
 msgstr ""
 
-#: gshadow.5.xml:160(para)
+#: gshadow.5.xml:166(para)
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
@@ -6567,11 +6758,11 @@
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: grpck.8.xml:44(refpurpose)
+#: grpck.8.xml:47(refpurpose)
 msgid "verify integrity of group files"
 msgstr "检查组文件的完整性"
 
-#: grpck.8.xml:70(para)
+#: grpck.8.xml:65(para)
 msgid ""
 "The <command>grpck</command> command verifies the integrity of the groups "
 "information. It checks that all entries in <filename>/etc/group</"
@@ -6581,11 +6772,11 @@
 "other uncorrectable errors."
 msgstr ""
 
-#: grpck.8.xml:87(para)
+#: grpck.8.xml:82(para)
 msgid "a unique and valid group name"
 msgstr "一个唯一且有效的组名"
 
-#: grpck.8.xml:90(para)
+#: grpck.8.xml:85(para)
 msgid ""
 "a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/"
 "group</filename> only)</phrase>"
@@ -6593,20 +6784,20 @@
 "有效的组标识符 <phrase condition=\"gshadow\"> (仅 <filename>/etc/group</"
 "filename>)</phrase>"
 
-#: grpck.8.xml:97(para)
+#: grpck.8.xml:92(para)
 msgid ""
 "a valid list of members <phrase condition=\"gshadow\"> and administrators</"
 "phrase>"
 msgstr "有效的成员和 <phrase condition=\"gshadow\">管理员</phrase> 列表。"
 
-#: grpck.8.xml:103(para)
+#: grpck.8.xml:98(para)
 msgid ""
 "a corresponding entry in the <filename>/etc/gshadow</filename> file "
 "(respectively <filename>/etc/group</filename> for the <filename>gshadow</"
 "filename> checks)"
 msgstr ""
 
-#: grpck.8.xml:111(para)
+#: grpck.8.xml:106(para)
 msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
 "an entry has the wrong number of fields, the user will be prompted to delete "
@@ -6617,7 +6808,7 @@
 "command to correct the error."
 msgstr ""
 
-#: grpck.8.xml:122(para)
+#: grpck.8.xml:117(para)
 msgid ""
 "The commands which operate on the <filename>/etc/group</filename><phrase "
 "condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
@@ -6626,18 +6817,18 @@
 "those circumstances to remove the offending entries."
 msgstr ""
 
-#: grpck.8.xml:134(para)
+#: grpck.8.xml:133(para)
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr "<command>grpck</command> 可以接受的选项有："
 
-#: grpck.8.xml:141(para)
+#: grpck.8.xml:146(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:151(para)
+#: grpck.8.xml:169(para)
 msgid ""
 "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
 "\">and <filename>/etc/gshadow</filename></phrase> by GID."
@@ -6645,7 +6836,7 @@
 "根据 GID 在 <filename>/etc/group</filename><phrase condition=\"gshadow\"> 和 "
 "<filename>/etc/gshadow</filename></phrase> 中进行排序。"
 
-#: grpck.8.xml:160(para)
+#: grpck.8.xml:178(para)
 msgid ""
 "By default, <command>grpck</command> operates on <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</"
@@ -6655,29 +6846,29 @@
 "emphasis> parameters.</phrase>"
 msgstr ""
 
-#: grpck.8.xml:228(para)
+#: grpck.8.xml:246(para)
 msgid "one or more bad group entries"
 msgstr "一个或多个坏掉的组条目"
 
-#: grpck.8.xml:234(para)
+#: grpck.8.xml:252(para)
 msgid "can't open group files"
 msgstr "无法打开组文件"
 
-#: grpck.8.xml:240(para)
+#: grpck.8.xml:258(para)
 msgid "can't lock group files"
 msgstr "无法锁定组文件"
 
-#: grpck.8.xml:246(para)
+#: grpck.8.xml:264(para)
 msgid "can't update group files"
 msgstr "无法更新组文件"
 
-#: grpck.8.xml:210(para)
+#: grpck.8.xml:228(para)
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
 "<placeholder-1/>"
 msgstr "<command>grpck</command> 可以返回如下值：<placeholder-1/>"
 
-#: grpck.8.xml:255(para)
+#: grpck.8.xml:273(para)
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>groupmod</"
@@ -6701,20 +6892,20 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
-#: groups.1.xml:45(command)
+#: groups.1.xml:38(refentrytitle) groups.1.xml:45(refname)
+#: groups.1.xml:51(command)
 msgid "groups"
 msgstr "groups"
 
-#: groups.1.xml:40(refpurpose)
+#: groups.1.xml:46(refpurpose)
 msgid "display current group names"
 msgstr "现实当前组名"
 
-#: groups.1.xml:47(replaceable) chfn.1.xml:58(replaceable)
+#: groups.1.xml:53(replaceable)
 msgid "user"
 msgstr "用户"
 
-#: groups.1.xml:54(para)
+#: groups.1.xml:60(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/"
@@ -6723,15 +6914,15 @@
 "the groups for the named <emphasis remap=\"I\">user</emphasis>."
 msgstr ""
 
-#: groups.1.xml:66(para)
+#: groups.1.xml:72(para)
 msgid ""
 "Systems which do not support concurrent group sets will have the information "
 "from <filename>/etc/group</filename> reported. The user must use "
-"<command>newgrp</command> or <command>sg</command> to change their current "
+"<command>newgrp</command> or <command>sg</command> to change his current "
 "real and effective group ID."
 msgstr ""
 
-#: groups.1.xml:88(para)
+#: groups.1.xml:94(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getgid</"
@@ -6747,51 +6938,57 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getuid</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
-#: groupmod.8.xml:44(refpurpose)
+#: groupmod.8.xml:47(refpurpose)
 msgid "modify a group definition on the system"
 msgstr ""
 
-#: groupmod.8.xml:53(replaceable)
+#: groupmod.8.xml:56(replaceable) groupdel.8.xml:56(replaceable)
 msgid "GROUP"
 msgstr "GROUP"
 
-#: groupmod.8.xml:59(para)
+#: groupmod.8.xml:62(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:68(para)
+#: groupmod.8.xml:71(para)
 msgid "The options which apply to the <command>groupmod</command> command are:"
 msgstr "<command>groupmod</command> 命令可以接受的选项有："
 
-#: groupmod.8.xml:74(term) groupadd.8.xml:93(term)
+#: groupmod.8.xml:77(term) groupadd.8.xml:95(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
-#: groupmod.8.xml:78(para)
+#: groupmod.8.xml:81(para)
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
 "to <replaceable>GID</replaceable>."
 msgstr ""
 
-#: groupmod.8.xml:82(para)
+#: groupmod.8.xml:85(para)
 msgid ""
 "The value of <replaceable>GID</replaceable> must be a non-negative decimal "
 "integer. This value must be unique, unless the <option>-o</option> option is "
 "used. Values between 0 and 999 are typically reserved for system groups."
 msgstr ""
 
-#: groupmod.8.xml:89(para)
+#: groupmod.8.xml:92(para)
 msgid ""
+"Users who use the group as primary group will be updated to keep the group "
+"as their primary group."
+msgstr ""
+
+#: groupmod.8.xml:96(para)
+msgid ""
 "Any files that have the old group ID and must continue to belong to "
 "<replaceable>GROUP</replaceable>, must have their group ID changed manually."
 msgstr ""
 
-#: groupmod.8.xml:104(term)
+#: groupmod.8.xml:111(term)
 msgid ""
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
@@ -6799,29 +6996,29 @@
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
 
-#: groupmod.8.xml:109(para)
+#: groupmod.8.xml:116(para)
 msgid ""
 "The name of the group will be changed from <replaceable>GROUP</replaceable> "
 "to <replaceable>NEW_GROUP</replaceable> name."
 msgstr ""
 
-#: groupmod.8.xml:120(para)
+#: groupmod.8.xml:127(para)
 msgid ""
 "When used with the <option>-g</option> option, allow to change the group "
 "<replaceable>GID</replaceable> to a non-unique value."
 msgstr ""
 
-#: groupmod.8.xml:219(para)
+#: groupmod.8.xml:245(para)
 msgid "group name already in use"
 msgstr "组名已经在使用"
 
-#: groupmod.8.xml:183(para)
+#: groupmod.8.xml:209(para)
 msgid ""
 "The <command>groupmod</command> command exits with the following values: "
 "<placeholder-1/>"
 msgstr "<command>groupmod</command> 命令可以返回如下值：<placeholder-1/>"
 
-#: groupmod.8.xml:234(para)
+#: groupmod.8.xml:260(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6853,35 +7050,35 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: groupmems.8.xml:44(refpurpose)
+#: groupmems.8.xml:47(refpurpose)
 msgid "administer members of a user's primary group"
 msgstr "用户主组的管理员成员"
 
-#: groupmems.8.xml:51(replaceable) groupmems.8.xml:52(replaceable)
+#: groupmems.8.xml:54(replaceable) groupmems.8.xml:55(replaceable)
 msgid "user_name"
 msgstr "user_name"
 
-#: groupmems.8.xml:51(arg)
+#: groupmems.8.xml:54(arg)
 msgid "-a <placeholder-1/>"
 msgstr "-a <placeholder-1/>"
 
-#: groupmems.8.xml:52(arg)
+#: groupmems.8.xml:55(arg)
 msgid "-d <placeholder-1/>"
 msgstr "-d <placeholder-1/>"
 
-#: groupmems.8.xml:53(replaceable)
+#: groupmems.8.xml:56(replaceable)
 msgid "group_name"
 msgstr "group_name"
 
-#: groupmems.8.xml:53(arg)
+#: groupmems.8.xml:56(arg)
 msgid "-g <placeholder-1/>"
 msgstr "-g <placeholder-1/>"
 
-#: groupmems.8.xml:54(arg)
+#: groupmems.8.xml:57(arg)
 msgid "-l"
 msgstr "-l"
 
-#: groupmems.8.xml:61(para)
+#: groupmems.8.xml:64(para)
 msgid ""
 "The <command>groupmems</command> command allows a user to administer his/her "
 "own group membership list without the requirement of superuser privileges. "
@@ -6889,18 +7086,18 @@
 "users to be in their own name sake primary group (i.e., guest / guest)."
 msgstr ""
 
-#: groupmems.8.xml:69(para)
+#: groupmems.8.xml:72(para)
 msgid ""
 "Only the superuser, as administrator, can use <command>groupmems</command> "
 "to alter the memberships of other groups."
 msgstr ""
 
-#: groupmems.8.xml:76(para)
+#: groupmems.8.xml:79(para)
 msgid ""
 "The options which apply to the <command>groupmems</command> command are:"
 msgstr "<command>groupmems</command> 命令可以接受的选项有："
 
-#: groupmems.8.xml:82(term)
+#: groupmems.8.xml:85(term)
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user_name</"
 "replaceable>"
@@ -6908,19 +7105,19 @@
 "<option>-a</option>, <option>--add</option><replaceable>user_name</"
 "replaceable>"
 
-#: groupmems.8.xml:84(para)
+#: groupmems.8.xml:87(para)
 msgid "Add an user to the group membership list."
 msgstr "将一个用户添加到组成员列表。"
 
-#: groupmems.8.xml:85(para) groupmems.8.xml:101(para)
-#: groupmems.8.xml:132(para)
+#: groupmems.8.xml:88(para) groupmems.8.xml:104(para)
+#: groupmems.8.xml:135(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)
+#: groupmems.8.xml:96(term)
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user_name</"
 "replaceable>"
@@ -6928,11 +7125,11 @@
 "<option>-d</option>, <option>--delete</option><replaceable>user_name</"
 "replaceable>"
 
-#: groupmems.8.xml:95(para)
+#: groupmems.8.xml:98(para)
 msgid "Delete a user from the group membership list."
 msgstr "从组成员列表中删除用户。"
 
-#: groupmems.8.xml:96(para)
+#: groupmems.8.xml:99(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."
@@ -6940,7 +7137,7 @@
 "如果 <filename>/etc/gshadow</filename> 文件存在，用户将会被从组成员和管理员中"
 "移除。"
 
-#: groupmems.8.xml:109(term)
+#: groupmems.8.xml:112(term)
 msgid ""
 "<option>-g</option>, <option>--group</option><replaceable>group_name</"
 "replaceable>"
@@ -6948,31 +7145,31 @@
 "<option>-g</option>, <option>--group</option><replaceable>group_name</"
 "replaceable>"
 
-#: groupmems.8.xml:111(para)
+#: groupmems.8.xml:114(para)
 msgid "The superuser can specify which group membership list to modify."
 msgstr "超级用户可以指定修改哪个组的组成员列表。"
 
-#: groupmems.8.xml:123(term) chage.1.xml:132(term)
+#: groupmems.8.xml:126(term) chage.1.xml:135(term)
 msgid "<option>-l</option>, <option>--list</option>"
 msgstr "<option>-l</option>, <option>--list</option>"
 
-#: groupmems.8.xml:125(para)
+#: groupmems.8.xml:128(para)
 msgid "List the group membership list."
 msgstr "列出组成员。"
 
-#: groupmems.8.xml:129(term)
+#: groupmems.8.xml:132(term)
 msgid "<option>-p</option>, <option>--purge</option>"
 msgstr "<option>-p</option>, <option>--purge</option>"
 
-#: groupmems.8.xml:131(para)
+#: groupmems.8.xml:134(para)
 msgid "Purge all users from the group membership list."
 msgstr "从组成员列表中删除所有用户。"
 
-#: groupmems.8.xml:143(title)
+#: groupmems.8.xml:159(title)
 msgid "SETUP"
 msgstr ""
 
-#: groupmems.8.xml:144(para)
+#: groupmems.8.xml:160(para)
 msgid ""
 "The <command>groupmems</command> executable should be in mode <literal>2770</"
 "literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</"
@@ -6981,7 +7178,7 @@
 "utility to manage their own group membership list."
 msgstr ""
 
-#: groupmems.8.xml:153(programlisting)
+#: groupmems.8.xml:169(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -6998,11 +7195,11 @@
 "\t$ groupmems -g groups -a gk4\n"
 "    "
 
-#: groupmems.8.xml:185(para)
+#: groupmems.8.xml:201(para)
 msgid "secure group account information"
 msgstr "安全组账户信息"
 
-#: groupmems.8.xml:193(para)
+#: groupmems.8.xml:209(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7030,40 +7227,70 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: groupdel.8.xml:44(refpurpose)
+#: groupdel.8.xml:47(refpurpose)
 msgid "delete a group"
 msgstr "删除一个组"
 
-#: groupdel.8.xml:58(para)
+#: groupdel.8.xml:62(para)
+#, fuzzy
+#| msgid ""
+#| "The <command>userdel</command> command modifies the system account files, "
+#| "deleting all entries that refer to the user name <emphasis remap=\"I"
+#| "\">LOGIN</emphasis>. The named user must exist."
 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."
+"deleting all entries that refer to <replaceable>GROUP</replaceable>. The "
+"named group must exist."
 msgstr ""
+"<command>userdel</command> 修改系统账户文件，删除与用户名 <emphasis remap=\"I"
+"\">LOGIN</emphasis> 相关的所以项目。给出的用户名必须存在。"
 
-#: groupdel.8.xml:66(para)
+#: groupdel.8.xml:70(para)
+#, fuzzy
+#| msgid ""
+#| "The options which apply to the <command>groupmod</command> command are:"
+msgid "The options which apply to the <command>groupdel</command> command are:"
+msgstr "<command>groupmod</command> 命令可以接受的选项有："
+
+#: groupdel.8.xml:99(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:70(para)
+#: groupdel.8.xml:103(para)
 msgid ""
 "You should manually check all file systems to ensure that no files remain "
 "owned by this group."
 msgstr "您需要手动检查所有文件系统，以确保没有遗留的属于此组的文件。"
 
-#: groupdel.8.xml:132(para)
+#: groupdel.8.xml:165(para)
 msgid "can't remove user's primary group"
 msgstr "不能移除用户的主组"
 
-#: groupdel.8.xml:108(para)
+#: groupdel.8.xml:141(para)
 msgid ""
 "The <command>groupdel</command> command exits with the following values: "
 "<placeholder-1/>"
 msgstr "<command>groupdel</command> 命令以如下值退出：<placeholder-1/>"
 
-#: groupdel.8.xml:147(para)
+#: groupdel.8.xml:180(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>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7078,7 +7305,7 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7095,22 +7322,22 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>"
 
-#: groupadd.8.xml:47(refpurpose)
+#: groupadd.8.xml:49(refpurpose)
 msgid "create a new group"
 msgstr "创建一个新组"
 
-#: groupadd.8.xml:64(para)
+#: groupadd.8.xml:66(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:73(para)
+#: groupadd.8.xml:75(para)
 msgid "The options which apply to the <command>groupadd</command> command are:"
 msgstr "<command>groupadd</command> 命令可以接受的选项有："
 
-#: groupadd.8.xml:83(para)
+#: groupadd.8.xml:85(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 "
@@ -7118,7 +7345,7 @@
 "g</option> is turned off)."
 msgstr ""
 
-#: groupadd.8.xml:97(para)
+#: groupadd.8.xml:99(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 "
@@ -7127,13 +7354,13 @@
 "system accounts."
 msgstr ""
 
-#: groupadd.8.xml:117(para)
+#: groupadd.8.xml:119(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:122(para)
+#: groupadd.8.xml:124(para)
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option>-K </"
@@ -7143,22 +7370,22 @@
 "replaceable>=<replaceable>100</replaceable><option>-K </"
 "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: groupadd.8.xml:126(para)
+#: groupadd.8.xml:128(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:138(para)
+#: groupadd.8.xml:140(para)
 msgid "This option permits to add a group with a non-unique GID."
 msgstr "此选项允许添加一个使用非唯一 GID 的组。"
 
-#: groupadd.8.xml:170(para)
+#: groupadd.8.xml:172(para)
 msgid "Create a system group."
 msgstr "创建一个系统组。"
 
-#: groupadd.8.xml:173(para)
+#: groupadd.8.xml:175(para)
 msgid ""
 "The numeric identifiers of new system groups are chosen in the "
 "<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
@@ -7166,44 +7393,44 @@
 "<option>GID_MAX</option>."
 msgstr ""
 
-#: groupadd.8.xml:224(para)
+#: groupadd.8.xml:239(para)
 msgid ""
 "Groupnames must start with a lower case letter or an underscore, followed by "
 "lower case letters, digits, underscores, or dashes. They can end with a "
 "dollar sign. In regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 
-#: groupadd.8.xml:230(para)
+#: groupadd.8.xml:245(para)
 msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr "组名最长为 &GROUP_NAME_MAX_LENGTH; 个字符。"
 
-#: groupadd.8.xml:233(para)
+#: groupadd.8.xml:248(para)
 msgid ""
 "You may not add a NIS or LDAP group. This must be performed on the "
 "corresponding server."
 msgstr ""
 
-#: groupadd.8.xml:237(para)
+#: groupadd.8.xml:252(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:270(para)
+#: groupadd.8.xml:285(para)
 msgid "GID not unique (when <option>-o</option> not used)"
 msgstr "GID 不唯一 (没有使用 <option>-o</option>)"
 
-#: groupadd.8.xml:276(para)
+#: groupadd.8.xml:291(para)
 msgid "group name not unique"
 msgstr "组名不唯一"
 
-#: groupadd.8.xml:246(para)
+#: groupadd.8.xml:261(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
 msgstr "<command>groupadd</command> 可能以如下值退出：<placeholder-1/>"
 
-#: groupadd.8.xml:291(para)
+#: groupadd.8.xml:306(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7237,19 +7464,19 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:49(phrase)
+#: gpasswd.1.xml:52(phrase)
 msgid "administer <placeholder-1/>"
 msgstr "管理员 <placeholder-1/>"
 
-#: gpasswd.1.xml:52(phrase)
+#: gpasswd.1.xml:55(phrase)
 msgid "administer <placeholder-1/> and <placeholder-2/>"
 msgstr "管理员 <placeholder-1/> 和 <placeholder-2/>"
 
-#: gpasswd.1.xml:63(replaceable)
+#: gpasswd.1.xml:66(replaceable) expiry.1.xml:57(replaceable)
 msgid "option"
 msgstr "选项"
 
-#: gpasswd.1.xml:73(para)
+#: gpasswd.1.xml:76(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -7257,14 +7484,14 @@
 "\">administrators,</phrase> members and a password."
 msgstr ""
 
-#: gpasswd.1.xml:81(para)
+#: gpasswd.1.xml:84(para)
 msgid ""
 "System administrators can use the <option>-A</option> option to define group "
 "administrator(s) and the <option>-M</option> option to define members. They "
 "have all rights of group administrators and members."
 msgstr ""
 
-#: gpasswd.1.xml:86(para)
+#: gpasswd.1.xml:89(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -7272,46 +7499,46 @@
 "of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:93(para)
+#: gpasswd.1.xml:96(para)
 msgid ""
 "If a password is set the members can still use "
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> without a password, and non-members must supply the password."
 msgstr ""
 
-#: gpasswd.1.xml:101(title)
+#: gpasswd.1.xml:104(title)
 msgid "Notes about group passwords"
 msgstr "请注意组密码"
 
-#: gpasswd.1.xml:102(para)
+#: gpasswd.1.xml:105(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:113(para)
+#: gpasswd.1.xml:116(para)
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
 "options cannot be combined."
 msgstr ""
 "除了 <option>-A</option> 和 <option>-M</option> 选项，其它选项不能联合使用。"
 
-#: gpasswd.1.xml:117(para)
+#: gpasswd.1.xml:120(para)
 msgid "The options cannot be combined."
 msgstr "这些选项不能组合使用。"
 
-#: gpasswd.1.xml:120(para)
+#: gpasswd.1.xml:123(para)
 msgid "The options which apply to the <command>gpasswd</command> command are:"
 msgstr "<command>gpasswd</command> 可以接受的选项有："
 
-#: gpasswd.1.xml:125(term)
+#: gpasswd.1.xml:128(term)
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
 msgstr ""
 "<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
 
-#: gpasswd.1.xml:129(para)
+#: gpasswd.1.xml:132(para)
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
@@ -7319,13 +7546,13 @@
 "向名为 <replaceable>group</replaceable> 的组中添加用户 <replaceable>user</"
 "replaceable>。"
 
-#: gpasswd.1.xml:138(term)
+#: gpasswd.1.xml:141(term)
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
 msgstr ""
 "<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
 
-#: gpasswd.1.xml:142(para)
+#: gpasswd.1.xml:145(para)
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
 "<replaceable>group</replaceable>."
@@ -7333,29 +7560,41 @@
 "从名为 <replaceable>group</replaceable> 的组中移除用户 <replaceable>user</"
 "replaceable>。"
 
-#: gpasswd.1.xml:159(term)
+#: gpasswd.1.xml:162(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-Q</option>, <option>--root</option><replaceable>CHROOT_DIR</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+"replaceable>"
+
+#: gpasswd.1.xml:177(term)
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr "<option>-r</option>, <option>--remove-password</option>"
 
-#: gpasswd.1.xml:163(para)
+#: gpasswd.1.xml:181(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:174(term)
+#: gpasswd.1.xml:192(term)
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-R</option>, <option>--restrict</option>"
 
-#: gpasswd.1.xml:178(para)
+#: gpasswd.1.xml:196(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:189(term)
+#: gpasswd.1.xml:207(term)
 msgid ""
 "<option>-A</option>, <option>--administrators</option><replaceable>user</"
 "replaceable>,..."
@@ -7363,11 +7602,11 @@
 "<option>-A</option>, <option>--administrators</option><replaceable>user</"
 "replaceable>,..."
 
-#: gpasswd.1.xml:193(para)
+#: gpasswd.1.xml:211(para)
 msgid "Set the list of administrative users."
 msgstr "设置有管理权限的用户列表。"
 
-#: gpasswd.1.xml:201(term)
+#: gpasswd.1.xml:219(term)
 msgid ""
 "<option>-M</option>, <option>--members</option><replaceable>user</"
 "replaceable>,..."
@@ -7375,11 +7614,11 @@
 "<option>-M</option>, <option>--members</option><replaceable>user</"
 "replaceable>,..."
 
-#: gpasswd.1.xml:205(para)
+#: gpasswd.1.xml:223(para)
 msgid "Set the list of group members."
 msgstr "设置组成员列表。"
 
-#: gpasswd.1.xml:215(para)
+#: gpasswd.1.xml:233(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -7388,7 +7627,7 @@
 "server."
 msgstr ""
 
-#: gpasswd.1.xml:260(para)
+#: gpasswd.1.xml:278(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>groupadd</"
@@ -7414,17 +7653,17 @@
 "\"gshadow\">, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry></phrase>."
 
-#: 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:86(refentrytitle)
+#: faillog.8.xml:38(refentrytitle) faillog.8.xml:45(refname)
+#: faillog.8.xml:51(command) faillog.5.xml:38(refentrytitle)
+#: faillog.5.xml:45(refname) faillog.5.xml:92(refentrytitle)
 msgid "faillog"
 msgstr "faillog"
 
-#: faillog.8.xml:40(refpurpose)
+#: faillog.8.xml:46(refpurpose)
 msgid "display faillog records or set login failure limits"
 msgstr "显示登录失败记录或设置登录失败限制"
 
-#: faillog.8.xml:54(para)
+#: faillog.8.xml:60(para)
 msgid ""
 "<command>faillog</command> displays the contents of the failure log database "
 "(<filename>/var/log/faillog</filename>). It can also set the failure "
@@ -7433,28 +7672,28 @@
 "failure."
 msgstr ""
 
-#: faillog.8.xml:65(para)
+#: faillog.8.xml:71(para)
 msgid "The options which apply to the <command>faillog</command> command are:"
 msgstr "<command>faillog</command> 可以接受的选项有："
 
-#: faillog.8.xml:73(para)
+#: faillog.8.xml:79(para)
 msgid ""
 "Display (or act on) faillog records for all users having an entry in the "
 "<filename>faillog</filename> database."
 msgstr ""
 
-#: faillog.8.xml:77(para)
+#: faillog.8.xml:83(para)
 msgid ""
 "The range of users can be restricted with the <option>-u</option> option."
 msgstr "用户的范围可以使用 <option>-u</option> 选项限制。"
 
-#: faillog.8.xml:81(para)
+#: faillog.8.xml:87(para)
 msgid ""
 "In display mode, this is still restricted to existing users but forces the "
 "display of the faillog entries even if they are empty."
 msgstr ""
 
-#: faillog.8.xml:86(para)
+#: faillog.8.xml:92(para)
 msgid ""
 "With the <option>-l</option>, <option>-m</option>, <option>-r</option>, "
 "<option>-t</option> options, the users' records are changed, even if the "
@@ -7462,7 +7701,7 @@
 "that have been deleted or to set a policy in advance for a range of users."
 msgstr ""
 
-#: faillog.8.xml:103(term)
+#: faillog.8.xml:109(term)
 msgid ""
 "<option>-l</option>, <option>--lock-secs</option><replaceable>SEC</"
 "replaceable>"
@@ -7470,69 +7709,69 @@
 "<option>-l</option>, <option>--lock-secs</option><replaceable>SEC</"
 "replaceable>"
 
-#: faillog.8.xml:108(para)
+#: faillog.8.xml:114(para)
 msgid ""
 "Lock account for <replaceable>SEC</replaceable> seconds after failed login."
 msgstr "登录失败后锁定账户 <replaceable>SEC</replaceable> 秒。"
 
-#: faillog.8.xml:112(para) faillog.8.xml:138(para) faillog.8.xml:150(para)
+#: faillog.8.xml:118(para) faillog.8.xml:144(para) faillog.8.xml:156(para)
 msgid ""
 "Write access to <filename>/var/log/faillog</filename> is required for this "
 "option."
 msgstr "此选项要求对 <filename>/var/log/faillog</filename> 有写入权限。"
 
-#: faillog.8.xml:119(term)
+#: faillog.8.xml:125(term)
 msgid ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 
-#: faillog.8.xml:124(para)
+#: faillog.8.xml:130(para)
 msgid ""
 "Set the maximum number of login failures after the account is disabled to "
 "<replaceable>MAX</replaceable>."
 msgstr ""
 
-#: faillog.8.xml:128(para)
+#: faillog.8.xml:134(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:133(para)
+#: faillog.8.xml:139(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:145(term)
+#: faillog.8.xml:151(term)
 msgid "<option>-r</option>, <option>--reset</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: faillog.8.xml:147(para)
+#: faillog.8.xml:153(para)
 msgid "Reset the counters of login failures."
 msgstr "重置登录失败计数。"
 
-#: faillog.8.xml:161(para)
+#: faillog.8.xml:180(para)
 msgid ""
 "Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr "显示新于 <replaceable>DAYS</replaceable> 的登录失败记录。"
 
-#: faillog.8.xml:173(para)
+#: faillog.8.xml:192(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 the specified user(s)."
 msgstr ""
 
-#: faillog.8.xml:191(para)
+#: faillog.8.xml:210(para)
 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 ""
 
-#: faillog.8.xml:200(para)
+#: faillog.8.xml:219(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 "
@@ -7541,15 +7780,15 @@
 "option> flag."
 msgstr ""
 
-#: faillog.8.xml:213(filename) faillog.5.xml:74(filename)
+#: faillog.8.xml:232(filename) faillog.5.xml:80(filename)
 msgid "/var/log/faillog"
 msgstr "/var/log/faillog"
 
-#: faillog.8.xml:215(para) faillog.5.xml:76(para)
+#: faillog.8.xml:234(para) faillog.5.xml:82(para)
 msgid "Failure logging file."
 msgstr ""
 
-#: faillog.8.xml:223(para)
+#: faillog.8.xml:242(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
@@ -7559,31 +7798,31 @@
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: faillog.5.xml:40(refpurpose)
+#: faillog.5.xml:46(refpurpose)
 msgid "login failure logging file"
 msgstr "登录失败的日志文件"
 
-#: faillog.5.xml:45(para)
+#: faillog.5.xml:51(para)
 msgid ""
 "<filename>/var/log/faillog</filename> maintains a count of login failures "
 "and the limits for each account."
 msgstr ""
 
-#: faillog.5.xml:49(para)
+#: faillog.5.xml:55(para)
 msgid ""
 "The file contains fixed length records, indexed by numerical UID. Each "
 "record contains the count of login failures since the last successful login; "
 "the maximum number of failures before the account is disabled; the line on "
-"whiche the last login failure occurred; the date of the last login failure; "
+"which the last login failure occurred; the date of the last login failure; "
 "and the duration (in seconds) during which the account will be locked after "
 "a failure."
 msgstr ""
 
-#: faillog.5.xml:59(para)
+#: faillog.5.xml:65(para)
 msgid "The structure of the file is:"
 msgstr "文件的结构是："
 
-#: faillog.5.xml:60(programlisting)
+#: faillog.5.xml:66(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -7604,23 +7843,47 @@
 "\tlong    fail_locktime;\n"
 "};"
 
-#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
-#: expiry.1.xml:52(command)
+#: expiry.1.xml:42(refentrytitle) expiry.1.xml:49(refname)
+#: expiry.1.xml:55(command)
 msgid "expiry"
 msgstr "expiry"
 
-#: expiry.1.xml:47(refpurpose)
+#: expiry.1.xml:50(refpurpose)
 msgid "check and enforce password expiration policy"
 msgstr ""
 
-#: expiry.1.xml:60(para)
+#: expiry.1.xml:64(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:87(para) chage.1.xml:278(para)
+#: expiry.1.xml:73(para)
+#, fuzzy
+#| msgid "The options which apply to the <command>pwck</command> command are:"
+msgid "The options which apply to the <command>expiry</command> command are:"
+msgstr "<command>pwck</command> 选项可以接受的选项有："
+
+#: expiry.1.xml:78(term)
+#, fuzzy
+#| msgid "<option>-L</option>, <option>--lock</option>"
+msgid "<option>-c</option>, <option>--check</option>"
+msgstr "<option>-L</option>, <option>--lock</option>"
+
+#: expiry.1.xml:80(para)
+msgid "Check the password expiration of the current user."
+msgstr ""
+
+#: expiry.1.xml:86(para)
+#, fuzzy
+#| msgid ""
+#| "The maximum password age is the number of days after which the user will "
+#| "have to change her password."
+msgid "Force a password change if the current user has an expired password."
+msgstr "最大密码年龄是指，这写天之后，用户必须更改密码。"
+
+#: expiry.1.xml:121(para) chage.1.xml:294(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -7630,11 +7893,11 @@
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: chsh.1.xml:46(refpurpose)
+#: chsh.1.xml:49(refpurpose)
 msgid "change login shell"
 msgstr "更改登录 shell"
 
-#: chsh.1.xml:63(para)
+#: chsh.1.xml:66(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 "
@@ -7642,11 +7905,11 @@
 "the login shell for any account."
 msgstr ""
 
-#: chsh.1.xml:74(para)
+#: chsh.1.xml:77(para)
 msgid "The options which apply to the <command>chsh</command> command are:"
 msgstr "<command>chsh</command> 命令可以接受的选项有："
 
-#: chsh.1.xml:96(para)
+#: chsh.1.xml:112(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 "
@@ -7655,7 +7918,7 @@
 "of <emphasis>[ ]</emphasis> marks."
 msgstr ""
 
-#: chsh.1.xml:107(para)
+#: chsh.1.xml:123(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 "
@@ -7666,15 +7929,15 @@
 "the user from ever changing her login shell back to its original value."
 msgstr ""
 
-#: chsh.1.xml:142(filename)
+#: chsh.1.xml:158(filename)
 msgid "/etc/shells"
 msgstr "/etc/shells"
 
-#: chsh.1.xml:144(para)
+#: chsh.1.xml:160(para)
 msgid "List of valid login shells."
 msgstr "可用的登录 shell 的列表。"
 
-#: chsh.1.xml:158(para)
+#: chsh.1.xml:174(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -7688,18 +7951,18 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chpasswd.8.xml:47(refpurpose)
+#: chpasswd.8.xml:50(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "批量更新密码"
 
-#: chpasswd.8.xml:61(para)
+#: chpasswd.8.xml:64(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 "
 "group of existing users. Each line is of the format:"
 msgstr ""
 
-#: chpasswd.8.xml:66(para)
+#: chpasswd.8.xml:69(para)
 msgid ""
 "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -7707,7 +7970,7 @@
 "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
 
-#: chpasswd.8.xml:70(para)
+#: chpasswd.8.xml:73(para)
 msgid ""
 "By default the passwords must be supplied in clear-text, and are encrypted "
 "by <command>chpasswd</command>. Also the password age will be updated, if "
@@ -7716,7 +7979,7 @@
 "默认必须明文提供密码，然后由 <command>chpasswd</command> 加密。如果存在密码年"
 "龄信息，也会更新之。"
 
-#: chpasswd.8.xml:75(para)
+#: chpasswd.8.xml:78(para)
 msgid ""
 "The default encryption algorithm can be defined for the system with the "
 "<option>ENCRYPT_METHOD</option> or <option>MD5_CRYPT_ENAB</option> variables "
@@ -7724,14 +7987,14 @@
 "<option>-e</option>, <option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
-#: chpasswd.8.xml:83(para)
+#: chpasswd.8.xml:86(para)
 msgid ""
 "By default, passwords are encrypted by PAM, but (even if not recommended) "
 "you can select a different encryption method with the <option>-e</option>, "
 "<option>-m</option>, or <option>-c</option> options."
 msgstr ""
 
-#: chpasswd.8.xml:89(para)
+#: chpasswd.8.xml:92(para)
 msgid ""
 "<phrase condition=\"pam\">Except when PAM is used to encrypt the passwords,</"
 "phrase><command>chpasswd</command> first updates all the passwords in "
@@ -7739,7 +8002,7 @@
 "any user."
 msgstr ""
 
-#: chpasswd.8.xml:95(para)
+#: chpasswd.8.xml:98(para)
 msgid ""
 "When PAM is used to encrypt the passwords (and update the passwords in the "
 "system database) then if a password cannot be updated <command>chpasswd</"
@@ -7747,17 +8010,17 @@
 "an error code on exit."
 msgstr ""
 
-#: chpasswd.8.xml:101(para) chgpasswd.8.xml:81(para)
+#: chpasswd.8.xml:104(para) chgpasswd.8.xml:84(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:109(para)
+#: chpasswd.8.xml:112(para)
 msgid "The options which apply to the <command>chpasswd</command> command are:"
 msgstr "<command>chpasswd</command> 可以接受的选项有："
 
-#: chpasswd.8.xml:115(term)
+#: chpasswd.8.xml:118(term)
 msgid ""
 "<option>-c</option>, <option>--crypt-method</option><replaceable>METHOD</"
 "replaceable>"
@@ -7765,15 +8028,15 @@
 "<option>-c</option>, <option>--crypt-method</option><replaceable>METHOD</"
 "replaceable>"
 
-#: chpasswd.8.xml:121(para) chgpasswd.8.xml:98(para)
+#: chpasswd.8.xml:124(para) chgpasswd.8.xml:101(para)
 msgid "The available methods are DES, MD5, and NONE."
 msgstr "可用的方法有 DES，MD5 和 NONE。"
 
-#: chpasswd.8.xml:128(para)
+#: chpasswd.8.xml:131(para)
 msgid "By default, PAM is used to encrypt the passwords."
 msgstr "默认，使用 PAM 来加密密码。"
 
-#: chpasswd.8.xml:131(para)
+#: chpasswd.8.xml:134(para)
 msgid ""
 "By default (if none of the <option>-c</option>, <option>-m</option>, or "
 "<option>-e</option> options are specified), the encryption method is defined "
@@ -7781,25 +8044,25 @@
 "variables of <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: chpasswd.8.xml:142(term) chgpasswd.8.xml:108(term)
+#: chpasswd.8.xml:145(term) chgpasswd.8.xml:111(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: chpasswd.8.xml:144(para) chgpasswd.8.xml:110(para)
+#: chpasswd.8.xml:147(para) chgpasswd.8.xml:113(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "提供的密码是已经加密了的"
 
-#: chpasswd.8.xml:158(term) chgpasswd.8.xml:120(term)
+#: chpasswd.8.xml:161(term) chgpasswd.8.xml:123(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
-#: chpasswd.8.xml:160(para) chgpasswd.8.xml:122(para)
+#: chpasswd.8.xml:163(para) chgpasswd.8.xml:125(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
 msgstr "如果提供的密码没有加密，则使用 MD5 加密而不是 DES。"
 
-#: chpasswd.8.xml:167(term)
+#: chpasswd.8.xml:183(term)
 msgid ""
 "<option>-s</option>, <option>--sha-rounds</option><replaceable>ROUNDS</"
 "replaceable>"
@@ -7807,28 +8070,28 @@
 "<option>-s</option>, <option>--sha-rounds</option><replaceable>ROUNDS</"
 "replaceable>"
 
-#: chpasswd.8.xml:187(para)
+#: chpasswd.8.xml:203(para)
 msgid ""
 "By default, the number of rounds is defined by the "
 "<option>SHA_CRYPT_MIN_ROUNDS</option> and <option>SHA_CRYPT_MAX_ROUNDS</"
 "option> variables in <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: chpasswd.8.xml:200(para) chgpasswd.8.xml:158(para)
+#: chpasswd.8.xml:216(para) chgpasswd.8.xml:174(para)
 msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
 msgstr "记住要设置权限或者掩码来阻止其它用户对未加密文件的读取。"
 
-#: chpasswd.8.xml:244(filename)
+#: chpasswd.8.xml:260(filename)
 msgid "/etc/pam.d/chpasswd"
 msgstr "/etc/pam.d/chpasswd"
 
-#: chpasswd.8.xml:246(para)
+#: chpasswd.8.xml:262(para)
 msgid "PAM configuration for <command>chpasswd</command>."
 msgstr "<command>chpasswd</command> 的 PAM 配置。"
 
-#: chpasswd.8.xml:254(para)
+#: chpasswd.8.xml:270(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
@@ -7844,11 +8107,11 @@
 "manvolnum></citerefentry>, </phrase><citerefentry><refentrytitle>useradd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: chgpasswd.8.xml:48(refpurpose)
+#: chgpasswd.8.xml:51(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "批量更新组密码"
 
-#: chgpasswd.8.xml:62(para)
+#: chgpasswd.8.xml:65(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 "
@@ -7857,7 +8120,7 @@
 "<command>chgpasswd</command> 命令从标准输入读取一系列组名和密码对，并使用此信"
 "息更新这些存在的组。每行的格式如下："
 
-#: chgpasswd.8.xml:67(para)
+#: chgpasswd.8.xml:70(para)
 msgid ""
 "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -7865,30 +8128,36 @@
 "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
 
-#: chgpasswd.8.xml:71(para)
+#: chgpasswd.8.xml:74(para)
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
 "<command>chgpasswd</command>."
 msgstr ""
 "默认上，提供的密码必须是明码文本，然后由 <command>chgpasswd</command> 加密。"
 
-#: chgpasswd.8.xml:75(para)
+#: chgpasswd.8.xml:78(para)
+#, fuzzy
+#| 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 overwiten with the <option>-e</option>, <option>-m</option>, or "
+#| "<option>-c</option> options."
 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 "
-"overwiten with the <option>-e</option>, <option>-m</option>, or <option>-c</"
-"option> options."
+"<option>ENCRYPT_METHOD</option> variable of <filename>/etc/login.defs</"
+"filename>, and can be overwiten with the <option>-e</option>, <option>-m</"
+"option>, or <option>-c</option> options."
 msgstr ""
 "默认加密算法可以通过 <filename>/etc/login.defs</filename> 的 ENCRYPT_METHOD "
 "变量设置，并且可以使用 <option>-e</option>, <option>-m</option> 或 <option>-"
 "c</option> 选项覆盖。"
 
-#: chgpasswd.8.xml:89(para)
+#: chgpasswd.8.xml:92(para)
 msgid ""
 "The options which apply to the <command>chgpasswd</command> command are:"
 msgstr "<command>chgpasswd</command> 可以接受的选项有："
 
-#: chgpasswd.8.xml:209(para)
+#: chgpasswd.8.xml:225(para)
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
@@ -7902,47 +8171,15 @@
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>."
 
-#: chfn.1.xml:47(refpurpose)
+#: chfn.1.xml:49(refpurpose)
 msgid "change real user name and information"
 msgstr "更改真名和信息"
 
-#: chfn.1.xml:53(replaceable)
-msgid "full_name"
-msgstr "full_name"
-
-#: 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:55(replaceable)
-msgid "work_ph"
-msgstr "work_ph"
-
-#: chfn.1.xml:55(arg)
-msgid "-w <placeholder-1/>"
-msgstr "-w <placeholder-1/>"
-
-#: chfn.1.xml:56(replaceable)
-msgid "home_ph"
-msgstr "home_ph"
-
-#: chfn.1.xml:57(replaceable)
-msgid "other"
-msgstr "其它"
-
-#: chfn.1.xml:57(arg)
-msgid "-o <placeholder-1/>"
-msgstr "-o <placeholder-1/>"
-
-#: chfn.1.xml:64(para)
+#: chfn.1.xml:66(para)
 msgid ""
-"The <command>chfn</command> command changes user fullname, office number, "
-"office extension, and home phone number information for a user's account. "
-"This information is typically printed by "
+"The <command>chfn</command> command changes user fullname, office room "
+"number, office phone number, and home phone number information for a user's "
+"account. This information is typically printed by "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> and similar programs. A normal user may only change the fields "
 "for her own account, subject to the restrictions in <filename>/etc/login."
@@ -7952,7 +8189,7 @@
 "option to change the undefined portions of the GECOS field."
 msgstr ""
 
-#: chfn.1.xml:78(para)
+#: chfn.1.xml:80(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. "
@@ -7961,8 +8198,104 @@
 "field is used to store accounting information used by other applications."
 msgstr ""
 
-#: chfn.1.xml:87(para)
+#: chfn.1.xml:93(para)
+#, fuzzy
+#| msgid "The options which apply to the <command>chsh</command> command are:"
+msgid "The options which apply to the <command>chfn</command> command are:"
+msgstr "<command>chsh</command> 命令可以接受的选项有："
+
+#: chfn.1.xml:98(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
+#| "replaceable>"
 msgid ""
+"<option>-f</option>, <option>--full-name</option><replaceable>FULL_NAME</"
+"replaceable>"
+msgstr ""
+"<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
+"replaceable>"
+
+#: chfn.1.xml:102(para)
+#, fuzzy
+#| msgid "Changing the default values"
+msgid "Change the user's full name."
+msgstr "更改默认值"
+
+#: chfn.1.xml:106(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-h</option>, <option>--home-phone</option><replaceable>HOME_PHONE</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+"replaceable>"
+
+#: chfn.1.xml:110(para)
+msgid "Change the user's home phone number."
+msgstr ""
+
+#: chfn.1.xml:114(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-o</option>, <option>--other</option><replaceable>OTHER</replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+"replaceable>"
+
+#: chfn.1.xml:118(para)
+msgid ""
+"Change the user's other GECOS information. This field is used to store "
+"accounting information used by other applications, and can be changed only "
+"by a superuser."
+msgstr ""
+
+#: chfn.1.xml:126(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-r</option>, <option>--room</option><replaceable>ROOM_NUMBER</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+"replaceable>"
+
+#: chfn.1.xml:130(para)
+msgid "Change the user's room number."
+msgstr ""
+
+#: chfn.1.xml:147(term)
+#, fuzzy
+#| msgid "<option>-h</option>, <option>--help</option>"
+msgid "<option>-u</option>, <option>--help</option>"
+msgstr "<option>-h</option>, <option>--help</option>"
+
+#: chfn.1.xml:155(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+#| "replaceable>"
+msgid ""
+"<option>-w</option>, <option>--work-phone</option><replaceable>WORK_PHONE</"
+"replaceable>"
+msgstr ""
+"<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
+"replaceable>"
+
+#: chfn.1.xml:159(para)
+msgid "Change the user's office phone number."
+msgstr ""
+
+#: chfn.1.xml:163(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 "
 "the fields. Enter the new value to change the field, or leave the line blank "
@@ -7971,7 +8304,7 @@
 "command> prompts for the current user account."
 msgstr ""
 
-#: chfn.1.xml:132(para)
+#: chfn.1.xml:208(para)
 msgid ""
 "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -7985,22 +8318,22 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chage.1.xml:44(refpurpose)
+#: chage.1.xml:47(refpurpose)
 msgid "change user password expiry information"
 msgstr "更改用户密码过期信息"
 
-#: chage.1.xml:60(para)
+#: chage.1.xml:63(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:70(para)
+#: chage.1.xml:73(para)
 msgid "The options which apply to the <command>chage</command> command are:"
 msgstr "<command>chage</command> 命令可以接受的选项有："
 
-#: chage.1.xml:75(term)
+#: chage.1.xml:78(term)
 msgid ""
 "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
 "replaceable>"
@@ -8008,14 +8341,14 @@
 "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
 "replaceable>"
 
-#: chage.1.xml:79(para)
+#: chage.1.xml:82(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:87(term)
+#: chage.1.xml:90(term)
 msgid ""
 "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -8023,7 +8356,7 @@
 "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
 
-#: chage.1.xml:91(para)
+#: chage.1.xml:94(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 "
@@ -8032,7 +8365,7 @@
 "able to use the system again."
 msgstr ""
 
-#: chage.1.xml:99(para)
+#: chage.1.xml:102(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>EXPIRE_DATE</replaceable> will remove an account expiration "
@@ -8041,7 +8374,7 @@
 "<replaceable>EXPIRE_DATE</replaceable> 设置为 <emphasis remap=\"I\">-1</"
 "emphasis> 会移除账户的过期日期。"
 
-#: chage.1.xml:113(term)
+#: chage.1.xml:116(term)
 msgid ""
 "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -8049,7 +8382,7 @@
 "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 
-#: chage.1.xml:117(para)
+#: chage.1.xml:120(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 "
@@ -8057,7 +8390,7 @@
 "the system administrator before being able to use the system again."
 msgstr ""
 
-#: chage.1.xml:124(para)
+#: chage.1.xml:127(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>INACTIVE</replaceable> will remove an account's inactivity."
@@ -8065,11 +8398,11 @@
 "<replaceable>INACTIVE</replaceable> 设置为 <emphasis remap=\"I\">-1</"
 "emphasis> 会移除账户禁用功能。"
 
-#: chage.1.xml:136(para)
+#: chage.1.xml:139(para)
 msgid "Show account aging information."
 msgstr "现实账户年龄信息。"
 
-#: chage.1.xml:142(term)
+#: chage.1.xml:145(term)
 msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -8077,7 +8410,7 @@
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 
-#: chage.1.xml:154(term)
+#: chage.1.xml:157(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -8085,7 +8418,7 @@
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
 
-#: chage.1.xml:158(para)
+#: chage.1.xml:161(para)
 #, fuzzy
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
@@ -8099,7 +8432,7 @@
 "<replaceable>LAST_DAY</replaceable> 小于当前日期时，会要求用户更改密码，否则"
 "不能使用此账户。"
 
-#: chage.1.xml:167(para)
+#: chage.1.xml:170(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as "
 "<replaceable>MAX_DAYS</replaceable> will remove checking a password's "
@@ -8108,7 +8441,7 @@
 "<replaceable>MAX_DAYS</replaceable> 设置为 <emphasis remap=\"I\">-1</"
 "emphasis> 会移除密码有效性检查。"
 
-#: chage.1.xml:175(term)
+#: chage.1.xml:191(term)
 msgid ""
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -8116,7 +8449,7 @@
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
 
-#: chage.1.xml:179(para)
+#: chage.1.xml:195(para)
 #, fuzzy
 msgid ""
 "Set the number of days of warning before a password change is required. The "
@@ -8126,7 +8459,7 @@
 msgstr ""
 "设置在要求更改密码之前几天开始警告。<replaceable>WARN_DAYS</replaceable> 选项"
 
-#: chage.1.xml:188(para)
+#: chage.1.xml:204(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 "
@@ -8138,13 +8471,13 @@
 "前值提示用户。输入一个新值可以更改这些字段，或者留空使用当前值。当前值出现在 "
 "<emphasis>[ ]</emphasis> 标记对里。"
 
-#: chage.1.xml:198(para)
+#: chage.1.xml:214(para)
 msgid ""
 "The <command>chage</command> program requires a shadow password file to be "
 "available."
 msgstr "<command>chage</command> 需要有一个影子密码文件才可用。"
 
-#: chage.1.xml:202(para)
+#: chage.1.xml:218(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 "
@@ -8153,15 +8486,15 @@
 "只有 root 才可以使用 <command>chage</command>，一个特殊情况是 <option>-l</"
 "option> 选项，用来让非特权用户觉得自己的密码或账户何时过期。"
 
-#: chage.1.xml:267(replaceable)
+#: chage.1.xml:283(replaceable)
 msgid "15"
 msgstr "15"
 
-#: chage.1.xml:269(para)
+#: chage.1.xml:285(para)
 msgid "can't find the shadow password file"
 msgstr "无法找到影子密码文件"
 
-#: chage.1.xml:245(para)
+#: chage.1.xml:261(para)
 msgid ""
 "The <command>chage</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -8171,3 +8504,53 @@
 #: chage.1.xml:0(None)
 msgid "translator-credits"
 msgstr "YunQiang Su <wzssyqa at gmail.com>, 2010."
+
+#~ msgid "-q"
+#~ msgstr "-q"
+
+#~ msgid "-s"
+#~ msgstr "-s"
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+#~ "\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+#~ "phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+#~ "\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+#~ "phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid "new_users"
+#~ msgstr "新用户"
+
+#~ msgid "full_name"
+#~ msgstr "full_name"
+
+#~ msgid "-f <placeholder-1/>"
+#~ msgstr "-f <placeholder-1/>"
+
+#~ msgid "room_no"
+#~ msgstr "room_no"
+
+#~ msgid "work_ph"
+#~ msgstr "work_ph"
+
+#~ msgid "-w <placeholder-1/>"
+#~ msgstr "-w <placeholder-1/>"
+
+#~ msgid "home_ph"
+#~ msgstr "home_ph"
+
+#~ msgid "other"
+#~ msgstr "其它"
+
+#~ msgid "-o <placeholder-1/>"
+#~ msgstr "-o <placeholder-1/>"

Modified: upstream/trunk/po/bs.po
===================================================================
--- upstream/trunk/po/bs.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/bs.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2004-05-09 12:03+0100\n"
 "Last-Translator: Safir Šećerović <sapphire at linux.org.ba>\n"
 "Language-Team: Bosnian <lokal at lugbih.org>\n"
@@ -37,6 +37,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Šifra:"
 
@@ -205,6 +213,10 @@
 "(%lu)\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "nepoznata grupa: %s\n"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr ""
@@ -288,6 +300,30 @@
 msgstr "Mijenjam šifru za grupu %s\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "nepoznata grupa: %s\n"
+
+#, fuzzy, c-format
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "nepoznata grupa: %s\n"
+
+#, fuzzy, c-format
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "nepoznata grupa: %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -315,30 +351,51 @@
 msgid "Unable to determine your tty name."
 msgstr ""
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr ""
-
 msgid "No"
 msgstr ""
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
 
 msgid "Enter the new value, or press ENTER for the default"
@@ -415,9 +472,9 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: PAM: %s\n"
+msgstr "nepoznata grupa: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: Try again later\n"
@@ -441,10 +498,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr ""
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: grupa %s postoji\n"
@@ -459,14 +512,29 @@
 
 #, c-format
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Puno ime i prezime"
 
@@ -546,12 +614,18 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 
 msgid ""
@@ -591,28 +665,6 @@
 msgid "%s: error detected, changes ignored\n"
 msgstr ""
 
-#, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: grupa %s postoji\n"
@@ -621,13 +673,7 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: grupa %s postoji\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
 
 msgid "Login Shell"
@@ -657,9 +703,23 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: grupa %s postoji\n"
 
-msgid "Usage: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
 msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unexpected argument: %s\n"
+msgstr ""
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -687,7 +747,7 @@
 msgstr ""
 
 #, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
 msgstr ""
 
 msgid "Login       Failures Maximum Latest                   On\n"
@@ -702,30 +762,26 @@
 msgstr ""
 
 #, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr ""
 
 #, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr ""
 
 #, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "Nepoznat korisnik: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "nepoznata grupa: %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -738,6 +794,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -857,8 +916,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-msgid "Usage: groupdel group\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: unknown member %s\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: nepoznat član %s\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -958,15 +1019,29 @@
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr ""
 
 msgid "invalid group file entry"
@@ -1035,12 +1110,6 @@
 msgid "%s: no changes\n"
 msgstr ""
 
-msgid "Usage: grpconv\n"
-msgstr ""
-
-msgid "Usage: grpunconv\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "%s: unknown member %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1056,19 +1125,16 @@
 msgstr ""
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1081,14 +1147,6 @@
 msgstr ""
 
 #, 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 ""
 
@@ -1151,6 +1209,11 @@
 msgid "Login incorrect"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "%s: unknown member %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: nepoznat član %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1265,28 +1328,57 @@
 msgstr ""
 
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
 
 msgid "Old password: "
@@ -1365,15 +1457,20 @@
 msgstr "Upozorenje o isteku šifre"
 
 #, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
+msgid "  -q, --quiet                   report errors only\n"
 msgstr ""
 
 #, c-format
@@ -1452,9 +1549,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr ""
 
-msgid "Usage: pwconv\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr ""
@@ -1463,9 +1557,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-msgid "Usage: pwunconv\n"
-msgstr ""
-
 msgid "Access to su to that account DENIED.\n"
 msgstr ""
 
@@ -1519,18 +1610,12 @@
 msgstr ""
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
 msgstr ""
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr ""
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr ""
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr ""
 
@@ -1539,22 +1624,34 @@
 msgstr "Ponovo unesite novu šifru:"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
+msgid "%s: Authentication failure\n"
 msgstr ""
 
 #, c-format
-msgid "%s: Authentication failure\n"
+msgid "%s: You are not authorized to su at that time\n"
 msgstr ""
 
 #, c-format
-msgid "%s: You are not authorized to su at that time\n"
+msgid "No passwd entry for user '%s'\n"
 msgstr ""
 
-msgid "No shell\n"
+#, c-format
+msgid "%s: must be run from a terminal\n"
 msgstr ""
 
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "nepoznata grupa: %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: unknown member %s\n"
+msgid "Cannot execute %s\n"
+msgstr "%s: nepoznat član %s\n"
+
 #, fuzzy
 msgid "No password file"
 msgstr "Nova šifra:"
@@ -1595,7 +1692,7 @@
 msgstr "nepoznata grupa: %s\n"
 
 #, fuzzy, c-format
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "nepoznata grupa: %s\n"
 
 #, fuzzy, c-format
@@ -1609,6 +1706,8 @@
 #, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1726,10 +1825,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -1787,20 +1882,30 @@
 msgstr ""
 
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr ""
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 
+#, c-format
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "nepoznata grupa: %s\n"
@@ -1831,10 +1936,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr ""
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr ""
 
@@ -1846,34 +1947,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr ""
 
-#, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -1889,8 +2015,13 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: grupa %s postoji\n"
 
+#, fuzzy, c-format
+#| msgid "%s: unknown member %s\n"
+msgid "%s: no options\n"
+msgstr "%s: nepoznat član %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
 #, c-format
@@ -1898,10 +2029,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr ""
 
@@ -1964,9 +2091,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 

Modified: upstream/trunk/po/ca.po
===================================================================
--- upstream/trunk/po/ca.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/ca.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2011-04-30 18:35+0100\n"
 "Last-Translator: Innocent De Marchi <tangram.peces at gmail.com>\n"
 "Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -41,6 +41,14 @@
 "error de configuració - element «%s» desconegut (notifiqueu-ho a "
 "l'administrador)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Contrasenya: "
 
@@ -217,6 +225,11 @@
 "%s: Configuració incorrecte: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
 "(%lu)\n"
 
+#, fuzzy, c-format
+#| msgid "failed to allocate memory"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "no es pot assignar memòria"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr ""
@@ -301,6 +314,33 @@
 msgid "Incorrect password for %s.\n"
 msgstr "La contrasenya és incorrecta per a «%s».\n"
 
+#, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: ha fallat el despreniment de privilegis (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: el telèfon de casa no és vàlid: «%s»\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot create directory %s: %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: no es pot crear el directori %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Failed to create tcb directory for %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: no es pot generar el directori «tcb» per a %s\n"
+
 # traducció dubtosa
 #, c-format
 msgid ""
@@ -332,50 +372,85 @@
 msgid "Unable to determine your tty name."
 msgstr "No s'ha pogut determinar el nom de la vostra tty."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) ha fallat\n"
-
 msgid "No"
 msgstr "No"
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"Forma d'ús: %s [opcions] LOGIN\n"
+"\n"
+"Opcions:\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "  -e, --expiredate EXPIRE_DATE  data de venciment del nou compte\n"
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    mostra aquest missatge d'ajuda i surt\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -p, --password PASSWORD       canvia la contrasenya d'aquest (xifrat)\n"
+"                                PASSWORD\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+"  -r, --reset                   restablir els comptadors d'errors "
+"d'identificació\n"
+
+# traducció dubtosa
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+" -s, --sha-rounds              nombre de SHA arrodonit per el SHA*\n"
+"                                algorisme d'encriptació\n"
+
+# traducció dubtosa
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+" -s, --sha-rounds              nombre de SHA arrodonit per el SHA*\n"
+"                                algorisme d'encriptació\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir HOME_DIR       directori arrel del nou compte\n"
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Forma d'ús: chage [opcions] [USUARI]\n"
-"\n"
-"Opcions:\n"
-"  -d, --lastday ÚLTIM_DIA          estableix l'últim canvi de contrasenya\n"
-"                                   a ÚLTIM_DIA\n"
-"  -E, --expiredate DATA_EXPIRACIÓ  estableix la data d'expiració del\n"
-"                                   compte a DATA_EXPIRACIÓ\n"
-"  -h, --help                       mostra aquesta ajuda i acaba\n"
-"  -I, --inactive INACTIVA          estableix la contrasenya inactiva\n"
-"                                   després d'expiració a INACTIVA\n"
-"  -l, --list                       mostra informació d'envelliment del\n"
-"                                   compte\n"
-"  -m, --mindays DIES_MÍN           estableix el número mínim de dies abans\n"
-"                                   de canvi de contrasenya a DIES_MÍN\n"
-"  -M, --maxdays DIES_MÀX           estableix el número màxim de dies abans\n"
-"                                   de canvi de contrasenya a DIES_MÀX\n"
-"  -W, --warndays DIES_AVÍS         estableix els dies d'avís d'expiració\n"
-"                                   a DIES_AVÍS\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Introduïu el nou valor, o premeu ENTER per al predeterminat"
@@ -448,9 +523,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -473,10 +549,6 @@
 msgstr "%s: el fitxer de contrasenyes ombra no és present\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: ha fallat el despreniment de privilegis (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: l'usuari «%s» no existeix a %s\n"
 
@@ -488,20 +560,41 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: s'ha produït un error en canviar els camps\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Forma d'ús: %s [-f nom_complet] [-r num_habitació] [-w tel_feina]\n"
-"\t[-h tel_casa] [-o altre] [usuari]\n"
+"Forma d'ús: %s [opcions] LOGIN\n"
+"\n"
+"Opcions:\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Forma d'ús: %s [-f nom_complet] [-r num_habitació] [-w tel_feina]\n"
-"[-h tel_casa]\n"
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    mostra aquest missatge d'ajuda i surt\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Nom complet"
 
@@ -582,23 +675,26 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 "Forma d'ús: %s [opcions]\n"
 "\n"
 "Opcions:\n"
-" -c, --crypt-method            mètode de xifrat (un de %s)\n"
-"  -e, --encrypted               les contrasenyes proveïdes estan xifrades\n"
-"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
-"  -m, --md5                     xifra la contrasenya en text pla fent "
-"servir\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr "  -c, --crypt-method <METHOD> el mètode d'encriptació (un de %s)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+"  -e, --encrypted               les contrasenyes subministrades són "
+"encriptades\n"
+
+msgid ""
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
+msgstr ""
+"  -m, --md5                     encriptar la contrasenya en text clar amb\n"
 "                                l'algorisme MD5\n"
-"%s\n"
 
 # traducció dubtosa
 msgid ""
@@ -641,36 +737,6 @@
 msgstr "%s: s'ha detectat un error, els canvis s'han ignorat\n"
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Forma d'ús: %s [opcions]\n"
-"\n"
-"Opcions:\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method <METHOD> el mètode d'encriptació (un de %s)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-"  -e, --encrypted               les contrasenyes subministrades són "
-"encriptades\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-"  -h, --help                    mostra aquest missatge d'ajuda i surt\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -m, --md5                     encriptar la contrasenya en text clar amb\n"
-"                                l'algorisme MD5\n"
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: (línia %d, usuari %s) contrasenya sense canviar\n"
 
@@ -678,21 +744,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: línia %d: l'usuari «%s» no existeix\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
-msgstr ""
-"Forma d'ús: chsh [opcions] [USUARI]\n"
-"\n"
-"Opcions:\n"
-"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
-"  -s, --shell INTÈRPRET         nou intèrpret d'accés per al compte "
-"d'usuari\n"
-"\n"
+#, fuzzy
+#| msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
+msgstr "  -s, --shell SHELL             «shell» d'entrada del nou compte\n"
 
 msgid "Login Shell"
 msgstr "Intèrpret d'accés"
@@ -721,9 +776,35 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Advertència: %s no és executable\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Forma d'ús: expiry {-f|-c}\n"
+#, fuzzy
+#| msgid ""
+#| "  -u, --user                    which user's tcb shadow file to edit\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
+"  -u, --user                    usuaris «tcb» que poden editar l'arxiu "
+"«shadow»\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -m, --md5                     encriptar la contrasenya en text clar amb\n"
+"                                l'algorisme MD5\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: opcions %s i %s conflictes\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: argument inesperat: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 "  -a, --all                     mostrar els registres «faillog» per a tots "
@@ -766,9 +847,10 @@
 "                                o -i) només per l'identificador/s LOGIN "
 "especificats\n"
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "faillog: Errada en l'obtenció de l'entrada per UID %lu\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "darrer registre: No s'ha pogut obtenir l'entrada de la UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Usuari      Fallades Màxim   Últim                    A\n"
@@ -781,32 +863,33 @@
 msgid " [%lds lock]"
 msgstr " [blocat %lds]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr ""
 "faillog: Errada en el restabliment del recompte de fallades per UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "faillog: Errada en establir el màxim per UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: Errada en establir «locktime» de UID  %lu\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "darrer informe: Usuari o rang desconegut: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "informe d'error: no es pot obrir %s: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "darrer registre: No s'ha pogut obtenir la mida de %s: %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: No és possible obtenir la mida de %s: %s\n"
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -822,6 +905,11 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete USER             eliminar USER del GROUP\n"
 
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir HOME_DIR       directori arrel del nou compte\n"
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 "  -r, --remove-password         eliminar la contrasenya del grup GROUP\n"
@@ -959,8 +1047,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: el GID '%lu ja existeix\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Forma d'ús: groupdel grup\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: No s'ha pogut determinar el seu nom d'usuari.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1071,16 +1161,53 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: usuari %s desconegut\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Forma d'ús: %s [-r] [-s] [grup [grup_ombra]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Forma d'ús: %s [opcions] [acció]\n"
+"\n"
+"Opcions:\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Forma d'ús: %s [-r] [-s] [grup]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Forma d'ús: %s [opcions] [acció]\n"
+"\n"
+"Opcions:\n"
 
+# traducció dubtosa
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+" -s, --sha-rounds              nombre de SHA arrodonit per el SHA*\n"
+"                                algorisme d'encriptació\n"
+
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -l, --list                    llista els membres del grup\n"
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: «-s» i «-r» són incompatibles\n"
 
 msgid "invalid group file entry"
@@ -1150,12 +1277,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: no hi ha canvis\n"
 
-msgid "Usage: grpconv\n"
-msgstr "Forma d'ús: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "Forma d'ús: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: no es pot eliminar %s\n"
@@ -1169,33 +1290,31 @@
 msgid " groups="
 msgstr " grups="
 
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -t, --time DAYS               mostra els registres «faillog» de menys de "
+"DAYS dies\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr ""
+"  -t, --time DAYS               mostra els registres «faillog» de menys de "
+"DAYS dies\n"
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Forma d'ús: lastlog [opcions]\n"
-"\n"
-"Opcions:\n"
-"  -b, --before DIES             mostra només els registres de lastlog més\n"
-"                                antics que DIES\n"
-"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
-"  -t, --time DIES               mostra només els registres de lastlog més\n"
-"                                recents que DIES\n"
-"  -u, --user USUARI             mostra el registre de lastlog per a\n"
-"                                l'usuari amb USUARI especific\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "darrer registre: No s'ha pogut obtenir l'entrada de la UID %lu\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "Usuari           Port     Des de           Últim"
 
@@ -1206,14 +1325,6 @@
 msgstr "**No ha entrat mai**"
 
 #, 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 "darrer registre: No s'ha pogut obtenir la mida de %s: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Forma d'ús: %s [-p] [nom]\n"
 
@@ -1283,6 +1394,11 @@
 msgid "Login incorrect"
 msgstr "Accés incorrecte"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: línia %d: no es pot trobar l'usuari %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1403,56 +1519,98 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: línia %d: no es pot actualitzar l'entrada\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+"  -a, --all                     mostrar els registres «faillog» per a tots "
+"els usuaris\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system                  genera un compte del sistema\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system                  genera un compte del sistema\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+"  -e, --encrypted               les contrasenyes subministrades són "
+"encriptades\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -p, --password PASSWORD       canvia la contrasenya d'aquest (xifrat)\n"
+"                                PASSWORD\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr "  -u, --uid UID                 ID d'usuari del nou compte\n"
+
+# traducció dubtosa
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+" -s, --sha-rounds              nombre de SHA arrodonit per el SHA*\n"
+"                                algorisme d'encriptació\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr "  -q, --quiet                   mode silenciós\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system                  genera un compte del sistema\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr "  -u, --uid UID                 ID d'usuari del nou compte\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+# traducció dubtosa
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Forma d'ús: passwd [opcions] [USUARI]\n"
-"\n"
-"Opcions:\n"
-"  -a, --all                     informa de l'estat de la contrasenya\n"
-"                                per a tots els comptes\n"
-"  -d, --delete                  esborra la contrasenya per al compte\n"
-"                                anomenat\n"
-"  -e, --expire                  força la caducitat de la contrasenya per\n"
-"                                al compte anomenat\n"
-"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
-"  -k, --keep-tokens             canvia la contrasenya només si ha caducat\n"
-"  -i, --inactive INACTIU        estableix la contrasenya a inactiva després\n"
-"                                d'INACTIU dies de caducitat\n"
-"  -l, --lock                    bloca el compte anomenat\n"
-"  -n, --mindays DIES_MÍN        estableix els dies mínims abans del canvi\n"
-"                                de contrasenya a DIES_MÍN\n"
-"  -q, --quiet                   mode silenciós\n"
-"  -r, --repository REPOSITORI   canvia la contrasenya en el REPOSITORI\n"
-"  -S, --status                  informa de l'estat de la contrasenya per\n"
-"                                al compte anomenat\n"
-"  -u, --unlock                  desbloca el compte anomenat\n"
-"  -w, --warndays DIES_AVÍS      estableix els dies d'avís de caducitat\n"
-"                                a DIES_AVÍS\n"
-"  -x, --maxdays DIES_MÀX        estableix els dies màxims abans del canvi\n"
-"                                de contrasenya a DIES_MÀX\n"
-"\n"
+" -s, --sha-rounds              nombre de SHA arrodonit per el SHA*\n"
+"                                algorisme d'encriptació\n"
 
 msgid "Old password: "
 msgstr "Contrasenya antiga: "
@@ -1536,17 +1694,38 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: la informació de caducitat de la contrasenya ha canviat.\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Forma d'ús: %s [-q] [-r] [contrasenya]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Forma d'ús: %s [opcions] [acció]\n"
+"\n"
+"Opcions:\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Forma d'ús: %s [-q] [-r] [-s] [contrasenya [ombra]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Forma d'ús: %s [opcions] [acció]\n"
+"\n"
+"Opcions:\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: «-s» i «-r» són incompatibles\n"
+#, fuzzy
+#| msgid "  -q, --quiet                   quiet mode\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr "  -q, --quiet                   mode silenciós\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1625,9 +1804,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: no es pot ordenar les entrades en el fitxer %s\n"
 
-msgid "Usage: pwconv\n"
-msgstr "Forma d'ús: pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: no es pot treballar amb el «tcb» habilitat\n"
@@ -1636,9 +1812,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: ha fallat el canvi del mode %s a 0600\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "Forma d'ús: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "L'accés de «su» a aquest compte està DENEGAT.\n"
 
@@ -1704,18 +1877,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: s'ha d'executar des d'una terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ignorat)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: s'ha produït un error %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "El identificador és desconegut: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "No esteu autoritzats a usar «su %s»\n"
 
@@ -1723,14 +1892,6 @@
 msgstr "(Introduïu la vostra pròpia contrasenya)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ignorat)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: l'autenticació ha fallat\n"
 
@@ -1738,9 +1899,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s:  No esteu autoritzat a usar «su» en aquest moment\n"
 
-msgid "No shell\n"
-msgstr "No hi ha intèrpret d'ordres\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "No hi ha entrada de contrasenya per a «root»"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: s'ha d'executar des d'una terminal\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: s'ha produït un error %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot remove the content of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: no és possible eliminar el contingut de %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "No es pot executar %s"
+
 msgid "No password file"
 msgstr "No hi ha fitxer de contrasenyes"
 
@@ -1782,8 +1963,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: línia massa llarga a %s: %s..."
 
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: reanomena %s: %s"
 
 #, c-format
@@ -1794,9 +1976,15 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: s'han especificat massa grups (màx de %d).\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1939,10 +2127,6 @@
 msgstr "%s: -Z requereix nucli «SELinux» habilitat\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: opcions %s i %s conflictes\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 "%s: ha fallat el restabliment de l'entrada del registre d'errors de UID %lu: "
@@ -2009,32 +2193,47 @@
 "%s: avís: el directori personal ja existeix.\n"
 "No s'hi copiarà cap fitxer del directori skel.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -f, --force                   exit successfully if the group already "
+#| "exists,\n"
+#| "                                and cancel -g if the GID is already used\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Forma d'ús: userdel [opcions] USUARI\n"
-"\n"
-"Opcions:\n"
-"  -f, --force                   força l'eliminació de fitxers, encara que\n"
-"                                no siguin propietat de l'usuari\n"
-"  -h, --help                    mostra aquesta ajuda i acaba\n"
-"  -r, --remove                  elimina el directori personal i la cua\n"
-"                                de correu\n"
-"\n"
+"  -f, --force                   sortir correctament si el grup ja existeix,\n"
+"                                i calcel·lar «-g» si ja es fa servir el GID\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+"  -r, --reset                   restablir els comptadors d'errors "
+"d'identificació\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: no s'ha pogut eliminar el grup primari de l'usuari «%s»\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 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: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: %s directori personal (%s) no es troba\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: avís: no es pot eliminar %s: %s\n"
@@ -2065,10 +2264,6 @@
 msgstr "%s: l'usuari %s és un usuari NIS\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: l'usuari %s està actualment dins el sistema\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: %s directori personal (%s) no es troba\n"
 
@@ -2082,63 +2277,101 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: s'ha produït un error en eliminar el directori %s\n"
 
-#, c-format
+#, fuzzy
+#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr "  -c, --comment COMMENT         camp GECOS del nou compte\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr "  -d, --home-dir HOME_DIR       directori arrel del nou compte\n"
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr "  -e, --expiredate EXPIRE_DATE  data de venciment del nou compte\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -p, --password PASSWORD       canvia la contrasenya d'aquest (xifrat)\n"
+"                                PASSWORD\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr "  -g, --gid GID                 fer servir GID pel nou grup\n"
+
+#, fuzzy
+#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -M, --members USER,...        establir el llistat de membres del grup "
+"GROUP\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr "  -u, --uid UID                 ID d'usuari del nou compte\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
+#| "the\n"
+#| "                                new account\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -b, --base-dir BASE_DIR       directori base pel directori arrel del\n"
+"                                compte nou\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
+#| "GID\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -o, --non-unique              permet utilitzar un duplicat (no únics) GID\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       use this encrypted password for the new "
+#| "group\n"
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Forma d'ús: usermod [opcions] USUARI\n"
-"\n"
-"Opcions:\n"
-"  -c, --comment COMENTARI       nou valor per al camp GECOS\n"
-"  -d, --home DIR_PERSONAL       nou directori personal per al nou compte\n"
-"                                d'usuari\n"
-"  -e, --expiredate DATA_CADUCIT estableix la data de caducitat del compte\n"
-"                                a DATA_CADUCITAT\n"
-"  -f, --inactive INACTIU        estableix la contrasenya a inactiva després\n"
-"                                d'INACTIU dies de caducitat\n"
-"  -g, --gid GRUP                força l'ús de GRUP com a nou grup inicial\n"
-"                                d'accés\n"
-"  -G, --groups GRUPS            llista de GRUPS addicionals\n"
-"  -a, --append                  afegeix l'usuari als GRUPS addicionals\n"
-"                                llistats amb la opció -G sense eliminar-los\n"
-"                                d'altres grups\n"
-"  -h, --help                    mostra aquest missatge d'ajuda i surt\n"
-"  -l, --login USUARI            nou valor per al nom d'usuari\n"
-"  -L, --lock                    bloca el compte d'usuari\n"
-"  -m, --move-home               mou els continguts del directori personal\n"
-"                                a la nova ubicació (usar només amb -d)\n"
-"  -o, --non-unique              permet usar UID duplicats (no únics)\n"
-"  -p, --password CONTRASENYA    usa contrasenya xifrada per a la nova\n"
-"                                contrasenya\n"
-"  -s, --shell INTÈRPRET         nou intèrpret d'accés per al compte "
-"d'usuari\n"
-"  -u, --uid UID                 nou UID per al compte d'usuari\n"
-"  -U, --unlock                  desbloca el compte d'usuari\n"
-"%s\n"
+"  -p, --password PASSWORD       utilitzar aquesta contrasenya xifrada pel "
+"nou grup\n"
 
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr "  -u, --uid UID                 ID d'usuari del nou compte\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr "  -u, --uid UID                 ID d'usuari del nou compte\n"
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2160,19 +2393,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: l'usuari «%s» ja existeix a %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: no es pot obrir el fitxer %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: no s'han especificat assenyaladors\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr "%s: els indicadors -L, -p, i -U són exclusius\n"
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: les contrasenyes ombra són requerides per a «-e» i «-f»\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr "%s: els indicadors -L, -p, i -U són exclusius\n"
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr "%s: UID '%lu' ja existeix\n"
 
@@ -2249,9 +2483,6 @@
 msgstr ""
 "  -p, --passwd                  edita la base de dades de contrasenyes\n"
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -q, --quiet                   mode silenciós\n"
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -s, --shadow                  edita la base de dades «shadow» o «gshadow»\n"
@@ -2313,6 +2544,334 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: no es pot trobar el directori «tcb» per %s\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) ha fallat\n"
+
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Forma d'ús: chage [opcions] [USUARI]\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ "  -d, --lastday ÚLTIM_DIA          estableix l'últim canvi de "
+#~ "contrasenya\n"
+#~ "                                   a ÚLTIM_DIA\n"
+#~ "  -E, --expiredate DATA_EXPIRACIÓ  estableix la data d'expiració del\n"
+#~ "                                   compte a DATA_EXPIRACIÓ\n"
+#~ "  -h, --help                       mostra aquesta ajuda i acaba\n"
+#~ "  -I, --inactive INACTIVA          estableix la contrasenya inactiva\n"
+#~ "                                   després d'expiració a INACTIVA\n"
+#~ "  -l, --list                       mostra informació d'envelliment del\n"
+#~ "                                   compte\n"
+#~ "  -m, --mindays DIES_MÍN           estableix el número mínim de dies "
+#~ "abans\n"
+#~ "                                   de canvi de contrasenya a DIES_MÍN\n"
+#~ "  -M, --maxdays DIES_MÀX           estableix el número màxim de dies "
+#~ "abans\n"
+#~ "                                   de canvi de contrasenya a DIES_MÀX\n"
+#~ "  -W, --warndays DIES_AVÍS         estableix els dies d'avís d'expiració\n"
+#~ "                                   a DIES_AVÍS\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: l'autenticació PAM ha fallat\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Forma d'ús: %s [-f nom_complet] [-r num_habitació] [-w tel_feina]\n"
+#~ "\t[-h tel_casa] [-o altre] [usuari]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Forma d'ús: %s [-f nom_complet] [-r num_habitació] [-w tel_feina]\n"
+#~ "[-h tel_casa]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Forma d'ús: %s [opcions]\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ " -c, --crypt-method            mètode de xifrat (un de %s)\n"
+#~ "  -e, --encrypted               les contrasenyes proveïdes estan "
+#~ "xifrades\n"
+#~ "  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+#~ "  -m, --md5                     xifra la contrasenya en text pla fent "
+#~ "servir\n"
+#~ "                                l'algorisme MD5\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Forma d'ús: chsh [opcions] [USUARI]\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ "  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+#~ "  -s, --shell INTÈRPRET         nou intèrpret d'accés per al compte "
+#~ "d'usuari\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Forma d'ús: expiry {-f|-c}\n"
+
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "faillog: Errada en l'obtenció de l'entrada per UID %lu\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "informe d'error: no es pot obrir %s: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: No és possible obtenir la mida de %s: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Forma d'ús: groupdel grup\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Forma d'ús: %s [-r] [-s] [grup [grup_ombra]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Forma d'ús: %s [-r] [-s] [grup]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: «-s» i «-r» són incompatibles\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Forma d'ús: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Forma d'ús: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Forma d'ús: lastlog [opcions]\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ "  -b, --before DIES             mostra només els registres de lastlog "
+#~ "més\n"
+#~ "                                antics que DIES\n"
+#~ "  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+#~ "  -t, --time DIES               mostra només els registres de lastlog "
+#~ "més\n"
+#~ "                                recents que DIES\n"
+#~ "  -u, --user USUARI             mostra el registre de lastlog per a\n"
+#~ "                                l'usuari amb USUARI especific\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Forma d'ús: passwd [opcions] [USUARI]\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ "  -a, --all                     informa de l'estat de la contrasenya\n"
+#~ "                                per a tots els comptes\n"
+#~ "  -d, --delete                  esborra la contrasenya per al compte\n"
+#~ "                                anomenat\n"
+#~ "  -e, --expire                  força la caducitat de la contrasenya per\n"
+#~ "                                al compte anomenat\n"
+#~ "  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+#~ "  -k, --keep-tokens             canvia la contrasenya només si ha "
+#~ "caducat\n"
+#~ "  -i, --inactive INACTIU        estableix la contrasenya a inactiva "
+#~ "després\n"
+#~ "                                d'INACTIU dies de caducitat\n"
+#~ "  -l, --lock                    bloca el compte anomenat\n"
+#~ "  -n, --mindays DIES_MÍN        estableix els dies mínims abans del "
+#~ "canvi\n"
+#~ "                                de contrasenya a DIES_MÍN\n"
+#~ "  -q, --quiet                   mode silenciós\n"
+#~ "  -r, --repository REPOSITORI   canvia la contrasenya en el REPOSITORI\n"
+#~ "  -S, --status                  informa de l'estat de la contrasenya per\n"
+#~ "                                al compte anomenat\n"
+#~ "  -u, --unlock                  desbloca el compte anomenat\n"
+#~ "  -w, --warndays DIES_AVÍS      estableix els dies d'avís de caducitat\n"
+#~ "                                a DIES_AVÍS\n"
+#~ "  -x, --maxdays DIES_MÀX        estableix els dies màxims abans del "
+#~ "canvi\n"
+#~ "                                de contrasenya a DIES_MÀX\n"
+#~ "\n"
+
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Forma d'ús: %s [-q] [-r] [contrasenya]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Forma d'ús: %s [-q] [-r] [-s] [contrasenya [ombra]]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Forma d'ús: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Forma d'ús: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "El identificador és desconegut: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "No hi ha intèrpret d'ordres\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Forma d'ús: userdel [opcions] USUARI\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ "  -f, --force                   força l'eliminació de fitxers, encara "
+#~ "que\n"
+#~ "                                no siguin propietat de l'usuari\n"
+#~ "  -h, --help                    mostra aquesta ajuda i acaba\n"
+#~ "  -r, --remove                  elimina el directori personal i la cua\n"
+#~ "                                de correu\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: l'usuari %s està actualment dins el sistema\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Forma d'ús: usermod [opcions] USUARI\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ "  -c, --comment COMENTARI       nou valor per al camp GECOS\n"
+#~ "  -d, --home DIR_PERSONAL       nou directori personal per al nou compte\n"
+#~ "                                d'usuari\n"
+#~ "  -e, --expiredate DATA_CADUCIT estableix la data de caducitat del "
+#~ "compte\n"
+#~ "                                a DATA_CADUCITAT\n"
+#~ "  -f, --inactive INACTIU        estableix la contrasenya a inactiva "
+#~ "després\n"
+#~ "                                d'INACTIU dies de caducitat\n"
+#~ "  -g, --gid GRUP                força l'ús de GRUP com a nou grup "
+#~ "inicial\n"
+#~ "                                d'accés\n"
+#~ "  -G, --groups GRUPS            llista de GRUPS addicionals\n"
+#~ "  -a, --append                  afegeix l'usuari als GRUPS addicionals\n"
+#~ "                                llistats amb la opció -G sense eliminar-"
+#~ "los\n"
+#~ "                                d'altres grups\n"
+#~ "  -h, --help                    mostra aquest missatge d'ajuda i surt\n"
+#~ "  -l, --login USUARI            nou valor per al nom d'usuari\n"
+#~ "  -L, --lock                    bloca el compte d'usuari\n"
+#~ "  -m, --move-home               mou els continguts del directori "
+#~ "personal\n"
+#~ "                                a la nova ubicació (usar només amb -d)\n"
+#~ "  -o, --non-unique              permet usar UID duplicats (no únics)\n"
+#~ "  -p, --password CONTRASENYA    usa contrasenya xifrada per a la nova\n"
+#~ "                                contrasenya\n"
+#~ "  -s, --shell INTÈRPRET         nou intèrpret d'accés per al compte "
+#~ "d'usuari\n"
+#~ "  -u, --uid UID                 nou UID per al compte d'usuari\n"
+#~ "  -U, --unlock                  desbloca el compte d'usuari\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: no s'han especificat assenyaladors\n"
+
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
@@ -2867,9 +3426,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/cs.po
===================================================================
--- upstream/trunk/po/cs.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/cs.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2009-10-04 15:44+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -40,6 +40,14 @@
 msgstr ""
 "konfigurační chyba - neznámá položka „%s“ (informujte správce systému)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Heslo: "
 
@@ -229,6 +237,11 @@
 "(%lu)\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "chyba při změně vlastníka poštovní schránky"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: Nelze získat jedinečné systémové GID (volná GID neexistují)\n"
@@ -311,6 +324,33 @@
 msgstr "Chybné heslo pro %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: selhalo odevzdání privilegií (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: chybné telefonní číslo domů: „%s“\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: adresář %s nelze vytvořit\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: adresář %s nelze vytvořit\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -340,47 +380,75 @@
 msgid "Unable to determine your tty name."
 msgstr "Nelze zjistit vaše uživatelské jméno."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "volání malloc(%d) selhalo\n"
-
 msgid "No"
 msgstr "Ne"
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"Použití: %s [volby] ÚČET\n"
+"\n"
+"Volby:\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "  -e, --expiredate EXP_DATUM    datum vypršení platnosti nového účtu\n"
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr "  -p, --password HESLO          změní heslo na (šifrované) HESLO\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+"  -r, --reset                   vynuluje počitadla chybných přihlášení\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir DOMOV_ADR      domovský adresář nového účtu\n"
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Použití: chage [volby] ÚČET\n"
-"\n"
-"Volby:\n"
-"  -d, --lastday POSL_DEN        nastaví datum poslední změny hesla na "
-"POSL_DEN\n"
-"  -E, --expiredate EXP_DATUM    nastaví datum vypršení účtu na EXP_DATUM\n"
-"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
-"  -I, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od vypršení\n"
-"                                platnosti hesla\n"
-"  -l, --list                    zobrazí informace o účtu\n"
-"  -m, --mindays MIN_DNŮ         nastaví minimální počet dnů před změnou\n"
-"                                hesla na MIN_DNŮ\n"
-"  -M, --maxdays MAX_DNŮ         nastaví maximální počet dnů před změnou\n"
-"                                hesla na MAX_DNŮ\n"
-"  -W, --warndays VAR_DNŮ        nastaví varování o expiraci na VAR_DNŮ\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr ""
@@ -454,9 +522,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -479,10 +548,6 @@
 msgstr "%s: soubor se stínovými hesly není přítomen\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: selhalo odevzdání privilegií (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: uživatel „%s“ v %s neexistuje\n"
 
@@ -494,20 +559,40 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: chyba při změně položek\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Použití: %s [-f jméno] [-r číslo místnosti] [-w telefon do zaměstnání]\n"
-"\t[-h telefon domů] [-o ostatní] [uživatel]\n"
+"Použití: %s [volby] ÚČET\n"
+"\n"
+"Volby:\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Použití: %s [-f jméno] [-r číslo místnosti] [-w telefon do zaměstnání]\n"
-"\t[-h telefon domů]\n"
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Celé jméno"
 
@@ -587,22 +672,25 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 "Použití: %s [volby]\n"
 "\n"
 "Volby:\n"
-"  -c, --crypt-method            typ šifry (jeden z %s)\n"
-"  -e, --encrypted               zadaná hesla jsou zašifrovaná\n"
-"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+
+#, fuzzy, c-format
+#| msgid "  -c, --crypt-method            the crypt method (one of %s)\n"
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr "  -c, --crypt-method            typ šifry (jeden z %s)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr "  -e, --encrypted               zadaná hesla jsou zašifrovaná\n"
+
+msgid ""
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
+msgstr ""
 "  -m, --md5                     zašifruje nešifrované heslo\n"
 "                                algoritmem MD5\n"
-"%s\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -642,34 +730,6 @@
 msgstr "%s: chyba, změny budou ignorovány\n"
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Použití: %s [volby]\n"
-"\n"
-"Volby:\n"
-
-#, fuzzy, c-format
-#| msgid "  -c, --crypt-method            the crypt method (one of %s)\n"
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method            typ šifry (jeden z %s)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr "  -e, --encrypted               zadaná hesla jsou zašifrovaná\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -m, --md5                     zašifruje nešifrované heslo\n"
-"                                algoritmem MD5\n"
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: (řádek %d: uživatel %s) heslo nebylo změněno\n"
 
@@ -677,20 +737,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: řádek %d: uživatel „%s“ neexistuje\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
-msgstr ""
-"Použití: chsh [volby] [ÚČET]\n"
-"\n"
-"Volby:\n"
-"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
-"  -s, --shell SHELL             nový přihlašovací shell uživatele\n"
-"\n"
+#, fuzzy
+#| msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
+msgstr "  -s, --shell SHELL             přihlašovací shell nového účtu\n"
 
 msgid "Login Shell"
 msgstr "Přihlašovací shell"
@@ -722,9 +772,32 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: varování: vlastníkem %s není %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Použití: expiry {-f|-c}\n"
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr "  -u, --uid UID                 uživatelské ID nového účtu\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -m, --md5                     zašifruje nešifrované heslo\n"
+"                                algoritmem MD5\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: volby %s a %s kolidují\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: neočekávaný argument: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 "  -a, --all                     zobrazí záznamy faillogu o všech "
@@ -767,9 +840,10 @@
 "m\n"
 "                                nebo -l)\n"
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "faillog: Nepodařilo se získat záznam pro UID %lu\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog: nepodařilo se získat záznam pro UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Uživatel    Chyb     Maximum Poslední                 Odkud\n"
@@ -782,32 +856,33 @@
 msgid " [%lds lock]"
 msgstr " [%lds zámek]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr ""
 "faillog: nepodařilo se vynulovat počet chybných přihlášení pro UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "faillog: nepodařilo se nastavit maximum pro UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: nepodařilo se nastavit délku zamknutí pro UID %lu\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog: Neznámý uživatel nebo rozsah: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "faillog: Nelze otevřít %s: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: nelze zjistit velikost %s: %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: Nelze zjistit velikost %s: %s\n"
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -823,6 +898,11 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete UŽIVATEL         odstraní UŽIVATELE ze SKUPINY\n"
 
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir DOMOV_ADR      domovský adresář nového účtu\n"
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         odstraní heslo SKUPINY\n"
 
@@ -958,8 +1038,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: GID „%lu“ již existuje\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Použití: groupdel skupina\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: vaše uživatelské jméno nelze zjistit.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1067,17 +1149,50 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: neznámý uživatel %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Použití: %s [-r] [-s] [soubor se skupinami [soubor se stínovými skupinami]]\n"
+"Použití: %s [volby] [akce]\n"
+"\n"
+"Volby:\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Použití: %s [-r] [-s] [soubor se skupinami]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Použití: %s [volby] [akce]\n"
+"\n"
+"Volby:\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -l, --list                    vypíše členy skupiny\n"
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s a -r nejsou slučitelné\n"
 
 msgid "invalid group file entry"
@@ -1147,12 +1262,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: žádné změny nebyly provedeny\n"
 
-msgid "Usage: grpconv\n"
-msgstr "Použití: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "Použití: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: nelze smazat %s\n"
@@ -1166,30 +1275,29 @@
 msgid " groups="
 msgstr " skupiny="
 
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -t, --time DNŮ                zobrazí záznamy faillogu novější než DNŮ\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr ""
+"  -t, --time DNŮ                zobrazí záznamy faillogu novější než DNŮ\n"
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Použití: lastlog [volby]\n"
-"\n"
-"Volby:\n"
-"  -b, --before DNŮ              zobrazí záznamy lastlogu starší než DNŮ\n"
-"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
-"  -t, --time DNŮ                zobrazí záznamy lastlogu novější než DNŮ\n"
-"  -u, --user ÚČET               zobrazí záznamy lastlogu pro uživatele ÚČET\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: nepodařilo se získat záznam pro UID %lu\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "Uživatel         Port     Z                Naposledy"
 
@@ -1200,14 +1308,6 @@
 msgstr "**Nikdy nebyl přihlášen**"
 
 #, 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 "lastlog: nelze zjistit velikost %s: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Použití: %s [-p] [jméno]\n"
 
@@ -1276,6 +1376,11 @@
 msgid "Login incorrect"
 msgstr "Chybné přihlášení"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: řádek %d: uživatele %s nelze nalézt\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1393,52 +1498,90 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: řádek %d: položku nelze aktualizovat\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+"  -a, --all                     zobrazí záznamy faillogu o všech "
+"uživatelích\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system                  vytvoří systémový účet\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system                  vytvoří systémový účet\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr "  -e, --encrypted               zadaná hesla jsou zašifrovaná\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr "  -p, --password HESLO          změní heslo na (šifrované) HESLO\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr "  -u, --uid UID                 uživatelské ID nového účtu\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr "  -l, --list                    vypíše členy skupiny\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system                  vytvoří systémový účet\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr "  -u, --uid UID                 uživatelské ID nového účtu\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
-msgstr ""
-"Použití: passwd [volby] [ÚČET]\n"
-"\n"
-"Volby:\n"
-"  -a, --all                     vypíše stav hesel na všech účtech\n"
-"  -d, --delete                  pro zadaný účet smaže heslo\n"
-"  -e, --expire                  pro zadaný účet vynutí expiraci hesla\n"
-"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
-"  -k, --keep-tokens             změní heslo pouze pokud mu vypršela\n"
-"                                platnost\n"
-"  -i, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od\n"
-"                                vypršení platnosti hesla\n"
-"  -l, --lock                    zamkne heslo zadaného účtu\n"
-"  -n, --mindays MIN_DNŮ         nastaví minimální počet dnů před změnou\n"
-"                                hesla na MIN_DNŮ\n"
-"  -q, --quiet                   tichý režim\n"
-"  -r, --repository REPOSITÁŘ    změní heslo v repositáři REPOSITÁŘ\n"
-"  -S, --status                  pro zadaný účet vypíše stav hesla\n"
-"  -u, --unlock                  odemkne heslo zadaného účtu\n"
-"  -w, --warndays VAR_DNŮ        nastaví varování o expiraci na VAR_DNŮ\n"
-"  -x, --maxdays MAX_DNŮ         nastaví maximální počet dnů před změnou\n"
-"                                hesla na MAX_DNŮ\n"
-"\n"
+msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
 
 msgid "Old password: "
 msgstr "Staré heslo: "
@@ -1522,19 +1665,37 @@
 msgstr "%s: informace o vypršení platnosti hesla byly změněny.\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Použití: %s [-q] [-r] [-s] [soubor s hesly [soubor se stínovými hesly]]\n"
+"Použití: %s [volby] [akce]\n"
+"\n"
+"Volby:\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Použití: %s [-q] [-r] [-s] [soubor s hesly [soubor se stínovými hesly]]\n"
+"Použití: %s [volby] [akce]\n"
+"\n"
+"Volby:\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s a -r nejsou slučitelné\n"
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr "  -l, --list                    vypíše členy skupiny\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1615,9 +1776,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: nelze seřadit záznamy v %s\n"
 
-msgid "Usage: pwconv\n"
-msgstr "Použití: pwconv\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1627,9 +1785,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: nepodařilo se změnit oprávnění %s na 0600\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "Použití: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Z tohoto účtu je přístup k su ZAKÁZÁN.\n"
 
@@ -1694,18 +1849,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: musí být spuštěno z terminálu\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ignoruji)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: chyba %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Neznámé id: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Nejste oprávněn používat su %s\n"
 
@@ -1713,14 +1864,6 @@
 msgstr "(Zadejte své heslo)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ignoruji)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: Chyba ověření\n"
 
@@ -1728,9 +1871,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s: Toto času nejste oprávněni používat su\n"
 
-msgid "No shell\n"
-msgstr "Žádný shell\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "V databázi není položka pro uživatele 'root'"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: musí být spuštěno z terminálu\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: chyba %d\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "lastlog: nelze zjistit velikost %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "%s nelze spustit"
+
 msgid "No password file"
 msgstr "Soubor s hesly neexistuje"
 
@@ -1772,8 +1935,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: příliš dlouhý řádek v %s: %s..."
 
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: přejmenovat: %s: %s"
 
 #, c-format
@@ -1784,9 +1948,15 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: zadáno příliš mnoho skupin (max %d).\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1926,10 +2096,6 @@
 msgstr "%s: -Z vyžaduje jádro s povoleným SELinuxem\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: volby %s a %s kolidují\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr "%s: nepodařilo se vynulovat faillog záznam UID %lu: %s\n"
 
@@ -1995,31 +2161,45 @@
 "%s: varování: domovský adresář již existuje.\n"
 "Nekopíruji do něj žádné soubory z adresáře skel.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -f, --force                   exit successfully if the group already "
+#| "exists,\n"
+#| "                                and cancel -g if the GID is already used\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Použití: userdel [volby] ÚČET\n"
-"\n"
-"VOLBY:\n"
-"  -f, --force                   vynutí odstranění souborů,\n"
-"                                i když je uživatel nevlastní\n"
-"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
-"  -r, --remove                  odstraní domovský adresář a poštovní\n"
-"                                schránku\n"
-"\n"
+"  -f, --force                   skončí úspěchem pokud již skupina existuje,\n"
+"                                zruší -g pokud je již GID použito\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+"  -r, --reset                   vynuluje počitadla chybných přihlášení\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: nelze odstranit primární skupinu uživatele „%s“.\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: skupina %s je primární skupinou jiného uživatele a nelze ji odstranit.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: domovský adresář uživatele %s (%s) nebyl nalezen\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: varování: nelze smazat %s: %s\n"
@@ -2052,10 +2232,6 @@
 msgstr "%s: uživatel %s je NIS uživatelem\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: uživatel %s je právě přihlášen\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: domovský adresář uživatele %s (%s) nebyl nalezen\n"
 
@@ -2067,59 +2243,98 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: chyba při mazání adresáře %s\n"
 
-#, c-format
+#, fuzzy
+#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr "  -c, --comment KOMENTÁŘ        pole GECOS nového účtu\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr "  -d, --home-dir DOMOV_ADR      domovský adresář nového účtu\n"
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr "  -e, --expiredate EXP_DATUM    datum vypršení platnosti nového účtu\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr "  -p, --password HESLO          změní heslo na (šifrované) HESLO\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr "  -g, --gid GID                 pro novou skupinu použije GID\n"
+
+#, fuzzy
+#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr "  -M, --members UŽIVATEL,...    nastaví seznam členů SKUPINY\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr "  -u, --uid UID                 uživatelské ID nového účtu\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
+#| "the\n"
+#| "                                new account\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -b, --base-dir ZÁKL_ADR       základní adresář pro domovský adresář "
+"nového\n"
+"                                uživatelského účtu\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
+#| "GID\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -o, --non-unique              povolí použití duplicitního\n"
+"                                (nejedinečného) GID\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       use this encrypted password for the new "
+#| "group\n"
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Použití: usermod [volby] ÚČET\n"
-"\n"
-"Volby:\n"
-"  -c, --comment KOMENTÁŘ        nová hodnota pole GECOS\n"
-"  -d, --home-dir DOMOV_ADR      nový domovský adresář uživatele\n"
-"  -e, --expiredate EXP_DATUM    nastaví vypršení platnosti účtu na "
-"EXP_DATUM\n"
-"  -f, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od vypršení\n"
-"  -g, --gid SKUPINA             nastaví novou primární SKUPINU\n"
-"  -G, --groups SKUPINY          nový seznam dodatečných skupin, do kterých\n"
-"                                má účet patřit\n"
-"  -a, --append                  přidá uživatele do dalších SKUPIN zadaných\n"
-"                                volbou -G; neruší členství v ostatních sk.\n"
-"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
-"  -l, --login NOVÝ_ÚČET         nová hodnota přihlašovacího jména\n"
-"  -L, --lock                    zamkne uživatelský účet\n"
-"  -m, --move-home               přesune obsah původního domovského adresáře\n"
-"                                do nového umístění (používejte pouze s -d)\n"
-"  -o, --non-unique              povolí vytvoření uživatele s duplicitním\n"
-"                                (nejedinečným) UID\n"
-"  -p, --password HESLO          použije nové zašifrované heslo\n"
-"  -s, --shell SHELL             nový přihlašovací shell uživatele\n"
-"  -u, --uid UID                 nové UID pro uživatelský účet\n"
-"  -U, --unlock                  odemkne uživatelský účet\n"
-"%s\n"
+"  -p, --password HESLO          pro novou skupinu použije šifrované heslo\n"
 
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr "  -u, --uid UID                 uživatelské ID nového účtu\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr "  -u, --uid UID                 uživatelské ID nového účtu\n"
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2140,19 +2355,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: uživatel „%s“ již v %s existuje\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: nelze otevřít %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: žádné přepínače\n"
+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: shadow passwords required for -e and -f\n"
 msgstr "%s: přepínače -e a -f vyžadují stínová hesla\n"
 
 #, c-format
-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' already exists\n"
 msgstr "%s: UID „%lu“ již existuje\n"
 
@@ -2236,11 +2452,6 @@
 msgstr "  -r, --system                  vytvoří systémový účet\n"
 
 #, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -l, --list                    vypíše členy skupiny\n"
-
-#, fuzzy
 #| msgid ""
 #| "  -a, --all                     display faillog records for all users\n"
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
@@ -2322,7 +2533,317 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: chybný základní adresář „%s“\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "volání malloc(%d) selhalo\n"
+
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použití: chage [volby] ÚČET\n"
+#~ "\n"
+#~ "Volby:\n"
+#~ "  -d, --lastday POSL_DEN        nastaví datum poslední změny hesla na "
+#~ "POSL_DEN\n"
+#~ "  -E, --expiredate EXP_DATUM    nastaví datum vypršení účtu na EXP_DATUM\n"
+#~ "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+#~ "  -I, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od "
+#~ "vypršení\n"
+#~ "                                platnosti hesla\n"
+#~ "  -l, --list                    zobrazí informace o účtu\n"
+#~ "  -m, --mindays MIN_DNŮ         nastaví minimální počet dnů před změnou\n"
+#~ "                                hesla na MIN_DNŮ\n"
+#~ "  -M, --maxdays MAX_DNŮ         nastaví maximální počet dnů před změnou\n"
+#~ "                                hesla na MAX_DNŮ\n"
+#~ "  -W, --warndays VAR_DNŮ        nastaví varování o expiraci na VAR_DNŮ\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: ověření pomocí PAM selhalo\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Použití: %s [-f jméno] [-r číslo místnosti] [-w telefon do zaměstnání]\n"
+#~ "\t[-h telefon domů] [-o ostatní] [uživatel]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Použití: %s [-f jméno] [-r číslo místnosti] [-w telefon do zaměstnání]\n"
+#~ "\t[-h telefon domů]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Použití: %s [volby]\n"
+#~ "\n"
+#~ "Volby:\n"
+#~ "  -c, --crypt-method            typ šifry (jeden z %s)\n"
+#~ "  -e, --encrypted               zadaná hesla jsou zašifrovaná\n"
+#~ "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+#~ "  -m, --md5                     zašifruje nešifrované heslo\n"
+#~ "                                algoritmem MD5\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použití: chsh [volby] [ÚČET]\n"
+#~ "\n"
+#~ "Volby:\n"
+#~ "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+#~ "  -s, --shell SHELL             nový přihlašovací shell uživatele\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Použití: expiry {-f|-c}\n"
+
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "faillog: Nepodařilo se získat záznam pro UID %lu\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "faillog: Nelze otevřít %s: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: Nelze zjistit velikost %s: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Použití: groupdel skupina\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr ""
+#~ "Použití: %s [-r] [-s] [soubor se skupinami [soubor se stínovými "
+#~ "skupinami]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Použití: %s [-r] [-s] [soubor se skupinami]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s a -r nejsou slučitelné\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Použití: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Použití: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použití: lastlog [volby]\n"
+#~ "\n"
+#~ "Volby:\n"
+#~ "  -b, --before DNŮ              zobrazí záznamy lastlogu starší než DNŮ\n"
+#~ "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+#~ "  -t, --time DNŮ                zobrazí záznamy lastlogu novější než DNŮ\n"
+#~ "  -u, --user ÚČET               zobrazí záznamy lastlogu pro uživatele "
+#~ "ÚČET\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použití: passwd [volby] [ÚČET]\n"
+#~ "\n"
+#~ "Volby:\n"
+#~ "  -a, --all                     vypíše stav hesel na všech účtech\n"
+#~ "  -d, --delete                  pro zadaný účet smaže heslo\n"
+#~ "  -e, --expire                  pro zadaný účet vynutí expiraci hesla\n"
+#~ "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+#~ "  -k, --keep-tokens             změní heslo pouze pokud mu vypršela\n"
+#~ "                                platnost\n"
+#~ "  -i, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od\n"
+#~ "                                vypršení platnosti hesla\n"
+#~ "  -l, --lock                    zamkne heslo zadaného účtu\n"
+#~ "  -n, --mindays MIN_DNŮ         nastaví minimální počet dnů před změnou\n"
+#~ "                                hesla na MIN_DNŮ\n"
+#~ "  -q, --quiet                   tichý režim\n"
+#~ "  -r, --repository REPOSITÁŘ    změní heslo v repositáři REPOSITÁŘ\n"
+#~ "  -S, --status                  pro zadaný účet vypíše stav hesla\n"
+#~ "  -u, --unlock                  odemkne heslo zadaného účtu\n"
+#~ "  -w, --warndays VAR_DNŮ        nastaví varování o expiraci na VAR_DNŮ\n"
+#~ "  -x, --maxdays MAX_DNŮ         nastaví maximální počet dnů před změnou\n"
+#~ "                                hesla na MAX_DNŮ\n"
+#~ "\n"
+
 #, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr ""
+#~ "Použití: %s [-q] [-r] [-s] [soubor s hesly [soubor se stínovými hesly]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr ""
+#~ "Použití: %s [-q] [-r] [-s] [soubor s hesly [soubor se stínovými hesly]]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Použití: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Použití: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Neznámé id: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Žádný shell\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použití: userdel [volby] ÚČET\n"
+#~ "\n"
+#~ "VOLBY:\n"
+#~ "  -f, --force                   vynutí odstranění souborů,\n"
+#~ "                                i když je uživatel nevlastní\n"
+#~ "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+#~ "  -r, --remove                  odstraní domovský adresář a poštovní\n"
+#~ "                                schránku\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: uživatel %s je právě přihlášen\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Použití: usermod [volby] ÚČET\n"
+#~ "\n"
+#~ "Volby:\n"
+#~ "  -c, --comment KOMENTÁŘ        nová hodnota pole GECOS\n"
+#~ "  -d, --home-dir DOMOV_ADR      nový domovský adresář uživatele\n"
+#~ "  -e, --expiredate EXP_DATUM    nastaví vypršení platnosti účtu na "
+#~ "EXP_DATUM\n"
+#~ "  -f, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od "
+#~ "vypršení\n"
+#~ "  -g, --gid SKUPINA             nastaví novou primární SKUPINU\n"
+#~ "  -G, --groups SKUPINY          nový seznam dodatečných skupin, do "
+#~ "kterých\n"
+#~ "                                má účet patřit\n"
+#~ "  -a, --append                  přidá uživatele do dalších SKUPIN "
+#~ "zadaných\n"
+#~ "                                volbou -G; neruší členství v ostatních "
+#~ "sk.\n"
+#~ "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+#~ "  -l, --login NOVÝ_ÚČET         nová hodnota přihlašovacího jména\n"
+#~ "  -L, --lock                    zamkne uživatelský účet\n"
+#~ "  -m, --move-home               přesune obsah původního domovského "
+#~ "adresáře\n"
+#~ "                                do nového umístění (používejte pouze s -"
+#~ "d)\n"
+#~ "  -o, --non-unique              povolí vytvoření uživatele s duplicitním\n"
+#~ "                                (nejedinečným) UID\n"
+#~ "  -p, --password HESLO          použije nové zašifrované heslo\n"
+#~ "  -s, --shell SHELL             nový přihlašovací shell uživatele\n"
+#~ "  -u, --uid UID                 nové UID pro uživatelský účet\n"
+#~ "  -U, --unlock                  odemkne uživatelský účet\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: žádné přepínače\n"
+
+#, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
@@ -2959,9 +3480,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/da.po
===================================================================
--- upstream/trunk/po/da.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/da.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -19,7 +19,7 @@
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2011-04-06 18:50+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -51,6 +51,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "opsætningsfejl - ukendt punkt »%s« (informer administrator)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Adgangskode: "
 
@@ -223,6 +231,11 @@
 msgstr ""
 "%s: Ugyldig opsætning: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%lu)\n"
 
+#, fuzzy, c-format
+#| msgid "failed to allocate memory"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "kunne ikke tildele hukommelse"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr ""
@@ -308,6 +321,33 @@
 msgstr "Ugyldig adgangskode for %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: Kunne ikke afgive rettigheder (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: Ugyldig hjemmetelefon: »%s«\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot create directory %s: %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: Kan ikke oprette mappen %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Failed to create tcb directory for %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: Kan ikke oprette tcv-mappe for %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -337,49 +377,81 @@
 msgid "Unable to determine your tty name."
 msgstr "Kan ikke afgøre dit tty-navn."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) mislykkedes\n"
-
 msgid "No"
 msgstr "Nej"
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"Brug: %s [tilvalg] LOGIND\n"
+"\n"
+"Tilvalg:\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "  -e, --expiredate UDLØBSDATO   udløbsdato på den nye konto\n"
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr "  -h, --help                    vis denne hjælpetekst og afslut\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -p, --password ADGANGSKODE    ændr adgangskoden til denne (krypteret)\n"
+"                                ADGANGSKODE\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+"  -r, --reset                   nulstil tælleren for mislykkede logind\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-runder for SHA*\n"
+"                                crypt-algoritmerne\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-runder for SHA*\n"
+"                                crypt-algoritmerne\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir HJEMMEMAPPE    hjemmemappe på den nye konto\n"
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Brug: chage [tilvalg] [LOGIND]\n"
-"\n"
-"Tilvalg:\n"
-"  -d, --lastday SIDSTE_DAG      sæt seneste adgangskodeændring til "
-"SIDSTE_DAG\n"
-"  -E, --expiredate UDLØBSDATO   sæt kontoens udløbsdato til UDLØBSDATO\n"
-"  -h, --help                    vis denne hjælpebesked og afslut\n"
-"  -I, --inactive INAKTIVT       sæt inaktiv adgangskode efter udløb til\n"
-"                                INAKTIVT\n"
-"  -l, --list                    vis forældelsesoplysninger for konto\n"
-"  -m, --mindays MIN_DAGE        sæt minimalt antal dage inden\n"
-"                                adgangskodeændring\n"
-"                                til MIN_DAGE\n"
-"  -M, --maxdays MAKS_DAGE       sæt maksimalt antal dage inden\n"
-"                                adgangskodeændring til MAKS_DAGE\n"
-"  -W, --warndays VARSELSDAGE    sæt antallet af udløbsvarselsdage til\n"
-"                                VARSELSDAGE\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Angiv ny værdi eller tryk RETUR for standardværdien"
@@ -452,9 +524,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -477,10 +550,6 @@
 msgstr "%s: Skyggeadgangskodefilen findes ikke\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: Kunne ikke afgive rettigheder (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: Brugeren »%s« findes ikke i %s\n"
 
@@ -492,19 +561,40 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: Fejl ved ændring af felter\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Brug: %s [-f fulde_navn] [-r rum] [-w arbejdstelefon]\n"
-"\t[-h hjemmetelefon] [-o andet] [bruger]\n"
+"Brug: %s [tilvalg] LOGIND\n"
+"\n"
+"Tilvalg:\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Brug: %s [-f fulde_navn] [-r rum] [-w arbedstelefon] [-h hjemmetelefon]\n"
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr "  -h, --help                    vis denne hjælpetekst og afslut\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Fulde navn"
 
@@ -584,24 +674,27 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 "Brug: %s [tilvalg]\n"
 "\n"
 "Tilvalg:\n"
-"  -c, --crypt-method            crypt-metoden (en af %s)\n"
-"  -e, --encrypted               de angivne adgangskoder er krypterede\n"
-"  -h, --help                    vis denne hjælpetekst og afslut\n"
-"  -m, --md5                     krypter adgangskoden i klartekst med brug\n"
-"                                af MD5-algoritmen\n"
-"%s\n"
 
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr "  -c, --crypt-method <METODE>   crypt-metoden (en af %s)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr "  -e, --encrypted               angivne adgangskoder er krypterede\n"
+
 msgid ""
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
+msgstr ""
+"  -m, --md5                     krypter adgangskoden med klartekst med brug "
+"af\n"
+"                                MD5-algoritmen\n"
+
+msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
 "                                crypt algorithms\n"
 msgstr ""
@@ -641,34 +734,6 @@
 msgstr "%s: Fejl opdaget, ændringerne blev ignoreret\n"
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Brug: %s [tilvalg]\n"
-"\n"
-"Tilvalg:\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method <METODE>   crypt-metoden (en af %s)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr "  -e, --encrypted               angivne adgangskoder er krypterede\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr "  -h, --help                    vis denne hjælpetekst og afslut\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -m, --md5                     krypter adgangskoden med klartekst med brug "
-"af\n"
-"                                MD5-algoritmen\n"
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: (Linje %d, bruger %s) adgangskode ikke ændret\n"
 
@@ -676,22 +741,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: Linje %d: Bruger »%s« findes ikke\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
-msgstr ""
-"Brug: chsh [tilvalg] [LOGIND]\n"
-"\n"
-"Tilvalg:\n"
-"  -f, --force                   gennemtving fjernelse af filer, selvom\n"
-"                                de ikke ejers af brugeren\n"
-"  -h, --help                    vis denne hjælpebesked og afslut\n"
-"  -s, --shell SKAL              ny logindskal for brugerkontoen\n"
-"\n"
+#, fuzzy
+#| msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
+msgstr "  -s, --shell SKAL              logindskal for den nye konto\n"
 
 msgid "Login Shell"
 msgstr "Logindskal"
@@ -720,9 +773,35 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Advarsel: %s er ikke kørbar\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Brug: expiry {-f|-c}\n"
+#, fuzzy
+#| msgid ""
+#| "  -u, --user                    which user's tcb shadow file to edit\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
+"  -u, --user                    hvilken brugers tcb-skyggefil at redigere\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -m, --md5                     krypter adgangskoden med klartekst med brug "
+"af\n"
+"                                MD5-algoritmen\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: Tilvalg %s og %s er i konflikt\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: Uventet argument: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr "  -a, --all                     vis faillog-poster for alle brugere\n"
 
@@ -759,9 +838,10 @@
 "-r,\n"
 "                                 -m, eller -l) for de angivne LOGIND'ER\n"
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "faillog: Kunne ikke indhente punktet for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog: Kunne ikke indhente punktet for UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Logind      Fejl     Maksimum Seneste                 Tid\n"
@@ -774,31 +854,32 @@
 msgid " [%lds lock]"
 msgstr " [%lds lås]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: Kunne ikke nulstille fejlantal for UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "faillog: Kunne ikke angive maks for UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: Kunne ikke angive låsetid for UID %lu\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog: Ukendt bruger eller interval: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "faillog: Kan ikke åbne %s: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: Kan ikke indhente størrelsen for %s: %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: Kan ikke indhente størrelsen af %s: %s\n"
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -814,6 +895,11 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete BRUGER           fjern BRUGER fra GRUPPE\n"
 
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir HJEMMEMAPPE    hjemmemappe på den nye konto\n"
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         fjern GRUPPENS adgangskode\n"
 
@@ -946,8 +1032,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: GID »%lu« findes allerede\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Brug: groupdel gruppe\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Kan ikke afgøre dit brugernavn.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1059,16 +1147,52 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: Ukendt bruger %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Brug: %s [-r] [-s] [gruppe [gskygge]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Brug: %s [tilvalg] [handling]\n"
+"\n"
+"Tilvalg:\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Brug %s [-r] [-s] [gruppe]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Brug: %s [tilvalg] [handling]\n"
+"\n"
+"Tilvalg:\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-runder for SHA*\n"
+"                                crypt-algoritmerne\n"
+
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -l, --list                    vis medlemmer af gruppen\n"
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s og -r er ikke kompatible\n"
 
 msgid "invalid group file entry"
@@ -1138,12 +1262,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: Ingen ændringer\n"
 
-msgid "Usage: grpconv\n"
-msgstr "Brug: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "Brug: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: Kan ikke slette %s\n"
@@ -1157,33 +1275,27 @@
 msgid " groups="
 msgstr " grupper="
 
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "  -t, --time DAGE               vis faillog-poster nyere end DAGE\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr "  -t, --time DAGE               vis faillog-poster nyere end DAGE\n"
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Brug: lastlog [tilvalg]\n"
-"\n"
-"Tilvalg:\n"
-"  -b, --before DAGE             vis kun lastlog-poster, der er ældre\n"
-"                                end DAGE\n"
-"  -h, --help                    vis denne hjælpebesked og afslut\n"
-"  -t, --time DAGE               vis kun lastlog-poster, der er nyere\n"
-"                                end DAGE\n"
-"  -u, --user LOGIND             vis lastlog-poster for brugeren med\n"
-"                                det angivne LOGIND\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Kunne ikke indhente punktet for UID %lu\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "Brugernavn       Port     Fra              Seneste"
 
@@ -1194,14 +1306,6 @@
 msgstr "**Har aldrig logget på**"
 
 #, 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 "lastlog: Kan ikke indhente størrelsen for %s: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Brug: %s [-p] [navn]\n"
 
@@ -1270,6 +1374,11 @@
 msgid "Login incorrect"
 msgstr "Forkert logind"
 
+#, fuzzy, c-format
+#| msgid "%s: Cannot fork user shell\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: Kan ikke forgrene brugerskal\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1387,52 +1496,92 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: Linje %d: Kan ikke opdatere punktet\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr "  -a, --all                     vis faillog-poster for alle brugere\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system                  opret en systemkonto\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system                  opret en systemkonto\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr "  -e, --encrypted               angivne adgangskoder er krypterede\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -p, --password ADGANGSKODE    ændr adgangskoden til denne (krypteret)\n"
+"                                ADGANGSKODE\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr "  -u, --uid UID                 bruger-id for den nye konto\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-runder for SHA*\n"
+"                                crypt-algoritmerne\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr "  -q, --quiet                   tavs tilstand\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system                  opret en systemkonto\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr "  -u, --uid UID                 bruger-id for den nye konto\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Brug: passwd [tilvalg] [LOGIND]\n"
-"\n"
-"Tilvalg:\n"
-"  -a, --all                     rapporter alle kontis adgangskodestatus\n"
-"  -d, --delete                  slet den navngivne kontos adgangskode\n"
-"  -e, --expire                  gennemtving udløb af den navngivne kontos\n"
-"                                adgangskode\n"
-"  -h, --help                    vis denne hjælpebesked og afslut\n"
-"  -k, --keep-tokens             skift kun adgangskode, hvis den er udløbet\n"
-"  -i, --inactive INAKTIVE       set udløbne adgangskoder til INAKTIVE\n"
-"  -l, --lock                    læs den navngivne konto\n"
-"  -n, --mindays MIN_DAGE        angiv minimale antal dage inden skift af\n"
-"                                adgangskode til MIN_DAGE\n"
-"  -q, --quiet                   tavs tilstand\n"
-"  -r, --repository SAMLING      skift adgangskode i samlingen SAMLING\n"
-"  -S, --status                  raporter den navngivne kontos\n"
-"                                adgangskodestatus\n"
-"  -u, --unlock                  åbn adgangskoden på den navngivne konto\n"
-"  -w, --warndays ADVAR_DAGE     advar om udløb i ADVAR_DAGE dage\n"
-"  -x, --maxdays MAKS_DAGE       sæt det maksimale antal dage inden skift af\n"
-"                                adgangskode til MAKS_DAGE\n"
-"\n"
+"  -s, --sha-rounds              antal SHA-runder for SHA*\n"
+"                                crypt-algoritmerne\n"
 
 msgid "Old password: "
 msgstr "Gammel adgangskode: "
@@ -1515,17 +1664,38 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: Information om udløb af adgangskode blev ændret.\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Brug: %s [-q] [-r] [adgangskode]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Brug: %s [tilvalg] [handling]\n"
+"\n"
+"Tilvalg:\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Brug: %s [-q] [-r] [-s] [adgangskode [skygge]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Brug: %s [tilvalg] [handling]\n"
+"\n"
+"Tilvalg:\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s og -r er ikke kompatible\n"
+#, fuzzy
+#| msgid "  -q, --quiet                   quiet mode\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr "  -q, --quiet                   tavs tilstand\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1602,9 +1772,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: Kan ikke sortere punkter i %s\n"
 
-msgid "Usage: pwconv\n"
-msgstr "Brug: pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: Kan ikke arbejde med tcb aktiveret\n"
@@ -1613,9 +1780,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: Kunne ikke ændre tilstanden for %s til 0600\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "Brug: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Adgang til at udføre su til den konto er NÆGTET.\n"
 
@@ -1680,18 +1844,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: Skal køres fra en terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ignoreret)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: Fejl %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Ukendt id: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Du er ikke autoriseret til at su %s\n"
 
@@ -1699,14 +1859,6 @@
 msgstr "(Angiv din adgangskode)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ignoreret)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: Godkendelse mislykkedes\n"
 
@@ -1714,9 +1866,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s: Du er ikke autoriseret til at su på det tidspunkt\n"
 
-msgid "No shell\n"
-msgstr "Ingen skal\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Intet adgangskodepunkt for »root«"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: Skal køres fra en terminal\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: Fejl %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot remove the content of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: Kan ikke fjerne indholdet af %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Kan ikke udføre %s"
+
 msgid "No password file"
 msgstr "Ingen adgangskodefil"
 
@@ -1758,8 +1930,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: Linje for lang i %s: %s..."
 
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: Omdøb: %s: %s"
 
 #, c-format
@@ -1770,9 +1943,15 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: Der er angivet for mange grupper (højst %d).\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1915,10 +2094,6 @@
 msgstr "%s: -Z kræver SELinux-aktiveret kerne\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: Tilvalg %s og %s er i konflikt\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr "%s: Kunne ikke nulstille faillog-punktet for UID %lu: %s\n"
 
@@ -1982,30 +2157,45 @@
 "%s: Advarsel: Hjemmemappen findes allerede.\n"
 "Kopierer ikke nogen filer til den fra skelet-mappen.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -f, --force                   exit successfully if the group already "
+#| "exists,\n"
+#| "                                and cancel -g if the GID is already used\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Brug: userdel [tilvalg] LOGIND\n"
-"\n"
-"Tilvalg:\n"
-"  -f, --force                   gennemtving fjernelse af filer,\n"
-"                                selvom de ikke ejers af brugeren\n"
-"  -h, --help                    vis denne hjælpebesked og afslut\n"
-"  -r, --remove                  fjern home-mappen og postkøen\n"
-"\n"
+"  -f, --force                   afslut hvis gruppen allerede findes,\n"
+"                                 og afbryd -g hvis GID'en allerede bruges\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+"  -r, --reset                   nulstil tælleren for mislykkede logind\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: Kan ikke fjerne den primære gruppe for bruger »%s«.\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Gruppe %s er den primære gruppe for en anden bruger og fjernes ikke.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: %s hjemmemappe (%s) er ikke fundet\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: Advarsel: Kan ikke fjerne %s: %s\n"
@@ -2036,10 +2226,6 @@
 msgstr "%s: Brugeren %s er en NIS-bruger\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: Brugeren %s er logget på\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: %s hjemmemappe (%s) er ikke fundet\n"
 
@@ -2052,59 +2238,100 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: Fejl under fjernelse af mappen %s\n"
 
-#, c-format
+#, fuzzy
+#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr "  -c, --comment KOMMENTAR       GECOS-felt på den nye konto\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr "  -d, --home-dir HJEMMEMAPPE    hjemmemappe på den nye konto\n"
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr "  -e, --expiredate UDLØBSDATO   udløbsdato på den nye konto\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -p, --password ADGANGSKODE    ændr adgangskoden til denne (krypteret)\n"
+"                                ADGANGSKODE\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr "  -g, --gid GID                 anvend GID for den nye gruppe\n"
+
+#, fuzzy
+#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr "  -M, --members BRUGER,...      angiv medlemslisten for GRUPPE\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr "  -u, --uid UID                 bruger-id for den nye konto\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
+#| "the\n"
+#| "                                new account\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -b, --base-dir BASIS_MAP      basismappe for hjemmemappen på den nye\n"
+"                                konto\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
+#| "GID\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -o, --non-unique              tillad at bruge en tilsvarende (der ikke er "
+"unik) GID\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       use this encrypted password for the new "
+#| "group\n"
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Brug: usermod [tilvalg] LOGIND\n"
-"\n"
-"Tilvalg:\n"
-"  -a, --append GRUPPE           tilføj brugeren til en supplerende GRUPPE\n"
-"  -c, --comment KOMMENTAR       ny værdi til GECOS-feltet\n"
-"  -d, --home-dir HJEMMEMAPPE    den nye brugerkontos hjemmemappe\n"
-"  -e, --expiredate UDLØBSDATO   sæt kontoens udløbsdato til UDLØBSDATO\n"
-"  -f, --inactive INAKTIV        sæt inaktiv adgangskode til INAKTIV efter\n"
-"                                udløb\n"
-"  -g, --gid GRUPPE              gennemtving brugen af GRUPPE til den nye\n"
-"                                primære gruppe\n"
-"  -G, --groups GRUPPER          ny liste med supplerende grupper\n"
-"  -h, --help                    vis denne hjælpebesked og afslut\n"
-"  -l, --login NYT_LOGIND        ny værdi til logindnavnet\n"
-"  -L, --lock                    lås brugerkontoen\n"
-"  -m, --move-home               flyt indholdet af hjemmemappen til den nye\n"
-"                                placering (brug kun sammen med -d)\n"
-"  -o, --non-unique              tillad oprettelse af ens (der ikke er unik) "
-"UID\n"
-"  -p, --password ADGANGSKODE    brug krypteret adgangskode til den nye\n"
-"                                adgangskode\n"
-"  -s, --shell SKAL              den nye brugerkontos logindskal\n"
-"  -u, --uid UID                 ny UID til brugerkontoen\n"
-"  -U, --unlock                  åbn brugerkontoen\n"
-"%s\n"
+"  -p, --password ADGANGSKODE     brug denne krypterede adgangskode for den "
+"nye gruppe\n"
 
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr "  -u, --uid UID                 bruger-id for den nye konto\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr "  -u, --uid UID                 bruger-id for den nye konto\n"
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2126,19 +2353,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: Brugeren »%s« findes allerede i %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: Kan ikke åbne %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: Ingen flag angivet\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr "%s: Flagene -L, -p og -U udelukker hinanden\n"
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: Skyggeadgangskoder kræves for -e og -f\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr "%s: Flagene -L, -p og -U udelukker hinanden\n"
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr "%s: UID »%lu« findes allerede\n"
 
@@ -2211,9 +2439,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -p, --passwd                  rediger passwd-database\n"
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -q, --quiet                   tavs tilstand\n"
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -s, --shadow                  rediger skygge- eller gskyggedatabase\n"
@@ -2273,3 +2498,311 @@
 #, c-format
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: Kunne ikke finde tcb-mappe for %s\n"
+
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) mislykkedes\n"
+
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Brug: chage [tilvalg] [LOGIND]\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ "  -d, --lastday SIDSTE_DAG      sæt seneste adgangskodeændring til "
+#~ "SIDSTE_DAG\n"
+#~ "  -E, --expiredate UDLØBSDATO   sæt kontoens udløbsdato til UDLØBSDATO\n"
+#~ "  -h, --help                    vis denne hjælpebesked og afslut\n"
+#~ "  -I, --inactive INAKTIVT       sæt inaktiv adgangskode efter udløb til\n"
+#~ "                                INAKTIVT\n"
+#~ "  -l, --list                    vis forældelsesoplysninger for konto\n"
+#~ "  -m, --mindays MIN_DAGE        sæt minimalt antal dage inden\n"
+#~ "                                adgangskodeændring\n"
+#~ "                                til MIN_DAGE\n"
+#~ "  -M, --maxdays MAKS_DAGE       sæt maksimalt antal dage inden\n"
+#~ "                                adgangskodeændring til MAKS_DAGE\n"
+#~ "  -W, --warndays VARSELSDAGE    sæt antallet af udløbsvarselsdage til\n"
+#~ "                                VARSELSDAGE\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM-autentifikation mislykkedes\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Brug: %s [-f fulde_navn] [-r rum] [-w arbejdstelefon]\n"
+#~ "\t[-h hjemmetelefon] [-o andet] [bruger]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Brug: %s [-f fulde_navn] [-r rum] [-w arbedstelefon] [-h hjemmetelefon]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Brug: %s [tilvalg]\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ "  -c, --crypt-method            crypt-metoden (en af %s)\n"
+#~ "  -e, --encrypted               de angivne adgangskoder er krypterede\n"
+#~ "  -h, --help                    vis denne hjælpetekst og afslut\n"
+#~ "  -m, --md5                     krypter adgangskoden i klartekst med "
+#~ "brug\n"
+#~ "                                af MD5-algoritmen\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Brug: chsh [tilvalg] [LOGIND]\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ "  -f, --force                   gennemtving fjernelse af filer, selvom\n"
+#~ "                                de ikke ejers af brugeren\n"
+#~ "  -h, --help                    vis denne hjælpebesked og afslut\n"
+#~ "  -s, --shell SKAL              ny logindskal for brugerkontoen\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Brug: expiry {-f|-c}\n"
+
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "faillog: Kunne ikke indhente punktet for UID %lu\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "faillog: Kan ikke åbne %s: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: Kan ikke indhente størrelsen af %s: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Brug: groupdel gruppe\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Brug: %s [-r] [-s] [gruppe [gskygge]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Brug %s [-r] [-s] [gruppe]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s og -r er ikke kompatible\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Brug: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Brug: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Brug: lastlog [tilvalg]\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ "  -b, --before DAGE             vis kun lastlog-poster, der er ældre\n"
+#~ "                                end DAGE\n"
+#~ "  -h, --help                    vis denne hjælpebesked og afslut\n"
+#~ "  -t, --time DAGE               vis kun lastlog-poster, der er nyere\n"
+#~ "                                end DAGE\n"
+#~ "  -u, --user LOGIND             vis lastlog-poster for brugeren med\n"
+#~ "                                det angivne LOGIND\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Brug: passwd [tilvalg] [LOGIND]\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ "  -a, --all                     rapporter alle kontis adgangskodestatus\n"
+#~ "  -d, --delete                  slet den navngivne kontos adgangskode\n"
+#~ "  -e, --expire                  gennemtving udløb af den navngivne "
+#~ "kontos\n"
+#~ "                                adgangskode\n"
+#~ "  -h, --help                    vis denne hjælpebesked og afslut\n"
+#~ "  -k, --keep-tokens             skift kun adgangskode, hvis den er "
+#~ "udløbet\n"
+#~ "  -i, --inactive INAKTIVE       set udløbne adgangskoder til INAKTIVE\n"
+#~ "  -l, --lock                    læs den navngivne konto\n"
+#~ "  -n, --mindays MIN_DAGE        angiv minimale antal dage inden skift af\n"
+#~ "                                adgangskode til MIN_DAGE\n"
+#~ "  -q, --quiet                   tavs tilstand\n"
+#~ "  -r, --repository SAMLING      skift adgangskode i samlingen SAMLING\n"
+#~ "  -S, --status                  raporter den navngivne kontos\n"
+#~ "                                adgangskodestatus\n"
+#~ "  -u, --unlock                  åbn adgangskoden på den navngivne konto\n"
+#~ "  -w, --warndays ADVAR_DAGE     advar om udløb i ADVAR_DAGE dage\n"
+#~ "  -x, --maxdays MAKS_DAGE       sæt det maksimale antal dage inden skift "
+#~ "af\n"
+#~ "                                adgangskode til MAKS_DAGE\n"
+#~ "\n"
+
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Brug: %s [-q] [-r] [adgangskode]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Brug: %s [-q] [-r] [-s] [adgangskode [skygge]]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Brug: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Brug: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Ukendt id: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Ingen skal\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Brug: userdel [tilvalg] LOGIND\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ "  -f, --force                   gennemtving fjernelse af filer,\n"
+#~ "                                selvom de ikke ejers af brugeren\n"
+#~ "  -h, --help                    vis denne hjælpebesked og afslut\n"
+#~ "  -r, --remove                  fjern home-mappen og postkøen\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: Brugeren %s er logget på\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Brug: usermod [tilvalg] LOGIND\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ "  -a, --append GRUPPE           tilføj brugeren til en supplerende "
+#~ "GRUPPE\n"
+#~ "  -c, --comment KOMMENTAR       ny værdi til GECOS-feltet\n"
+#~ "  -d, --home-dir HJEMMEMAPPE    den nye brugerkontos hjemmemappe\n"
+#~ "  -e, --expiredate UDLØBSDATO   sæt kontoens udløbsdato til UDLØBSDATO\n"
+#~ "  -f, --inactive INAKTIV        sæt inaktiv adgangskode til INAKTIV "
+#~ "efter\n"
+#~ "                                udløb\n"
+#~ "  -g, --gid GRUPPE              gennemtving brugen af GRUPPE til den nye\n"
+#~ "                                primære gruppe\n"
+#~ "  -G, --groups GRUPPER          ny liste med supplerende grupper\n"
+#~ "  -h, --help                    vis denne hjælpebesked og afslut\n"
+#~ "  -l, --login NYT_LOGIND        ny værdi til logindnavnet\n"
+#~ "  -L, --lock                    lås brugerkontoen\n"
+#~ "  -m, --move-home               flyt indholdet af hjemmemappen til den "
+#~ "nye\n"
+#~ "                                placering (brug kun sammen med -d)\n"
+#~ "  -o, --non-unique              tillad oprettelse af ens (der ikke er "
+#~ "unik) UID\n"
+#~ "  -p, --password ADGANGSKODE    brug krypteret adgangskode til den nye\n"
+#~ "                                adgangskode\n"
+#~ "  -s, --shell SKAL              den nye brugerkontos logindskal\n"
+#~ "  -u, --uid UID                 ny UID til brugerkontoen\n"
+#~ "  -U, --unlock                  åbn brugerkontoen\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: Ingen flag angivet\n"

Modified: upstream/trunk/po/de.po
===================================================================
--- upstream/trunk/po/de.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/de.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.1.4.2\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2011-04-15 21:22+0100\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -43,6 +43,14 @@
 msgstr ""
 "Konfigurationsfehler - Element »%s« unbekannt (Administrator verständigen).\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Passwort: "
 
@@ -217,6 +225,11 @@
 "%s: Ungültige Konfiguration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
 "(%lu)\n"
 
+#, fuzzy, c-format
+#| msgid "failed to allocate memory"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "Speicherreservierung fehlgeschlagen"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: Keine einmalige System-GID bekommen (keine GIDs mehr verfügbar)\n"
@@ -301,6 +314,33 @@
 msgstr "Falsches Passwort für %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: Fehler beim Entfernen der Privilegien (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: Ungültige Telefon-Nr. (privat): »%s«\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot create directory %s: %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: Verzeichnis %s kann nicht erstellt werden: %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Failed to create tcb directory for %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: Erstellen des tcb-Verzeichnisses für %s fehlgeschlagen\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -330,49 +370,83 @@
 msgid "Unable to determine your tty name."
 msgstr "Ihr tty-Name konnte nicht festgestellt werden."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) fehlgeschlagen\n"
-
 msgid "No"
 msgstr "Nein"
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"Aufruf: %s [Optionen] BENUTZERZUGANG\n"
+"\n"
+"Optionen:\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -e, --expiredate ABL_DATUM    Das Ablaufdatum des neuen Benutzerzugangs\n"
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -p, --password PASSWORT       Das Passwort auf dieses (verschlüsselte)\n"
+"                                PASSWORT ändern\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+"  -r, --reset                   Zähler fehlgeschlagener Anmeldungen\n"
+"                                zurücksetzen\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
+"                                Verschlüsselungs-Algorithmus\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
+"                                Verschlüsselungs-Algorithmus\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir HOME_VERZ      Home-Verzeichnis des neuen Benutzers\n"
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Aufruf: chage [Optionen] [BENUTZERZUGANG]\n"
-"\n"
-"Optionen:\n"
-"  -d, --lastday LETZTER_TAG     Tag der letzten Passwortänderung auf\n"
-"                                LETZTER_TAG setzen\n"
-"  -E, --expiredate ABL_DATUM    Ablaufdatum des Benutzerzugangs auf\n"
-"                                ABL_DATUM setzen\n"
-"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
-"  -I, --inactive INAKTIV        Passwort nach Ablauf von INAKTIV\n"
-"                                deaktivieren\n"
-"  -l, --list                    Informationen zu Ablaufdaten usw. anzeigen\n"
-"  -m, --mindays MIN_TAGE        Minimale Anzahl der Tage vor\n"
-"                                Passwortänderung auf MIN_TAGE setzen\n"
-"  -M, --maxdays MAX_TAGE        Maximale Anzahl der Tage vor\n"
-"                                Passwortänderung auf MAX_TAGE setzen\n"
-"  -W, --warndays WARN_TAGE      Anzahl der Tage für Ablaufwarnung auf\n"
-"                                WARN_TAGE setzen\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr ""
@@ -446,9 +520,10 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: Ihr Benutzername konnte nicht bestimmt werden.\n"
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr "%s: PAM-Authentifizierung fehlgeschlagen\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -472,10 +547,6 @@
 msgstr "%s: shadow-Passwortdatei ist nicht vorhanden.\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: Fehler beim Entfernen der Privilegien (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: Benutzer »%s« ist in %s nicht vorhanden.\n"
 
@@ -487,20 +558,40 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: Fehler beim Ändern der Felder\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Aufruf: %s [-f vollst_Name] [-r Zimmernummer] [-w Tel_gesch]\n"
-"\t[-h Tel_privat] [-o sonstiges] [Benutzer]\n"
+"Aufruf: %s [Optionen] BENUTZERZUGANG\n"
+"\n"
+"Optionen:\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Aufruf: %s [-f vollst_Name] [-r Zimmernummer] [-w Tel_gesch] [-h "
-"Tel_privat]\n"
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
@@ -581,23 +672,27 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 "Aufruf: %s [Optionen]\n"
 "\n"
 "Optionen:\n"
-"  -c, --crypt-method            Verschlüsselungsmethode (eine der\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+"  -c, --crypt-method <METHODE>  Verschlüsselungsmethode (eine der\n"
 "                                folgenden: %s)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
 "  -e, --encrypted               Angegebene Passwörter sind verschlüsselt\n"
-"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+
+msgid ""
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
+msgstr ""
 "  -m, --md5                     Die Klartext-Passwörter mittels MD5-\n"
 "                                Algorithmus verschlüsseln\n"
-"%s\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -639,36 +734,6 @@
 msgstr "%s: Fehler entdeckt, Änderungen verworfen\n"
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Aufruf: %s [Optionen]\n"
-"\n"
-"Optionen:\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-"  -c, --crypt-method <METHODE>  Verschlüsselungsmethode (eine der\n"
-"                                folgenden: %s)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-"  -e, --encrypted               Angegebene Passwörter sind verschlüsselt\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -m, --md5                     Die Klartext-Passwörter mittels MD5-\n"
-"                                Algorithmus verschlüsseln\n"
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: (Zeile %d, Benutzer %s) Passwort nicht geändert\n"
 
@@ -676,20 +741,11 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: Zeile %d: Benutzer »%s« ist nicht vorhanden.\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+#, fuzzy
+#| msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Aufruf: chsh [Optionen] [BENUTZERZUGANG]\n"
-"\n"
-"Optionen:\n"
-"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
-"  -s, --shell SHELL             Neue Login-Shell für den Benutzerzugang\n"
-"\n"
+"  -s, --shell SHELL             Die Login-Shell des neuen Benutzerzugangs\n"
 
 msgid "Login Shell"
 msgstr "Login-Shell"
@@ -718,9 +774,35 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Warnung: %s nicht ausführbar.\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Aufruf: expiry {-f|-c}\n"
+#, fuzzy
+#| msgid ""
+#| "  -u, --user                    which user's tcb shadow file to edit\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
+"  -u, --user                    Die tcb-shadow-Datei welches Benutzers\n"
+"                                editiert werden soll\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -m, --md5                     Die Klartext-Passwörter mittels MD5-\n"
+"                                Algorithmus verschlüsseln\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: Optionen %s und %s stehen im Konflikt zueinander.\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: Unerwartetes Argument: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 "  -a, --all                     Aufzeichnungen fehlgeschlagener Anmeldungen\n"
@@ -762,9 +844,10 @@
 "oder\n"
 "                                -l aufgerufen) nur für BENUTZERZUGANG\n"
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "faillog: Auslesen des Eintrags für UID %lu fehlgeschlagen\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog: Auslesen des Eintrags für UID %lu fehlgeschlagen\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Fehlver. Maximum Letzter                  Auf\n"
@@ -777,33 +860,34 @@
 msgid " [%lds lock]"
 msgstr " [%lds Sperre]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr ""
 "faillog: Zurücksetzen des Zählers fehlgeschlagener Anmeldungen für UID %lu "
 "fehlgeschlagen\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "faillog: Setzen des Max-Werts für UID %lu fehlgeschlagen\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: Setzen der Sperrzeit für UID %lu fehlgeschlagen\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog: Unbekannter Benutzer oder Bereich: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "faillog: %s kann nicht geöffnet werden: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: Auslesen der Größe von %s fehlgeschlagen: %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: Auslesen der Größe von %s fehlgeschlagen: %s\n"
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -819,6 +903,11 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete BENUTZER         BENUTZER aus GRUPPE entfernen\n"
 
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir HOME_VERZ      Home-Verzeichnis des neuen Benutzers\n"
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         Passwort der GRUPPE entfernen\n"
 
@@ -955,8 +1044,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: GID »%lu« existiert bereits.\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Aufruf: groupdel Gruppe\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Ihr Benutzername konnte nicht bestimmt werden.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1071,16 +1162,52 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: Unbekannter Benutzer %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Aufruf: %s [-r] [-s] [Gruppe [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Aufruf: %s [Optionen [aktion]\n"
+"\n"
+"Optionen:\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Aufruf: %s [-r] [-s] [Gruppe]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Aufruf: %s [Optionen [aktion]\n"
+"\n"
+"Optionen:\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
+"                                Verschlüsselungs-Algorithmus\n"
+
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -l, --list                    Die Mitglieder der Gruppe auflisten\n"
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s und -r sind nicht kompatibel.\n"
 
 msgid "invalid group file entry"
@@ -1150,12 +1277,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: Keine Änderungen\n"
 
-msgid "Usage: grpconv\n"
-msgstr "Aufruf: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "Aufruf: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: %s kann nicht gelöscht werden.\n"
@@ -1169,34 +1290,31 @@
 msgid " groups="
 msgstr " Gruppen="
 
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -t, --time TAGE               Aufzeichnungen fehlgeschlagener Anmeldungen\n"
+"                                anzeigen, die jünger als TAGE sind\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr ""
+"  -t, --time TAGE               Aufzeichnungen fehlgeschlagener Anmeldungen\n"
+"                                anzeigen, die jünger als TAGE sind\n"
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Aufruf: lastlog [Optionen]\n"
-"\n"
-"Optionen:\n"
-"  -b, --before TAGE             Nur lastlog-Aufzeichnungen zeigen, die "
-"älter\n"
-"                                als TAGE sind\n"
-"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
-"  -t, --time TAGE               Nur lastlog-Aufzeichnungen zeigen, die "
-"jünger\n"
-"                                als TAGE sind\n"
-"  -u, --user BENUTZERZUGANG     lastlog-Eintrag für BENUTZERZUGANG anzeigen\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Auslesen des Eintrags für UID %lu fehlgeschlagen\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "Benutzername     Port     Von              Letzter"
 
@@ -1207,14 +1325,6 @@
 msgstr "**Noch nie angemeldet**"
 
 #, 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 "lastlog: Auslesen der Größe von %s fehlgeschlagen: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Aufruf: %s [-p] [Name]\n"
 
@@ -1286,6 +1396,11 @@
 msgid "Login incorrect"
 msgstr "Login fehlerhaft"
 
+#, fuzzy, c-format
+#| msgid "%s: Cannot fork user shell\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: Prozessaufspaltung (fork) für Benutzer-Shell nicht möglich\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1407,55 +1522,97 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: Zeile %d: Eintrag kann nicht aktualisiert werden.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+"  -a, --all                     Aufzeichnungen fehlgeschlagener Anmeldungen\n"
+"                                für alle Benutzer anzeigen\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system                  Eine Systemgruppe erstellen\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system                  Eine Systemgruppe erstellen\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+"  -e, --encrypted               Angegebene Passwörter sind verschlüsselt\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -p, --password PASSWORT       Das Passwort auf dieses (verschlüsselte)\n"
+"                                PASSWORT ändern\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+"  -u, --uid UID                 Benutzer-ID (UID) des neuen Benutzerzugangs\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
+"                                Verschlüsselungs-Algorithmus\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr "  -q, --quiet                   Nicht so geschwätzig verhalten\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system                  Eine Systemgruppe erstellen\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+"  -u, --uid UID                 Benutzer-ID (UID) des neuen Benutzerzugangs\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Aufruf: passwd [Optionen] [BENUTZERZUGANG]\n"
-"\n"
-"Optionen:\n"
-"  -a, --all                     Passwort-Status für alle Benutzerzugänge\n"
-"                                anzeigen\n"
-"  -d, --delete                  Passwort für den Benutzerzugang löschen\n"
-"  -e, --expire                  Ablauf des Passworts für den Benutzerzugang\n"
-"                                erzwingen\n"
-"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
-"  -k, --keep-tokens             Passwort nur ändern falls abgelaufen\n"
-"  -i, --inactive INAKTIV        Passwort nach Ablauf von INAKTIV\n"
-"                                deaktivieren\n"
-"  -l, --lock                    Benutzerzugang sperren\n"
-"  -n, --mindays MIN_TAGE        Minimale Anzahl der Tage vor\n"
-"                                Passwortänderung auf MIN_TAGE setzen\n"
-"  -q, --quiet                   Nicht so geschwätzig verhalten\n"
-"  -r, --repository REPOSITORY   Passwort ändern in REPOSITORY\n"
-"  -S, --status                  Passwort-Status des Benutzerzugangs "
-"anzeigen\n"
-"  -u, --unlock                  Benutzerzugang entsperren\n"
-"  -w, --warndays WARN_TAGE      Anzahl der Tage für Ablaufwarnung auf\n"
-"                                WARN_TAGE setzen\n"
-"  -x, --maxdays MAX_TAGE        Maximale Anzahl der Tage vor\n"
-"                                Passwortänderung auf MAX_TAGE setzen\n"
-"\n"
+"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
+"                                Verschlüsselungs-Algorithmus\n"
 
 msgid "Old password: "
 msgstr "Altes Passwort: "
@@ -1542,17 +1699,38 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: Passwortablauf-Informationen geändert.\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Aufruf: %s [-q] [-r] [passwort [shadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Aufruf: %s [Optionen [aktion]\n"
+"\n"
+"Optionen:\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Aufruf: %s [-q] [-r] [-s] [passwort [shadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Aufruf: %s [Optionen [aktion]\n"
+"\n"
+"Optionen:\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s und -r sind nicht kompatibel.\n"
+#, fuzzy
+#| msgid "  -q, --quiet                   quiet mode\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr "  -q, --quiet                   Nicht so geschwätzig verhalten\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1630,9 +1808,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: Einträge in %s können nicht sortiert werden.\n"
 
-msgid "Usage: pwconv\n"
-msgstr "Aufruf: pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: Arbeit mit aktivierter tcb-Funktionalität nicht möglich\n"
@@ -1641,9 +1816,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: Änderung des Modus' von %s auf 0600 fehlgeschlagen\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "Aufruf: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Zugriff mit su zu diesem Benutzerzugang VERWEIGERT.\n"
 
@@ -1708,18 +1880,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: Muss von einem Terminal gestartet werden.\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ignoriert)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: Fehler %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Unbekannte ID: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "su %s ist Ihnen nicht erlaubt.\n"
 
@@ -1727,14 +1895,6 @@
 msgstr "(Geben Sie Ihr eigenes Passwort ein)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ignoriert)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: Authentifizierung fehlgeschlagen\n"
 
@@ -1742,9 +1902,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s: su ist Ihnen derzeit nicht erlaubt.\n"
 
-msgid "No shell\n"
-msgstr "Keine Shell\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Kein Passworteintrag für »root«"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: Muss von einem Terminal gestartet werden.\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: Fehler %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot remove the content of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: Inhalt von %s kann nicht gelöscht werden: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "%s konnte nicht ausgeführt werden"
+
 msgid "No password file"
 msgstr "Keine Passwortdatei"
 
@@ -1786,8 +1966,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: Zeile zu lang in %s: %s..."
 
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: Umbenennen: %s: %s"
 
 #, c-format
@@ -1798,9 +1979,15 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: Zu viele Gruppen angegeben (max. %d).\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1955,10 +2142,6 @@
 msgstr "%s: -Z erfordert einen Kernel, in dem SELinux aktiviert ist.\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: Optionen %s und %s stehen im Konflikt zueinander.\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr "%s: Zurücksetzen des faillog-Eintrags für UID %lu fehlgeschlagen: %s\n"
 
@@ -2023,32 +2206,49 @@
 "%s: Warnung: Das Home-Verzeichnis existiert bereits.\n"
 "Es werden keine Dateien vom skel-Verzeichnis dorthin kopiert.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -f, --force                   exit successfully if the group already "
+#| "exists,\n"
+#| "                                and cancel -g if the GID is already used\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Aufruf: userdel [Optionen] BENUTZERZUGANG\n"
-"\n"
-"Optionen:\n"
-"  -f, --force                   Entfernen von Dateien erzwingen, auch wenn\n"
-"                                sie nicht Eigentum des zu löschenden\n"
-"                                Benutzers sind\n"
-"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
-"  -r, --remove                  Entferne Home-Verzeichnis und Mail-Spool\n"
-"\n"
+"  -f, --force                   Ohne Fehler beenden, falls die Gruppe\n"
+"                                bereits existiert\n"
+"                                und Operation für -g abbrechen, falls die\n"
+"                                GID bereits verwendet wird\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+"  -r, --reset                   Zähler fehlgeschlagener Anmeldungen\n"
+"                                zurücksetzen\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: Primäre Gruppe des Benutzers »%s« konnte nicht entfernt werden.\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Gruppe %s ist die primäre Gruppe eines anderen Benutzers und wird\n"
 "nicht entfernt.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: %s-Home-Verzeichnis (%s) nicht gefunden\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: Warnung: %s kann nicht gelöscht werden: %s\n"
@@ -2080,10 +2280,6 @@
 msgstr "%s: Benutzer %s ist ein NIS-Benutzer.\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: Benutzer %s ist derzeit angemeldet.\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: %s-Home-Verzeichnis (%s) nicht gefunden\n"
 
@@ -2097,64 +2293,108 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: Fehler beim Löschen des Verzeichnisses %s\n"
 
-#, c-format
+#, fuzzy
+#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+"  -c, --comment KOMMENTAR       KOMMENTAR für das GECOS-Feld des neuen\n"
+"                                Benutzers\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr "  -d, --home-dir HOME_VERZ      Home-Verzeichnis des neuen Benutzers\n"
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+"  -e, --expiredate ABL_DATUM    Das Ablaufdatum des neuen Benutzerzugangs\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -p, --password PASSWORT       Das Passwort auf dieses (verschlüsselte)\n"
+"                                PASSWORT ändern\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr "  -g, --gid GID                 GID für die neue Gruppe benutzen\n"
+
+#, fuzzy
+#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -M, --members BENUTZER,...    Liste der Mitglieder von GRUPPE setzen\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+"  -u, --uid UID                 Benutzer-ID (UID) des neuen Benutzerzugangs\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
+#| "the\n"
+#| "                                new account\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -b, --base-dir BASIS_VERZ     Basisverzeichnis für das\n"
+"                                Home-Verzeichnis des neuen Benutzers\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
+#| "GID\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -o, --non-unique              Verwenden einer nicht einmaligen "
+"(doppelten)\n"
+"                                GID erlauben\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       use this encrypted password for the new "
+#| "group\n"
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Aufruf: usermod [Optionen] BENUTZERZUGANG\n"
-"\n"
-"Optionen:\n"
-"  -c, --comment KOMMENTAR       Neuer KOMMENTAR im GECOS-Feld\n"
-"  -d, --home HOME_DIR           Neues Home-Verzeichnis für den Benutzer-\n"
-"                                zugang\n"
-"  -e, --expiredate ABL_DATUM    Ablaufdatum auf ABL_DATUM setzen\n"
-"  -f, --inactive INAKTIV        Passwort nach Ablauf von INAKTIV\n"
-"                                deaktivieren\n"
-"  -g, --gid GRUPPE              Erzwinge GRUPPE als neue primäre Gruppe\n"
-"  -G, --groups GRUPPEN          Neue Liste zusätzlicher GRUPPEN\n"
-"  -a, --append                  Benutzer zu zusätzlichen Gruppen "
-"hinzufügen,\n"
-"                                die mit der Option -G angegeben werden, "
-"ohne\n"
-"                                ihn dabei aus anderen Gruppen zu entfernen\n"
-"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
-"  -l, --login NEUER_NAME        Neuer Wert für den Namen des "
-"Benutzerzugangs\n"
-"  -L, --lock                    Den Benutzerzugang sperren\n"
-"  -m, --move-home               Den Inhalt des Home-Verzeichnisses an den\n"
-"                                neuen Ort verschieben (nur mit -d benutzen)\n"
-"  -o, --non-unique              Benutzung von doppelter (nicht einmaliger)\n"
-"                                UID erlauben\n"
-"  -p, --password PASSWORD       Ein verschlüsseltes Passwort als neues\n"
-"                                Passwort verwenden\n"
-"  -s, --shell SHELL             Neue Login-Shell des Benutzerzugangs\n"
-"  -u, --uid UID                 Neue UID des Benutzerzugangs\n"
-"  -U, --unlock                  Den Benutzerzugang entsperren\n"
-"%s\n"
+"  -p, --password PASSWORT       Dieses verschlüsselte PASSWORT für die\n"
+"                                neue Gruppe verwenden\n"
 
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+"  -u, --uid UID                 Benutzer-ID (UID) des neuen Benutzerzugangs\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+"  -u, --uid UID                 Benutzer-ID (UID) des neuen Benutzerzugangs\n"
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2176,19 +2416,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: Benutzer »%s« existiert bereits in %s.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: %s konnte nicht geöffnet werden.\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: Keine Optionen angegeben\n"
+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: shadow passwords required for -e and -f\n"
 msgstr "%s: shadow-Passwörter für -e und -f erforderlich\n"
 
 #, c-format
-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' already exists\n"
 msgstr "%s: UID »%lu« existiert bereits\n"
 
@@ -2264,9 +2505,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -p, --passwd                  passwd-Datenbank editieren\n"
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -q, --quiet                   Nicht so geschwätzig verhalten\n"
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -s, --shadow                  shadow- oder gshadow-Datenbank editieren\n"
@@ -2330,6 +2568,325 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: tcb-Verzeichnis für %s konnte nicht gefunden werden\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) fehlgeschlagen\n"
+
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Aufruf: chage [Optionen] [BENUTZERZUGANG]\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ "  -d, --lastday LETZTER_TAG     Tag der letzten Passwortänderung auf\n"
+#~ "                                LETZTER_TAG setzen\n"
+#~ "  -E, --expiredate ABL_DATUM    Ablaufdatum des Benutzerzugangs auf\n"
+#~ "                                ABL_DATUM setzen\n"
+#~ "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+#~ "  -I, --inactive INAKTIV        Passwort nach Ablauf von INAKTIV\n"
+#~ "                                deaktivieren\n"
+#~ "  -l, --list                    Informationen zu Ablaufdaten usw. "
+#~ "anzeigen\n"
+#~ "  -m, --mindays MIN_TAGE        Minimale Anzahl der Tage vor\n"
+#~ "                                Passwortänderung auf MIN_TAGE setzen\n"
+#~ "  -M, --maxdays MAX_TAGE        Maximale Anzahl der Tage vor\n"
+#~ "                                Passwortänderung auf MAX_TAGE setzen\n"
+#~ "  -W, --warndays WARN_TAGE      Anzahl der Tage für Ablaufwarnung auf\n"
+#~ "                                WARN_TAGE setzen\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM-Authentifizierung fehlgeschlagen\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Aufruf: %s [-f vollst_Name] [-r Zimmernummer] [-w Tel_gesch]\n"
+#~ "\t[-h Tel_privat] [-o sonstiges] [Benutzer]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Aufruf: %s [-f vollst_Name] [-r Zimmernummer] [-w Tel_gesch] [-h "
+#~ "Tel_privat]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Aufruf: %s [Optionen]\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ "  -c, --crypt-method            Verschlüsselungsmethode (eine der\n"
+#~ "                                folgenden: %s)\n"
+#~ "  -e, --encrypted               Angegebene Passwörter sind verschlüsselt\n"
+#~ "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+#~ "  -m, --md5                     Die Klartext-Passwörter mittels MD5-\n"
+#~ "                                Algorithmus verschlüsseln\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Aufruf: chsh [Optionen] [BENUTZERZUGANG]\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+#~ "  -s, --shell SHELL             Neue Login-Shell für den Benutzerzugang\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Aufruf: expiry {-f|-c}\n"
+
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "faillog: Auslesen des Eintrags für UID %lu fehlgeschlagen\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "faillog: %s kann nicht geöffnet werden: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: Auslesen der Größe von %s fehlgeschlagen: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Aufruf: groupdel Gruppe\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Aufruf: %s [-r] [-s] [Gruppe [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Aufruf: %s [-r] [-s] [Gruppe]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s und -r sind nicht kompatibel.\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Aufruf: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Aufruf: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Aufruf: lastlog [Optionen]\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ "  -b, --before TAGE             Nur lastlog-Aufzeichnungen zeigen, die "
+#~ "älter\n"
+#~ "                                als TAGE sind\n"
+#~ "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+#~ "  -t, --time TAGE               Nur lastlog-Aufzeichnungen zeigen, die "
+#~ "jünger\n"
+#~ "                                als TAGE sind\n"
+#~ "  -u, --user BENUTZERZUGANG     lastlog-Eintrag für BENUTZERZUGANG "
+#~ "anzeigen\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Aufruf: passwd [Optionen] [BENUTZERZUGANG]\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ "  -a, --all                     Passwort-Status für alle Benutzerzugänge\n"
+#~ "                                anzeigen\n"
+#~ "  -d, --delete                  Passwort für den Benutzerzugang löschen\n"
+#~ "  -e, --expire                  Ablauf des Passworts für den "
+#~ "Benutzerzugang\n"
+#~ "                                erzwingen\n"
+#~ "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+#~ "  -k, --keep-tokens             Passwort nur ändern falls abgelaufen\n"
+#~ "  -i, --inactive INAKTIV        Passwort nach Ablauf von INAKTIV\n"
+#~ "                                deaktivieren\n"
+#~ "  -l, --lock                    Benutzerzugang sperren\n"
+#~ "  -n, --mindays MIN_TAGE        Minimale Anzahl der Tage vor\n"
+#~ "                                Passwortänderung auf MIN_TAGE setzen\n"
+#~ "  -q, --quiet                   Nicht so geschwätzig verhalten\n"
+#~ "  -r, --repository REPOSITORY   Passwort ändern in REPOSITORY\n"
+#~ "  -S, --status                  Passwort-Status des Benutzerzugangs "
+#~ "anzeigen\n"
+#~ "  -u, --unlock                  Benutzerzugang entsperren\n"
+#~ "  -w, --warndays WARN_TAGE      Anzahl der Tage für Ablaufwarnung auf\n"
+#~ "                                WARN_TAGE setzen\n"
+#~ "  -x, --maxdays MAX_TAGE        Maximale Anzahl der Tage vor\n"
+#~ "                                Passwortänderung auf MAX_TAGE setzen\n"
+#~ "\n"
+
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Aufruf: %s [-q] [-r] [passwort [shadow]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Aufruf: %s [-q] [-r] [-s] [passwort [shadow]]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Aufruf: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Aufruf: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Unbekannte ID: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Keine Shell\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Aufruf: userdel [Optionen] BENUTZERZUGANG\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ "  -f, --force                   Entfernen von Dateien erzwingen, auch "
+#~ "wenn\n"
+#~ "                                sie nicht Eigentum des zu löschenden\n"
+#~ "                                Benutzers sind\n"
+#~ "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+#~ "  -r, --remove                  Entferne Home-Verzeichnis und Mail-Spool\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: Benutzer %s ist derzeit angemeldet.\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Aufruf: usermod [Optionen] BENUTZERZUGANG\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ "  -c, --comment KOMMENTAR       Neuer KOMMENTAR im GECOS-Feld\n"
+#~ "  -d, --home HOME_DIR           Neues Home-Verzeichnis für den Benutzer-\n"
+#~ "                                zugang\n"
+#~ "  -e, --expiredate ABL_DATUM    Ablaufdatum auf ABL_DATUM setzen\n"
+#~ "  -f, --inactive INAKTIV        Passwort nach Ablauf von INAKTIV\n"
+#~ "                                deaktivieren\n"
+#~ "  -g, --gid GRUPPE              Erzwinge GRUPPE als neue primäre Gruppe\n"
+#~ "  -G, --groups GRUPPEN          Neue Liste zusätzlicher GRUPPEN\n"
+#~ "  -a, --append                  Benutzer zu zusätzlichen Gruppen "
+#~ "hinzufügen,\n"
+#~ "                                die mit der Option -G angegeben werden, "
+#~ "ohne\n"
+#~ "                                ihn dabei aus anderen Gruppen zu "
+#~ "entfernen\n"
+#~ "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+#~ "  -l, --login NEUER_NAME        Neuer Wert für den Namen des "
+#~ "Benutzerzugangs\n"
+#~ "  -L, --lock                    Den Benutzerzugang sperren\n"
+#~ "  -m, --move-home               Den Inhalt des Home-Verzeichnisses an "
+#~ "den\n"
+#~ "                                neuen Ort verschieben (nur mit -d "
+#~ "benutzen)\n"
+#~ "  -o, --non-unique              Benutzung von doppelter (nicht "
+#~ "einmaliger)\n"
+#~ "                                UID erlauben\n"
+#~ "  -p, --password PASSWORD       Ein verschlüsseltes Passwort als neues\n"
+#~ "                                Passwort verwenden\n"
+#~ "  -s, --shell SHELL             Neue Login-Shell des Benutzerzugangs\n"
+#~ "  -u, --uid UID                 Neue UID des Benutzerzugangs\n"
+#~ "  -U, --unlock                  Den Benutzerzugang entsperren\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: Keine Optionen angegeben\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"

Modified: upstream/trunk/po/dz.po
===================================================================
--- upstream/trunk/po/dz.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/dz.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2006-06-01 15:28+0530\n"
 "Last-Translator: Jurmey Rabgay <jur_gay at yahoo.com>\n"
 "Language-Team: dzongkha <pgeyleg at dit.gov.bt>\n"
@@ -40,6 +40,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "རིམ་སྒྲིག་འཚོལ་བ་-མ་ཤེས་པའི་རྣམ་གྲངས་ '%s'(བདག་སྐྱོང་པ་བརྡ་བསྐུལ་འབད་)།\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "ཆོག་ཡིག་:"
 
@@ -231,6 +239,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "ཡིག་སྒྲོམ་བདག་པོ་སོར་ནི་ལུ་ འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: ཐུན་མོང་ ཡུ་ཨའི་ཌི་འཐོབ་མི་ཚུགས།\n"
 
@@ -314,6 +327,33 @@
 msgstr "%s གི་དོན་ལུ་ བདེན་མེད་ཀྱི་ཆོག་ཡིག\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: ནུས་མེད་ཀྱི་ ཁྱིམ་གྱི་བརྒྱུད་འཕྲིན་: '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: སྣོད་ཐོ་ %s གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: སྣོད་ཐོ་ %s གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -341,51 +381,55 @@
 msgid "Unable to determine your tty name."
 msgstr "ཁྱོད་ཀྱི་ཊི་ཊི་ཝའི་མིང་ གཏན་འབེབས་བཟོ་མ་ཚུགས།"
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
-
 #, fuzzy
 #| msgid "No\n"
 msgid "No"
 msgstr "མེན།\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"ལག་ལེན་:chage[གདམ་ཁ་ཚུ་]user\n"
-"\n"
-"གདམ་ཁ་ཚུ་:\n"
-"   -d, ---lastday LAST_DAY\t མཇུག་མམ་གྱི་ཆོག་ཡིག་འདི་ LAST_DAYལུ་ བསྒྱུར་བཅོས་གཞི་སྒྲིག་"
-"འབད།\n"
-"   -E, --expiredate EXPIRE_DATE\t རྩིས་ཐོའི་དུས་ཡོལ་ཚེས་གྲངས་འདི་ཚུ་ EXPIRE_DATE ལུ་ "
-"བསྒྱུར་བཅོས་གཞི་སྒྲིག་འབད།\n"
-"   -h, --help\t\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་ བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
-"   -I, --inactive INACTIVE\t དུས་ཡོལ་ \n"
-"\t\t\t\tto INACTIVE གི་ཤུལ་མ་ཆོག་ཡིག་ནུས་མེད་འདི་ གཞི་སྒྲིག་འབད།\n"
-"   -l, --list\t\t\t རྩིས་ཐོ་རྒས་པའི་བརྡ་དོན་ སྟོན།\n"
-"   -m, --mindays MIN_DAYS\t ཉིན་གྲངས་ཉུང་མཐའ་འདི་ཚུ་ ཆོག་ཡིག་\n"
-"\t\t\t\tགི་ཧེ་མར་ MIN_DAYSལུ་བསྒྱུར་བཅོས་ གཞི་སྒྲིག་འབད།\n"
-"   -M, --maxdays MAX_DAYS\t ཉིན་གྲངས་མང་མཐའ་འདི་ཚུ་ ཆོག་ཡིག་\n"
-"\t\t\t\tགི་ཧེ་མར་ MAX_DAYSལུ་ བསྒྱུར་བཅོས་ གཞི་སྒྲིག་འབད།\n"
-"   -W, --warndays WARN_DAYS\t དུས་ཡོལ་ཉེན་བརྡའི་ཉིནམ་འདི་ཚུ་ WARN_DAYSལུ་ གཞི་སྒྲིག་འབད།\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "བེ་ལུ་གསརཔ་བཙུགས་ ཡང་ཅིན་ སྔོན་སྒྲིག་གི་དོན་ལུ་ ENTERལུ་ཨེབས།"
@@ -458,9 +502,10 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: ཁྱོད་ཀྱི་ལག་ལེན་པའི་མིང་ གཏན་འབེབས་བཟོ་མི་ཚུགས།\n"
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr "%s: པི་ཨེ་ཨེམ་ བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -485,10 +530,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་འདི་ མིན་འདུག\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
@@ -501,18 +542,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: ས་སྒོ་ཚུ་བསྒྱུར་བཅོས་འབད་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"ལག་ལེན་:%s[-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] user]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
-msgstr "ལག་ལེན་:%s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "མིང་ཆ་ཚང་།"
 
@@ -590,25 +645,24 @@
 msgstr "%s: ས་སྒོ་ཚུ་རིང་དྲགས་པས།\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"ལག་ལེན་: chpasswd [གདམ་ཁ་ཚུ་]\n"
-"\n"
-"གདམ་ཁ་ཚུ་:\n"
-"  -e, --encrypted\t བཀྲམ་སྤེལ་འབད་ཡོད་པའི་ཆོག་ཡིག་ཚུ་ གསང་བཟོས་མ་འབད་ཡོདཔ།\n"
-"  -h, --help\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་ བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
-"  -m, --md5\t\t བཀྲམ་སྤེལ་འབད་ཡོད་པའི་\t\t\tཆོག་ཡིག་ཚུ་ གསང་བཟོས་མ་ཡིན་པའི་སྐབས་ལུ་ ཌི་ཨི་"
-"ཨེསི་གི་ཚབ་ལུ་ ཨེབ་ཌི་ ༥ གསང་བཟོ་ ལག་ལེན་འཐབ།\n"
-"\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -650,29 +704,6 @@
 msgstr "%s: འཛོལ་བ་སྐྱོན་འཛིན་འབད་ཡི་ བསྒྱུར་བཅོས་ཚུ་སྣང་མེད་བཞག་ཡི།\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
 
@@ -680,23 +711,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
 
-#, fuzzy
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"ལག་ལེན་: userdel [གདམ་ཁ་ཚུ་] ནང་བསྐྱོད་\n"
-"\n"
-"གདམ་ཁ་ཚུ་:\n"
-"  -f, --force\t\t\t  ལག་ལེན་པ་གིས་བདག་དབང་མ་བཟུང་སྟེ་འབད་རུང་ ཡིག་སྣོད་བང་བཙོང་སྟེ་རྩ་བསྐྲད་"
-"གཏང་།\n"
-"  -h, --help\t\t\t  གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
-"  -r, --remove\t\t\t  ཁྱིམ་གྱི་སྣོད་ཐོ་དང་ཡིག་འཕྲིན་འཕྲལ་གསོག་རྩ་བསྐྲད་གཏང་།\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "ནང་བསྐྱོད་ཀྱི་ཤལ།"
@@ -729,9 +745,24 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: ཉེན་བརྡ་: %s འདི་ %s གིས་ བདག་དབང་བཟུངམ་མེན།\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "ལག་ལེན་: དུས་ཡོལ་{-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: རེ་བ་མ་བསྐྱེད་པའི་སྒྲུབ་རྟགས་:%s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -758,9 +789,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: སྣོད་ཐོ་ %s གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "ནང་བསྐྱོད་       མང་མཐའི་མཇུག་མཐའ་འཐུས་ཤོར་                   ཨཱོན། \n"
@@ -774,31 +806,30 @@
 msgid " [%lds lock]"
 msgstr " [%lds ལྡེ་མིག་]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: སྣོད་ཐོ་ %s གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: སྣོད་ཐོ་ %s གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "མ་ཤེས་པའི་ལག་ལེན་པ་:%s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "%s: ཡིག་སྣོད་%s ཁ་ཕྱེ་མི་ཚུགས།\n"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: སྣོད་ཐོ་ %s འདི་ %s ལུ་ བསྐྱར་མིང་བཏགས་མི་ཚུགས།\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -813,6 +844,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -939,8 +973,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-msgid "Usage: groupdel group\n"
-msgstr "ལག་ལེན་:groupdel སྡེ་ཚན།\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: ཁྱོད་ཀྱི་ལག་ལེན་པའི་མིང་ གཏན་འབེབས་བཟོ་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1044,16 +1080,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: མ་ཤེས་པའི་ལག་ལེན་པ་%s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "ལག་ལེན་:%s [-r] [-s] [group [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "ལག་ལེན་: %s [-r] [-s] [སྡེ་ཚན་]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s དང་ -r གཉིས་མཐུན་འགྱུར་ཅན་མེན།\n"
 
 msgid "invalid group file entry"
@@ -1123,16 +1176,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: སོར་ནི་མེད།\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "ལག་ལེན་:groupdel སྡེ་ཚན།\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "ལག་ལེན་:groupdel སྡེ་ཚན།\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1147,31 +1190,17 @@
 msgid " groups="
 msgstr "སྡེ་ཚན་="
 
-#, fuzzy
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"ལག་ལེན་: lastlog [གདམ་ཁ་ཚུ་]\n"
-"\n"
-"གདམ་ཁ་ཚུ་:\n"
-"  -b, --before DAYS\t ཉིན་གྲངས་ལས་རྙིང་པའི་lastlogདྲན་ཐོ་ཚུ་རྐྱངམ་ཅིག་ དཔར་བསྐྲུན་འབད།\n"
-"  -h, --help\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
-"  -t, --time DAYS\t ཉིན་གྲངས་ལས་ལྷག་པའི་འཕྲལ་གྱི་ lastlogདྲན་ཐོ་ཚུ་རྐྱངམ་ཅིག་ དཔར་བསྐྲུན་"
-"འབད།\n"
-"  -u, ---user LOGIN\t ལག་ལེན་པའི་དོན་ལུ་ གསལ་བཀོད་འབད་ཡོད་པའི་ནང་བསྐྱོད་དང་བཅས་ "
-"lastlog དྲན་ཐོ་ དཔར་བསྐྲུན་འབད།\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1184,14 +1213,6 @@
 msgstr "**ནམ་ཡང་ནང་བསྐྱོད་མ་འབད་**"
 
 #, 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"
 
@@ -1265,6 +1286,11 @@
 msgid "Login incorrect"
 msgstr "ནང་བསྐྱོད་བདེན་མེད།"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: གྲལ་ཐིག་ %d:ལག་ལེན་པ་ %sའཚོལ་མི་ཚུགས།\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1387,52 +1413,59 @@
 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"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -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\t\t\t རྩིས་ཐོ་ཆ་མཉམ་གྱི་གུ་ ཆོག་ཡིག་གནས་ཚད་ སྙན་ཞུ་འབད།\n"
-"  -d, --delete\t\t\t མིང་བཏགས་ཡོད་པའི་རྩིས་ཐོའི་དོན་ལུ་ ཆོག་ཡིག་བཏོན་གཏང་།\n"
-"  -e, --expire\t\t\t མིང་བཏགས་ཡོད་པའི་རྩིས་ཐོའི་དོན་ལུ་ ཆོག་ཡིག་གི་དུས་ཡོལ་བང་བཙོང་།\n"
-"  -h, --help\t\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
-"  -k, --keep-tokens\t\t དུས་ལས་ཡོལ་སོང་པ་ཅིན་རྐྱངམ་ཅིག་ ཆོག་ཡིག་སོར།\n"
-"  -i, --inactive INACTIVE\t ཆོག་ཡིག་འདི་ནུས་མེད་ལུ་ དུས་ཡོལ་\n"
-"\t\t\t\t གི་ཤུལ་མར་ ནུས་མེད་སྦེ་གཞི་སྒྲིག་འབད།\n"
-"  -l, --lock\t\t\t མིང་བཏགས་ཡོད་པའི་རྩིས་ཐོ་ ལྡེ་མིག་རྐྱབས།\n"
-"  -n, --mindays MIN_DAYS\t ཆོག་ཡིག་ \n"
-"\t\t\t\tའདི་ MIN_DAYSལུ་མ་བསྒྱུར་བའི་ཧེ་མ་ ཉིན་གྲངས་ཉུང་མཐའ་གཞི་སྒྲིག་འབད།  -q, --quiet\t\t"
-"\t ཁུ་སིམ་སིམ་གྱི་ཐབས་ལམ།\n"
-"  -r, --repository REPOSITORY\t  REPOSITORYམཛོད་གནས་ནང་ལུ་ ཆོག་ཡིག་སོར།\n"
-"  -s, --status\t\t\t མིང་བཏགས་ཡོད་པའི་རྩིས་ཐོའི་གུ་ ཆོག་ཡིག་སྙན་ཞུ་འབད།\n"
-"  -u, --unlock\t\t\t མིང་བཏགས་ཡོད་པའི་རྩིས་ཐོ་འདི་ ལྡེ་མིག་ཕྱེ།\n"
-"  -w, --warndays WARN_DAYS\t  WARN_DAYSལུ་ དུས་ཡོལ་ཉེན་བརྡའི་ཉིན་གྲངས་ གཞི་སྒྲིག་འབད།\n"
-"  -x, --maxdays MAX_DAYS\t ཆོག་ཡིག་ \n"
-"\t\t\t\tའདི་ MAX_DAYSལུ་ བསྒྱུར་བཅོས་མ་འབད་བའི་ཧེ་མ་ ཉིན་གྲངས་ཉུང་མཐའ་ གཞི་སྒྲིག་འབད།\n"
-"\n"
 
 msgid "Old password: "
 msgstr "ཆོག་ཡིག་རྙིངམ་:"
@@ -1512,19 +1545,24 @@
 msgstr "ཆོག་ཡིག་དུས་ཡོལ་ཉེན་བརྡ།"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "ལག་ལེན་:%s [-q] [-r] [-s] [passwd [གྱིབ་མ་]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "ལག་ལེན་:%s [-q] [-r] [-s] [passwd [གྱིབ་མ་]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s དང་ -r གཉིས་མཐུན་འགྱུར་ཅན་མེན།\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1607,11 +1645,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: ཡིག་སྣོད་%s ཁ་ཕྱེ་མི་ཚུགས།\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "ལག་ལེན་པ་: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1621,11 +1654,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "ལག་ལེན་པ་: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "རྩིས་ཐོ་དེ་ལུ་ ཟླ་ལུ་འཛུལ་སྤྱོད་འབད་ནི་ ཉན་མ་བཏུབ་པས།\n"
 
@@ -1691,32 +1719,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: ཊར་མི་ནཱལ་ལས་གཡོག་བཀོལ་དགོ\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(སྣང་མེད་བཞག་ཡོདཔ་)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start:འཛོལ་བ་%d(_s)\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "མ་ཤེས་པའི་ཨའི་ཌི་:%s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "ཁྱོད་ ཟླ་%sལུ་ དབང་སྤྲོད་མ་འབད།\n"
 
 msgid "(Enter your own password)"
 msgstr "(ཁྱོད་རའི་ཆོག་ཡིག་རྐྱངམ་ཅིག་བཙུགས་)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(སྣང་མེད་བཞག་ཡོདཔ་)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1727,9 +1743,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "ཁྱོད་ ཟླ་%sལུ་ དབང་སྤྲོད་མ་འབད།\n"
 
-msgid "No shell\n"
-msgstr "ཤལ་མེད།\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "'རྩ་བ་'གི་དོན་ལུ་ ཆོག་ཡིག་ཐོ་བཀོད་མེད།"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: ཊར་མི་ནཱལ་ལས་གཡོག་བཀོལ་དགོ\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start:འཛོལ་བ་%d(_s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: སྣོད་ཐོ་ %s འདི་ %s ལུ་ བསྐྱར་མིང་བཏགས་མི་ཚུགས།\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "%sལག་ལེན་འཐབ་མི་ཚུགས།"
+
 msgid "No password file"
 msgstr "ཆོག་ཡིག་ཡིག་སྣོད་མེད།"
 
@@ -1774,7 +1810,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: བསྐྱར་མིང་བཏགས་:%s"
 
 #, c-format
@@ -1789,6 +1825,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
@@ -1906,10 +1944,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -1974,27 +2008,24 @@
 "%s: ཉེན་བརྡ་:ཁྱིམ་གྱི་སྣོད་ཐོ་འདི་ཧེ་མ་ལས་རང་ཡོདཔ་ཨིན།\n"
 "འདི་ནང་ལུ་ སི་ཀེལ་སྣོད་ཐོ་ནང་ལས་ ཡིག་སྣོད་ག་ཅི་ཡང་འདྲ་བཤུས་མ་བརྐྱབ་ནི།\n"
 
-#, fuzzy
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"ལག་ལེན་: userdel [གདམ་ཁ་ཚུ་] ནང་བསྐྱོད་\n"
-"\n"
-"གདམ་ཁ་ཚུ་:\n"
-"  -f, --force\t\t\t  ལག་ལེན་པ་གིས་བདག་དབང་མ་བཟུང་སྟེ་འབད་རུང་ ཡིག་སྣོད་བང་བཙོང་སྟེ་རྩ་བསྐྲད་"
-"གཏང་།\n"
-"  -h, --help\t\t\t  གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
-"  -r, --remove\t\t\t  ཁྱིམ་གྱི་སྣོད་ཐོ་དང་ཡིག་འཕྲིན་འཕྲལ་གསོག་རྩ་བསྐྲད་གཏང་།\n"
-"\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: ཨེན་ཨའི་ཨེསི་ ཞབས་ཏོག་སྤྱོད་མི་གུ་ ལག་ལེན་པ་ '%s' བསྒྱུར་བཅོས་འབད་མི་ཚུགས།\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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"
@@ -2002,6 +2033,11 @@
 "%s: ལག་ལེན་པ་གཞན་གྱི་དོན་ལུ་ གཞི་རིམ་སྡེ་ཚན་ཅིག་ཨིན་མི་སྡེ་ཚན་ %sའདི་ རྩ་བསྐྲད་གཏང་མི་ཚུགས།\n"
 
 #, fuzzy, c-format
+#| msgid "%s: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: ནུས་མེད་ཁྱིམ་གྱི་སྣོད་ཐོ་  '%s'།\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: ཉེན་བརྡ་:རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
@@ -2033,10 +2069,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: ལག་ལེན་པ་ %sའདི་ ཨེན་ཨའི་ཨེསི་ ལག་ལེན་པ་ཅིག་ཨིན།\n"
 
-#, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: ལག་ལེན་པ་  %sའདི་ ད་ལྟོ་རང་ནང་བསྐྱོད་འབད་ཡི།\n"
-
 #, fuzzy, c-format
 #| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2050,58 +2082,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: སྣོད་ཐོ་%s རྩ་བསྐྲད་གཏང་པའི་སྐབས་ལུ་ འཛོལ་བ།\n"
 
-#, fuzzy, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"ལག་ལེན་: usermod [གདམ་ཁ་ཚུ་] ནང་བསྐྱོད་\n"
-"\n"
-"གདམ་ཁ་ཚུ་:\n"
-"  -a, --append GROUP\t\t  ལྷན་ཐབས་སྡེ་ཚན་ལུ་ ལག་ལེན་པ་མཇུག་བསྣོད་འབད། \n"
-"  -c, --comment COMMENT\t\t  ཇི་ཨི་སི་ཨོ་ཨེསི་ ས་སྒོའི་བེ་ལུ་གསརཔ།\n"
-"  -d, --home HOME_DIR\t\t  ལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ ནང་བསྐྱོད་སྣོད་ཐོ་གསརཔ།\n"
-"  -e, --expiredate EXPIRE_DATE\t  EXPIRE_DATEལུ་ རྩིས་ཐོའི་དུས་ཡོལ་ཚེས་གྲངས་ གཞི་སྒྲིག་"
-"འབད།\n"
-"  -f, ---inactive INACTIVE\t   INACTIVEལུ་ དུས་ཡོལ་ \n"
-" \t\t\t\tགི་ཤུལ་མ་ ཆོག་ཡིག་ནུས་མེད་སྦེ་ གཞི་སྒྲིག་འབད།\n"
-"  -g, ---gid GROUP\t\t  འགོ་ཐོག་ནང་བསྐྱོད་སྡེ་ཚན་གསརཔ་སྦེ་ སྡེ་ཚན་འདི་བང་ཅན་སྦེ་ལག་ལེན་"
-"འཐབ།\n"
-"  -G, --groups GROUPS\t\t  ལྷན་ཐབས་སྡེ་ཚན་གྱི་ཐོ་ཡིག\n"
-"  -h, --help\t\t\t  གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
-"  -l, --login LOGIN\t\t  ནང་བསྐྱོད་མིང་གི་བེ་ལུ་གསརཔ།\n"
-"  -L, --lock\t\t\t  ལག་ལེན་པའི་རྩིས་ཐོ་ ལྡེ་མིག་རྐྱབས།\n"
-"  -m, --move-home\t\t  ཁྱིམ་གྱི་སྣོད་ཐོའི་ནང་དོན་ཚུ་ \n"
-" \t\t\t\t གནས་ཁོངས་ (-dདང་རྐྱངམ་ཅིག་)གསརཔ་ལུ་སྤོ།\n"
-"  -o, --non-unique\t\t  ཡུ་ཨའི་ཌི་ རྫུན་མ་(ཐུན་མོང་)ལག་ལེན་གྱི་ཐོག་ལས་ འབད་བཅུག\n"
-"  -p, --password PASSWORD\t  ཆོག་ཡིག་གསརཔ་གི་དོན་ལུ་ གསང་བཟོས་ཆོག་ཡིག་ལག་ལེན་འཐབ།\n"
-"  -s, --shell SHELL\t\t  ལག་ལེན་པའི་རྩིས་ཐོའི་དོན་ལུ་ ནང་བསྐྱོད་ཤལ་གསརཔ།\n"
-"  -u, --uid UID\t\t\t  ལག་ལེན་པའི་རྩིས་ཐོའི་དོན་ལུ་ ཡུ་ཨི་ཌི་གསརཔ།\n"
-"  -U, --unlock\t\t\t  ལག་ལེན་པའི་རྩིས་ཐོ་ ལྡེ་མིག་ཕྱེ།\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2118,19 +2151,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: ལག་ལེན་པ་ %sཡོདཔ་ཨིན།\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: ཡིག་སྣོད་%s ཁ་ཕྱེ་མི་ཚུགས།\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: ཟུར་རྟགས་ཚུ་གྲ་སྒྲིག་མིན་འདུག\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: -e aདང་ -f གཉིས་ལུ་དངོས་མཁོ་ཡོད་པའི་གྱིབ་མའི་ཆོག་ཡིག་ཚུ།\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr ""
 
@@ -2197,9 +2231,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2282,8 +2313,318 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: ནུས་མེད་གཞི་རྟེན་སྣོད་ཐོ་'%s'།\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
+
 #, fuzzy
 #~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ལག་ལེན་:chage[གདམ་ཁ་ཚུ་]user\n"
+#~ "\n"
+#~ "གདམ་ཁ་ཚུ་:\n"
+#~ "   -d, ---lastday LAST_DAY\t མཇུག་མམ་གྱི་ཆོག་ཡིག་འདི་ LAST_DAYལུ་ བསྒྱུར་བཅོས་གཞི་སྒྲིག་"
+#~ "འབད།\n"
+#~ "   -E, --expiredate EXPIRE_DATE\t རྩིས་ཐོའི་དུས་ཡོལ་ཚེས་གྲངས་འདི་ཚུ་ EXPIRE_DATE ལུ་ "
+#~ "བསྒྱུར་བཅོས་གཞི་སྒྲིག་འབད།\n"
+#~ "   -h, --help\t\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་ བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
+#~ "   -I, --inactive INACTIVE\t དུས་ཡོལ་ \n"
+#~ "\t\t\t\tto INACTIVE གི་ཤུལ་མ་ཆོག་ཡིག་ནུས་མེད་འདི་ གཞི་སྒྲིག་འབད།\n"
+#~ "   -l, --list\t\t\t རྩིས་ཐོ་རྒས་པའི་བརྡ་དོན་ སྟོན།\n"
+#~ "   -m, --mindays MIN_DAYS\t ཉིན་གྲངས་ཉུང་མཐའ་འདི་ཚུ་ ཆོག་ཡིག་\n"
+#~ "\t\t\t\tགི་ཧེ་མར་ MIN_DAYSལུ་བསྒྱུར་བཅོས་ གཞི་སྒྲིག་འབད།\n"
+#~ "   -M, --maxdays MAX_DAYS\t ཉིན་གྲངས་མང་མཐའ་འདི་ཚུ་ ཆོག་ཡིག་\n"
+#~ "\t\t\t\tགི་ཧེ་མར་ MAX_DAYSལུ་ བསྒྱུར་བཅོས་ གཞི་སྒྲིག་འབད།\n"
+#~ "   -W, --warndays WARN_DAYS\t དུས་ཡོལ་ཉེན་བརྡའི་ཉིནམ་འདི་ཚུ་ WARN_DAYSལུ་ གཞི་སྒྲིག་"
+#~ "འབད།\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: པི་ཨེ་ཨེམ་ བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "ལག་ལེན་:%s[-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] user]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr "ལག་ལེན་:%s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "ལག་ལེན་: chpasswd [གདམ་ཁ་ཚུ་]\n"
+#~ "\n"
+#~ "གདམ་ཁ་ཚུ་:\n"
+#~ "  -e, --encrypted\t བཀྲམ་སྤེལ་འབད་ཡོད་པའི་ཆོག་ཡིག་ཚུ་ གསང་བཟོས་མ་འབད་ཡོདཔ།\n"
+#~ "  -h, --help\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་ བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
+#~ "  -m, --md5\t\t བཀྲམ་སྤེལ་འབད་ཡོད་པའི་\t\t\tཆོག་ཡིག་ཚུ་ གསང་བཟོས་མ་ཡིན་པའི་སྐབས་ལུ་ ཌི་"
+#~ "ཨི་ཨེསི་གི་ཚབ་ལུ་ ཨེབ་ཌི་ ༥ གསང་བཟོ་ ལག་ལེན་འཐབ།\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ལག་ལེན་: userdel [གདམ་ཁ་ཚུ་] ནང་བསྐྱོད་\n"
+#~ "\n"
+#~ "གདམ་ཁ་ཚུ་:\n"
+#~ "  -f, --force\t\t\t  ལག་ལེན་པ་གིས་བདག་དབང་མ་བཟུང་སྟེ་འབད་རུང་ ཡིག་སྣོད་བང་བཙོང་སྟེ་རྩ་"
+#~ "བསྐྲད་གཏང་།\n"
+#~ "  -h, --help\t\t\t  གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
+#~ "  -r, --remove\t\t\t  ཁྱིམ་གྱི་སྣོད་ཐོ་དང་ཡིག་འཕྲིན་འཕྲལ་གསོག་རྩ་བསྐྲད་གཏང་།\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "ལག་ལེན་: དུས་ཡོལ་{-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: ཡིག་སྣོད་%s ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "ལག་ལེན་:groupdel སྡེ་ཚན།\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "ལག་ལེན་:%s [-r] [-s] [group [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "ལག་ལེན་: %s [-r] [-s] [སྡེ་ཚན་]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s དང་ -r གཉིས་མཐུན་འགྱུར་ཅན་མེན།\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "ལག་ལེན་:groupdel སྡེ་ཚན།\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "ལག་ལེན་:groupdel སྡེ་ཚན།\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ལག་ལེན་: lastlog [གདམ་ཁ་ཚུ་]\n"
+#~ "\n"
+#~ "གདམ་ཁ་ཚུ་:\n"
+#~ "  -b, --before DAYS\t ཉིན་གྲངས་ལས་རྙིང་པའི་lastlogདྲན་ཐོ་ཚུ་རྐྱངམ་ཅིག་ དཔར་བསྐྲུན་འབད།\n"
+#~ "  -h, --help\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
+#~ "  -t, --time DAYS\t ཉིན་གྲངས་ལས་ལྷག་པའི་འཕྲལ་གྱི་ lastlogདྲན་ཐོ་ཚུ་རྐྱངམ་ཅིག་ དཔར་བསྐྲུན་"
+#~ "འབད།\n"
+#~ "  -u, ---user LOGIN\t ལག་ལེན་པའི་དོན་ལུ་ གསལ་བཀོད་འབད་ཡོད་པའི་ནང་བསྐྱོད་དང་བཅས་ "
+#~ "lastlog དྲན་ཐོ་ དཔར་བསྐྲུན་འབད།\n"
+#~ "\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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\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\t\t\t རྩིས་ཐོ་ཆ་མཉམ་གྱི་གུ་ ཆོག་ཡིག་གནས་ཚད་ སྙན་ཞུ་འབད།\n"
+#~ "  -d, --delete\t\t\t མིང་བཏགས་ཡོད་པའི་རྩིས་ཐོའི་དོན་ལུ་ ཆོག་ཡིག་བཏོན་གཏང་།\n"
+#~ "  -e, --expire\t\t\t མིང་བཏགས་ཡོད་པའི་རྩིས་ཐོའི་དོན་ལུ་ ཆོག་ཡིག་གི་དུས་ཡོལ་བང་བཙོང་།\n"
+#~ "  -h, --help\t\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
+#~ "  -k, --keep-tokens\t\t དུས་ལས་ཡོལ་སོང་པ་ཅིན་རྐྱངམ་ཅིག་ ཆོག་ཡིག་སོར།\n"
+#~ "  -i, --inactive INACTIVE\t ཆོག་ཡིག་འདི་ནུས་མེད་ལུ་ དུས་ཡོལ་\n"
+#~ "\t\t\t\t གི་ཤུལ་མར་ ནུས་མེད་སྦེ་གཞི་སྒྲིག་འབད།\n"
+#~ "  -l, --lock\t\t\t མིང་བཏགས་ཡོད་པའི་རྩིས་ཐོ་ ལྡེ་མིག་རྐྱབས།\n"
+#~ "  -n, --mindays MIN_DAYS\t ཆོག་ཡིག་ \n"
+#~ "\t\t\t\tའདི་ MIN_DAYSལུ་མ་བསྒྱུར་བའི་ཧེ་མ་ ཉིན་གྲངས་ཉུང་མཐའ་གཞི་སྒྲིག་འབད།  -q, --quiet"
+#~ "\t\t\t ཁུ་སིམ་སིམ་གྱི་ཐབས་ལམ།\n"
+#~ "  -r, --repository REPOSITORY\t  REPOSITORYམཛོད་གནས་ནང་ལུ་ ཆོག་ཡིག་སོར།\n"
+#~ "  -s, --status\t\t\t མིང་བཏགས་ཡོད་པའི་རྩིས་ཐོའི་གུ་ ཆོག་ཡིག་སྙན་ཞུ་འབད།\n"
+#~ "  -u, --unlock\t\t\t མིང་བཏགས་ཡོད་པའི་རྩིས་ཐོ་འདི་ ལྡེ་མིག་ཕྱེ།\n"
+#~ "  -w, --warndays WARN_DAYS\t  WARN_DAYSལུ་ དུས་ཡོལ་ཉེན་བརྡའི་ཉིན་གྲངས་ གཞི་སྒྲིག་"
+#~ "འབད།\n"
+#~ "  -x, --maxdays MAX_DAYS\t ཆོག་ཡིག་ \n"
+#~ "\t\t\t\tའདི་ MAX_DAYSལུ་ བསྒྱུར་བཅོས་མ་འབད་བའི་ཧེ་མ་ ཉིན་གྲངས་ཉུང་མཐའ་ གཞི་སྒྲིག་འབད།\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "ལག་ལེན་:%s [-q] [-r] [-s] [passwd [གྱིབ་མ་]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "ལག་ལེན་:%s [-q] [-r] [-s] [passwd [གྱིབ་མ་]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "ལག་ལེན་པ་: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "ལག་ལེན་པ་: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "མ་ཤེས་པའི་ཨའི་ཌི་:%s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "ཤལ་མེད།\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ལག་ལེན་: userdel [གདམ་ཁ་ཚུ་] ནང་བསྐྱོད་\n"
+#~ "\n"
+#~ "གདམ་ཁ་ཚུ་:\n"
+#~ "  -f, --force\t\t\t  ལག་ལེན་པ་གིས་བདག་དབང་མ་བཟུང་སྟེ་འབད་རུང་ ཡིག་སྣོད་བང་བཙོང་སྟེ་རྩ་"
+#~ "བསྐྲད་གཏང་།\n"
+#~ "  -h, --help\t\t\t  གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
+#~ "  -r, --remove\t\t\t  ཁྱིམ་གྱི་སྣོད་ཐོ་དང་ཡིག་འཕྲིན་འཕྲལ་གསོག་རྩ་བསྐྲད་གཏང་།\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: ལག་ལེན་པ་  %sའདི་ ད་ལྟོ་རང་ནང་བསྐྱོད་འབད་ཡི།\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "ལག་ལེན་: usermod [གདམ་ཁ་ཚུ་] ནང་བསྐྱོད་\n"
+#~ "\n"
+#~ "གདམ་ཁ་ཚུ་:\n"
+#~ "  -a, --append GROUP\t\t  ལྷན་ཐབས་སྡེ་ཚན་ལུ་ ལག་ལེན་པ་མཇུག་བསྣོད་འབད། \n"
+#~ "  -c, --comment COMMENT\t\t  ཇི་ཨི་སི་ཨོ་ཨེསི་ ས་སྒོའི་བེ་ལུ་གསརཔ།\n"
+#~ "  -d, --home HOME_DIR\t\t  ལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ ནང་བསྐྱོད་སྣོད་ཐོ་གསརཔ།\n"
+#~ "  -e, --expiredate EXPIRE_DATE\t  EXPIRE_DATEལུ་ རྩིས་ཐོའི་དུས་ཡོལ་ཚེས་གྲངས་ གཞི་སྒྲིག་"
+#~ "འབད།\n"
+#~ "  -f, ---inactive INACTIVE\t   INACTIVEལུ་ དུས་ཡོལ་ \n"
+#~ " \t\t\t\tགི་ཤུལ་མ་ ཆོག་ཡིག་ནུས་མེད་སྦེ་ གཞི་སྒྲིག་འབད།\n"
+#~ "  -g, ---gid GROUP\t\t  འགོ་ཐོག་ནང་བསྐྱོད་སྡེ་ཚན་གསརཔ་སྦེ་ སྡེ་ཚན་འདི་བང་ཅན་སྦེ་ལག་ལེན་"
+#~ "འཐབ།\n"
+#~ "  -G, --groups GROUPS\t\t  ལྷན་ཐབས་སྡེ་ཚན་གྱི་ཐོ་ཡིག\n"
+#~ "  -h, --help\t\t\t  གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
+#~ "  -l, --login LOGIN\t\t  ནང་བསྐྱོད་མིང་གི་བེ་ལུ་གསརཔ།\n"
+#~ "  -L, --lock\t\t\t  ལག་ལེན་པའི་རྩིས་ཐོ་ ལྡེ་མིག་རྐྱབས།\n"
+#~ "  -m, --move-home\t\t  ཁྱིམ་གྱི་སྣོད་ཐོའི་ནང་དོན་ཚུ་ \n"
+#~ " \t\t\t\t གནས་ཁོངས་ (-dདང་རྐྱངམ་ཅིག་)གསརཔ་ལུ་སྤོ།\n"
+#~ "  -o, --non-unique\t\t  ཡུ་ཨའི་ཌི་ རྫུན་མ་(ཐུན་མོང་)ལག་ལེན་གྱི་ཐོག་ལས་ འབད་བཅུག\n"
+#~ "  -p, --password PASSWORD\t  ཆོག་ཡིག་གསརཔ་གི་དོན་ལུ་ གསང་བཟོས་ཆོག་ཡིག་ལག་ལེན་འཐབ།\n"
+#~ "  -s, --shell SHELL\t\t  ལག་ལེན་པའི་རྩིས་ཐོའི་དོན་ལུ་ ནང་བསྐྱོད་ཤལ་གསརཔ།\n"
+#~ "  -u, --uid UID\t\t\t  ལག་ལེན་པའི་རྩིས་ཐོའི་དོན་ལུ་ ཡུ་ཨི་ཌི་གསརཔ།\n"
+#~ "  -U, --unlock\t\t\t  ལག་ལེན་པའི་རྩིས་ཐོ་ ལྡེ་མིག་ཕྱེ།\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: ཟུར་རྟགས་ཚུ་གྲ་སྒྲིག་མིན་འདུག\n"
+
+#, fuzzy
+#~ msgid ""
 #~ "Usage: vipw [options]\n"
 #~ "\n"
 #~ "Options:\n"
@@ -2771,9 +3112,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/el.po
===================================================================
--- upstream/trunk/po/el.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/el.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2007-11-24 21:44+0100\n"
 "Last-Translator: Konstantinos Margaritis <markos at debian.org>\n"
 "Language-Team: Greek <debian-l10n-greek at lists.debian.org>\n"
@@ -41,6 +41,14 @@
 msgstr ""
 "σφάλμα διαμόρφωσης - άγνωστο αντικείμενο '%s' (ειδοποιήστε το διαχειριστή)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Συνθηματικό: "
 
@@ -229,6 +237,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "αποτυχία αλλαγής του ιδιοκτήτη του γραμματοκιβωτίου"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: αδυναμία λήψης μοναδικού UID\n"
 
@@ -312,6 +325,32 @@
 msgstr "Εσφαλμένο συνθηματικό για %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: αποτυχία απόρριψης προνομίων (%s)\n"
+
+#, fuzzy, c-format
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: Μη έγκυρο τηλέφωνο οικίας: `%s'\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: αδυναμία δημιουργίας καταλόγου %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: αδυναμία δημιουργίας καταλόγου %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -339,72 +378,55 @@
 msgid "Unable to determine your tty name."
 msgstr "Δεν είναι δυνατόν να καθοριστεί το όνομα tty."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "Η κλήση malloc(%d) απέτυχε\n"
-
 #, fuzzy
 #| msgid "No\n"
 msgid "No"
 msgstr "Όχι\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "Χρήση: %s [είσοδος]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Χρήση: change [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -d, --lastday LAST_DAY        ρύθμιση τελευταίας αλλαγής συνθηματικού σε\n"
-"                                LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE  ρύθμιση ημερομηνίας λήξης λογαριασμού σε\n"
-"                                EXPIRE_DATE\n"
-"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
-"                                έξοδος\n"
-"  -I, --inactive INACTIVE       ρύθμιση ανενεργού κωδικού μετά από τη λήξη\n"
-"                                του σε INACTIVE\n"
-"  -l, --list                    προβολή πληροφοριών ηλικίας λογαριασμού\n"
-"  -m, --mindays MIN_DAYS        ρύθμιση ελάχιστου αριθμού ημερών πριν την\n"
-"                                αλλαγή συνθηματικού σε MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS        ρύθμιση μέγιστου αριθμού ημερών πριν την\n"
-"                                αλλαγή συνθηματικού σε MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS      ρύθμιση προειδοποιήσεων ημερών λήξης σε\n"
-"                                WARN_DAYS\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Εισάγετε την νέα τιμή, ή πιέστε ENTER για την προκαθορισμένη"
@@ -477,9 +499,10 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: Δεν είναι δυνατόν να καθοριστεί το όνομα χρήστη σας.\n"
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr "%s: Αποτυχία εξακρίβωσης PAM\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -504,10 +527,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: Το αρχείο σκιωδών συνθηματικών δεν υπάρχει\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: αποτυχία απόρριψης προνομίων (%s)\n"
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
@@ -520,20 +539,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: Σφάλμα κατά την αλλαγή πεδίων\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "Χρήση: %s [είσοδος]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Χρήση: %s [-f πλήρες_όνομα] [-r αρίθμ_δωματίου] [-w τηλ_εργασίας]\n"
-"\t[-h τηλ_οικίας] [-o άλλο] [χρήστης]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
 msgstr ""
-"Χρήση: %s [-f πλήρες_όνομα] [-r αριθμ_δωματίου] [-w τηλ_δωματίου]\n"
-"[-h τηλ_οικίας]\n"
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Πλήρες όνομα"
 
@@ -610,28 +641,24 @@
 msgstr "%s: Πολύ μακριά πεδία\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "Χρήση: %s [είσοδος]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Χρήση: chpasswd [options]\n"
-"\n"
-"Επιλογές:\n"
-"  -e, --encrypted               τα παρεχόμενα συνθηματικά είναι\n"
-"                                κρυπτογραφημένα\n"
-"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
-"                                έξοδος\n"
-"  -m, --md5                     χρήση κρυπτογράφησης MD5 αντί για DES όταν\n"
-"                                τα παρεχόμενα συνθηματικά δεν είναι\n"
-"                                κρυπτογραφημένα\n"
-"\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -673,29 +700,6 @@
 msgstr "%s: Ανιχνεύτηκε σφάλμα, οι αλλαγές αγνοήθηκαν\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Χρήση: %s [είσοδος]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
 
@@ -703,13 +707,7 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
 
 msgid "Login Shell"
@@ -743,9 +741,23 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: προειδοποίηση: Το %s δεν ανήκει στον %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Χρήση: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: unexpected argument: %s\n"
+msgstr "%s: Μη έγκυρη αριθμητική παράμετρος `%s'\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -772,9 +784,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: αδυναμία δημιουργίας καταλόγου %s\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Αποτυχίες Μέγιστο Τελευταία                   Στις\n"
@@ -788,31 +801,30 @@
 msgid " [%lds lock]"
 msgstr " [%lds κλείδωμα]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: αδυναμία δημιουργίας καταλόγου %s\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: αποτυχία απόρριψης προνομίων (%s)\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: αδυναμία δημιουργίας καταλόγου %s\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "Άγνωστος χρήστης: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "%s: αδυναμία ανοίγματος αρχείου %s\n"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: αδυναμία μετονομασίας του καταλόγου %s σε %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -827,6 +839,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -953,8 +968,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-msgid "Usage: groupdel group\n"
-msgstr "Χρήση: groupdel ομάδα\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Δεν είναι δυνατόν να καθοριστεί το όνομα χρήστη σας.\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1057,16 +1074,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: άγνωστος χρήστης %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Χρήση: %s [-r] [-s] [group [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Χρήση: %s [είσοδος]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Χρήση: %s [-r] [-s] [group]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "Χρήση: %s [είσοδος]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s και -r είναι ασύμβατα\n"
 
 msgid "invalid group file entry"
@@ -1134,16 +1168,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: καμιά αλλαγή\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "Χρήση: groupdel ομάδα\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "Χρήση: groupdel ομάδα\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1159,31 +1183,16 @@
 msgstr " ομάδες="
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -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 [options]\n"
-"\n"
-"Επιλογές:\n"
-"  -b, --before DAYS             εκτύπωση μόνο των τελευταίων εγγραφών\n"
-"                                lastlog παλαιότερων από DAYS\n"
-"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
-"                                έξοδος\n"
-"  -t, --time DAYS               εκτύπωση μόνο των τελευταίων εγγραφών\n"
-"                                lastlog πιο πρόσφατων από από DAYS\n"
-"  -u, --user LOGIN              εκτύπωση τελευταίας εγγραφής lastlog για\n"
-"                                χρήστη με καθορισμένο LOGIN\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1196,14 +1205,6 @@
 msgstr "**Καμιά είσοδος στο σύστημα**"
 
 #, 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"
 
@@ -1277,6 +1278,11 @@
 msgid "Login incorrect"
 msgstr "Διαδικασία εισόδου απέτυχε"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: γραμμή %d: αδυναμία εύρεσης χρήστη %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1400,59 +1406,59 @@
 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"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Χρήση: passwd [options] [login]\n"
-"\n"
-"Επιλογές:\n"
-"  -a, --all                     αναφορά κατάστασης συνθηματικών για όλους\n"
-"                                τους λογαριασμούς\n"
-"  -d, --delete                  διαγραφή συνθηματικού για το συγκεκριμένο\n"
-"                                λογαριασμό\n"
-"  -e, --expire                  εξαναγκασμός λήξης του συνθηματικού για το\n"
-"                                συγκεκριμένο λογαριασμό\n"
-"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
-"                                έξοδος\n"
-"  -k, --keep-tokens             αλλαγή συνθηματικού μόνο αν αυτό έχει λήξει\n"
-"  -i, --inactive INACTIVE       ρύθμιση ανενεργού συνθηματικού μετά τη λήξη\n"
-"                                του σε ΑΝΕΝΕΡΓΟ\n"
-"  -l, --lock                    κλείδωμα του συγκεκριμένου λογαριασμού\n"
-"  -n, --mindays MIN_DAYS        ρύθμιση ελάχιστου αριθμού ημερών πριν την\n"
-"                                αλλαγή συνθηματικού σε MIN_DAYS\n"
-"  -q, --quiet                   σιωπηρή λειτουργία\n"
-"  -r, --repository REPOSITORY   αλλαγή συνθηματικού στο REPOSITORY\n"
-"                                repository\n"
-"  -S, --status                  αναφορά κατάστασης συνθηματικού για το\n"
-"                                συγκεκριμένο λογαριασμό\n"
-"  -u, --unlock                  ξεκλείδωμα του συγκεκριμένου λογαριασμού\n"
-"  -w, --warndays WARN_DAYS      ρύθμιση ημερών προειδοποίησης λήξης σε\n"
-"                                WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        ρύθμιση μέγιστου αριθμού ημερών πριν την\n"
-"                                αλλαγή συνθηματικού σε MAX_DAYS\n"
-"\n"
 
 msgid "Old password: "
 msgstr "Παλιό Συνθηματικό: "
@@ -1537,19 +1543,24 @@
 msgstr "Προειδοποίηση λήξης συνθηματικού"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Χρήση: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "Χρήση: %s [είσοδος]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Χρήση: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s και -r είναι ασύμβατα\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Χρήση: %s [είσοδος]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1632,11 +1643,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: αδυναμία ανοίγματος αρχείου %s\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "Χρήση: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1646,11 +1652,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "Χρήση: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Πρόσβαση στη su σε αυτόν τον λογαριασμό ΑΡΝΗΘΗΚΕ.\n"
 
@@ -1718,32 +1719,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: πρέπει να εκτελεστεί από τερματικό\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Αγνοήθηκε)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: σφάλμα %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Άγνωστη ταυτότητα: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Δεν έχετε άδεια για su %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(Εισάγετε το δικό σας συνθηματικό)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Αγνοήθηκε)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1754,9 +1743,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Δεν έχετε άδεια για su %s\n"
 
-msgid "No shell\n"
-msgstr "Δεν υπάρχει φλοιός\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Δεν υπάρχει καταχώρηση συνθηματικού για τον 'root'"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: πρέπει να εκτελεστεί από τερματικό\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: σφάλμα %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: αδυναμία μετονομασίας του καταλόγου %s σε %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Αδυναμία εκτέλεσης %s"
+
 msgid "No password file"
 msgstr "Δεν υπάρχει αρχείο συνθηματικών"
 
@@ -1801,7 +1810,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: μετονομασία: %s"
 
 #, fuzzy, c-format
@@ -1816,6 +1825,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "Χρήση: %s [είσοδος]\n"
@@ -1933,10 +1944,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -2001,17 +2008,23 @@
 "Δεν έγινε αντιγραφή σε αυτό οποιουδήποτε καταλόγου skel.\n"
 
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: αδυναμία αλλαγής χρήστη `%s' στον NIS εξυπηρετούμενο.\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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"
@@ -2020,6 +2033,10 @@
 "χρήστη.\n"
 
 #, fuzzy, c-format
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: Μη έγκυρος αρχικός κατάλογος χρήστη `%s'\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: προειδοποίηση: αδυναμία διαγραφής "
@@ -2051,10 +2068,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: Ο χρήστης %s είναι NIS χρήστης\n"
 
-#, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: Ο χρήστης %s βρίσκεται στο σύστημα\n"
-
 #, fuzzy, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: Μη έγκυρος αρχικός κατάλογος χρήστη `%s'\n"
@@ -2069,63 +2082,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: Σφάλμα κατά την διαγραφή του καταλόγου %s\n"
 
-#, fuzzy, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Χρήση: usermod [options] LOGIN\n"
-"\n"
-"Επιλογές:\n"
-"  -a, --append GROUP            προσθήκη του χρήστη σε συμπληρωματική ΟΜΑΔΑ\n"
-"  -c, --comment COMMENT         νέα τιμή του πεδίου GECOS\n"
-"  -d, --home HOME_DIR           νλεος κατάλογος εισόδου για το νέο\n"
-"                                λογαριασμό χρήστη\n"
-"  -e, --expiredate EXPIRE_DATE  ρύθμιση ημερομηνίας λήξης λογαριασμού σε\n"
-"                                EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       ρύθμιση συνθηματικού ως ανενεργού μετά από\n"
-"                                τη λήξη του σε ΑΝΕΝΕΡΓΟ\n"
-"  -g, --gid GROUP               εξαναγκασμός χρήσης ΟΜΑΔΑΣ ως τη νέα αρχική\n"
-"                                ομάδα εισόδου\n"
-"  -G, --groups GROUPS           λίστα των συμπληρωματικών ΟΜΑΔΩΝ\n"
-"  -h, --help                    προβολή του μηνύματος βοήθειας και έξοδος\n"
-"  -l, --login LOGIN             νέα τιμή του ονόματος εισόδου\n"
-"  -L, --lock                    κλείδωμα του λογαριασμού χρήστη\n"
-"  -m, --move-home               μετακινεί τα περιεχόμενα του αρχικού\n"
-"                                καταλόγου στη νέατοποθεσία (χρήση μόνο με -"
-"d)\n"
-"  -o, --non-unique              επιτρέπει τη χρήση διπλότυπου (μη μοναδικού) "
-"UID\n"
-"  -p, --password PASSWORD       χρήση κρυπτογραφημένου συνθηματικού για το\n"
-"                                νέο συνθηματικό\n"
-"  -s, --shell SHELL             νέο κέλυφος εισόδου για το λογαριασμό "
-"χρήστη\n"
-"  -u, --uid UID                 νέο UID για το λογαριασμό χρήστη\n"
-"  -U, --unlock                  ξεκλείδωμα του λογαριασμού χρήστη\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2142,19 +2151,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: Ο χρήστης %s υπάρχει\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: αδυναμία ανοίγματος αρχείου %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: Δεν δόθηκαν ενδείξεις\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: σκιώδη συνθηματικά απαιτούνται για το -e και -f\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr ""
 
@@ -2222,9 +2232,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2306,8 +2313,333 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: Μη έγκυρος κατάλογος βάσης `%s'\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "Η κλήση malloc(%d) απέτυχε\n"
+
 #, fuzzy
 #~| msgid ""
+#~| "Usage: chage [options] [LOGIN]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+#~| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -l, --list                    show account aging information\n"
+#~| "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~| "password\n"
+#~| "                                change to MIN_DAYS\n"
+#~| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~| "password\n"
+#~| "                                change to MAX_DAYS\n"
+#~| "  -W, --warndays WARN_DAYS      set expiration warning days to "
+#~| "WARN_DAYS\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Χρήση: change [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        ρύθμιση τελευταίας αλλαγής συνθηματικού "
+#~ "σε\n"
+#~ "                                LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  ρύθμιση ημερομηνίας λήξης λογαριασμού σε\n"
+#~ "                                EXPIRE_DATE\n"
+#~ "  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+#~ "                                έξοδος\n"
+#~ "  -I, --inactive INACTIVE       ρύθμιση ανενεργού κωδικού μετά από τη "
+#~ "λήξη\n"
+#~ "                                του σε INACTIVE\n"
+#~ "  -l, --list                    προβολή πληροφοριών ηλικίας λογαριασμού\n"
+#~ "  -m, --mindays MIN_DAYS        ρύθμιση ελάχιστου αριθμού ημερών πριν "
+#~ "την\n"
+#~ "                                αλλαγή συνθηματικού σε MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        ρύθμιση μέγιστου αριθμού ημερών πριν την\n"
+#~ "                                αλλαγή συνθηματικού σε MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      ρύθμιση προειδοποιήσεων ημερών λήξης σε\n"
+#~ "                                WARN_DAYS\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: Αποτυχία εξακρίβωσης PAM\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Χρήση: %s [-f πλήρες_όνομα] [-r αρίθμ_δωματίου] [-w τηλ_εργασίας]\n"
+#~ "\t[-h τηλ_οικίας] [-o άλλο] [χρήστης]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Χρήση: %s [-f πλήρες_όνομα] [-r αριθμ_δωματίου] [-w τηλ_δωματίου]\n"
+#~ "[-h τηλ_οικίας]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Χρήση: chpasswd [options]\n"
+#~ "\n"
+#~ "Επιλογές:\n"
+#~ "  -e, --encrypted               τα παρεχόμενα συνθηματικά είναι\n"
+#~ "                                κρυπτογραφημένα\n"
+#~ "  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+#~ "                                έξοδος\n"
+#~ "  -m, --md5                     χρήση κρυπτογράφησης MD5 αντί για DES "
+#~ "όταν\n"
+#~ "                                τα παρεχόμενα συνθηματικά δεν είναι\n"
+#~ "                                κρυπτογραφημένα\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Χρήση: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: αδυναμία ανοίγματος αρχείου %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Χρήση: groupdel ομάδα\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Χρήση: %s [-r] [-s] [group [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Χρήση: %s [-r] [-s] [group]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s και -r είναι ασύμβατα\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Χρήση: groupdel ομάδα\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Χρήση: groupdel ομάδα\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Χρήση: lastlog [options]\n"
+#~ "\n"
+#~ "Επιλογές:\n"
+#~ "  -b, --before DAYS             εκτύπωση μόνο των τελευταίων εγγραφών\n"
+#~ "                                lastlog παλαιότερων από DAYS\n"
+#~ "  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+#~ "                                έξοδος\n"
+#~ "  -t, --time DAYS               εκτύπωση μόνο των τελευταίων εγγραφών\n"
+#~ "                                lastlog πιο πρόσφατων από από DAYS\n"
+#~ "  -u, --user LOGIN              εκτύπωση τελευταίας εγγραφής lastlog για\n"
+#~ "                                χρήστη με καθορισμένο LOGIN\n"
+#~ "\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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Χρήση: passwd [options] [login]\n"
+#~ "\n"
+#~ "Επιλογές:\n"
+#~ "  -a, --all                     αναφορά κατάστασης συνθηματικών για "
+#~ "όλους\n"
+#~ "                                τους λογαριασμούς\n"
+#~ "  -d, --delete                  διαγραφή συνθηματικού για το "
+#~ "συγκεκριμένο\n"
+#~ "                                λογαριασμό\n"
+#~ "  -e, --expire                  εξαναγκασμός λήξης του συνθηματικού για "
+#~ "το\n"
+#~ "                                συγκεκριμένο λογαριασμό\n"
+#~ "  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+#~ "                                έξοδος\n"
+#~ "  -k, --keep-tokens             αλλαγή συνθηματικού μόνο αν αυτό έχει "
+#~ "λήξει\n"
+#~ "  -i, --inactive INACTIVE       ρύθμιση ανενεργού συνθηματικού μετά τη "
+#~ "λήξη\n"
+#~ "                                του σε ΑΝΕΝΕΡΓΟ\n"
+#~ "  -l, --lock                    κλείδωμα του συγκεκριμένου λογαριασμού\n"
+#~ "  -n, --mindays MIN_DAYS        ρύθμιση ελάχιστου αριθμού ημερών πριν "
+#~ "την\n"
+#~ "                                αλλαγή συνθηματικού σε MIN_DAYS\n"
+#~ "  -q, --quiet                   σιωπηρή λειτουργία\n"
+#~ "  -r, --repository REPOSITORY   αλλαγή συνθηματικού στο REPOSITORY\n"
+#~ "                                repository\n"
+#~ "  -S, --status                  αναφορά κατάστασης συνθηματικού για το\n"
+#~ "                                συγκεκριμένο λογαριασμό\n"
+#~ "  -u, --unlock                  ξεκλείδωμα του συγκεκριμένου λογαριασμού\n"
+#~ "  -w, --warndays WARN_DAYS      ρύθμιση ημερών προειδοποίησης λήξης σε\n"
+#~ "                                WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        ρύθμιση μέγιστου αριθμού ημερών πριν την\n"
+#~ "                                αλλαγή συνθηματικού σε MAX_DAYS\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Χρήση: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Χρήση: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Χρήση: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Χρήση: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Άγνωστη ταυτότητα: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Δεν υπάρχει φλοιός\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: Ο χρήστης %s βρίσκεται στο σύστημα\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Χρήση: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Επιλογές:\n"
+#~ "  -a, --append GROUP            προσθήκη του χρήστη σε συμπληρωματική "
+#~ "ΟΜΑΔΑ\n"
+#~ "  -c, --comment COMMENT         νέα τιμή του πεδίου GECOS\n"
+#~ "  -d, --home HOME_DIR           νλεος κατάλογος εισόδου για το νέο\n"
+#~ "                                λογαριασμό χρήστη\n"
+#~ "  -e, --expiredate EXPIRE_DATE  ρύθμιση ημερομηνίας λήξης λογαριασμού σε\n"
+#~ "                                EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       ρύθμιση συνθηματικού ως ανενεργού μετά "
+#~ "από\n"
+#~ "                                τη λήξη του σε ΑΝΕΝΕΡΓΟ\n"
+#~ "  -g, --gid GROUP               εξαναγκασμός χρήσης ΟΜΑΔΑΣ ως τη νέα "
+#~ "αρχική\n"
+#~ "                                ομάδα εισόδου\n"
+#~ "  -G, --groups GROUPS           λίστα των συμπληρωματικών ΟΜΑΔΩΝ\n"
+#~ "  -h, --help                    προβολή του μηνύματος βοήθειας και "
+#~ "έξοδος\n"
+#~ "  -l, --login LOGIN             νέα τιμή του ονόματος εισόδου\n"
+#~ "  -L, --lock                    κλείδωμα του λογαριασμού χρήστη\n"
+#~ "  -m, --move-home               μετακινεί τα περιεχόμενα του αρχικού\n"
+#~ "                                καταλόγου στη νέατοποθεσία (χρήση μόνο με "
+#~ "-d)\n"
+#~ "  -o, --non-unique              επιτρέπει τη χρήση διπλότυπου (μη "
+#~ "μοναδικού) UID\n"
+#~ "  -p, --password PASSWORD       χρήση κρυπτογραφημένου συνθηματικού για "
+#~ "το\n"
+#~ "                                νέο συνθηματικό\n"
+#~ "  -s, --shell SHELL             νέο κέλυφος εισόδου για το λογαριασμό "
+#~ "χρήστη\n"
+#~ "  -u, --uid UID                 νέο UID για το λογαριασμό χρήστη\n"
+#~ "  -U, --unlock                  ξεκλείδωμα του λογαριασμού χρήστη\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: Δεν δόθηκαν ενδείξεις\n"
+
+#, fuzzy
+#~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
 #~| "Options:\n"
@@ -2867,9 +3199,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/es.po
===================================================================
--- upstream/trunk/po/es.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/es.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -32,7 +32,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.1.4.2\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2011-06-09 20:22+0100\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -66,6 +66,14 @@
 "error de configuración, elemento «%s» desconocido (informe al "
 "administrador)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Contraseña: "
 
@@ -241,6 +249,11 @@
 "%s: configuración incorrecta: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
 "(%lu)\n"
 
+#, fuzzy, c-format
+#| msgid "failed to allocate memory"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "se produjo un fallo al reservar memoria"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr ""
@@ -329,6 +342,33 @@
 msgstr "Contraseña incorrecta para %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: se produjo un fallo al desprenderse de los privilegios (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: teléfono de casa incorrecto: «%s»\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot create directory %s: %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: no se pudo crear el directorio %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Failed to create tcb directory for %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: se produjo un fallo al crear el directorio tcb para %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -358,49 +398,83 @@
 msgid "Unable to determine your tty name."
 msgstr "No se pudo determinar el nombre de su tty."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) falló\n"
-
 msgid "No"
 msgstr "No"
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"Modo de uso: %s [opciones] USUARIO\n"
+"\n"
+"Opciones:\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -e, --expiredate FECHA_CADUCIDAD  fecha de caducidad de la nueva cuenta\n"
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    muestra este mensaje de ayuda y termina\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -p, --password CONTRASEÑA     cambia la contraseña a CONTRASEÑA (cifrada)\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+"  -r, --reset                   reinicia el contador de accesos fallidos\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              número de rondas SHA para los algoritmos\n"
+"                                de cifrado SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              número de rondas SHA para los algoritmos\n"
+"                                de cifrado SHA*\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+"  -d, --home-dir DIR_PERSONAL   directorio personal de la nueva cuenta\n"
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Modo de uso: chage [opciones] [USUARIO]\n"
-"\n"
-"Opciones:\n"
-"  -d, --lastday ÚLTIMO_DÍA      establece el día del último cambio de la\n"
-"                                contraseña a ÚLTIMO_DÍA\n"
-"  -E, --expiredate FECHA_CAD    establece la fecha de caducidad a FECHA_CAD\n"
-"  -h, --help                    muestra este mensaje de ayuda y termina\n"
-"  -I, --inactive INACTIVA       deshabilita la cuenta después de INACTIVA\n"
-"                                días de la fecha de caducidad\n"
-"  -l, --list                    muestra la información de la edad de la "
-"cuenta\n"
-"  -m, --mindays DÍAS_MIN        establece el número mínimo de días antes de\n"
-"                                cambiar la contraseña a DÍAS_MIN\n"
-"  -M, --maxdays DÍAS_MAX        establece el número máximo de días antes de\n"
-"                                cambiar la contraseña a DÍAS_MAX\n"
-"  -W, --warndays DÍAS_AVISO     establece los días de aviso de expiración a\n"
-"                                DÍAS_AVISO\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr ""
@@ -474,9 +548,10 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: no se pudo determinar su nombre de usuario.\n"
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr "%s: la autenticación PAM falló\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -499,10 +574,6 @@
 msgstr "%s: el fichero de contraseñas ocultas no está presente\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: se produjo un fallo al desprenderse de los privilegios (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: el usuario «%s» no existe en %s\n"
 
@@ -514,20 +585,41 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: error cambiando los campos\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Modo de uso: %s [-f nombre_completo] [-r num_habitación] [-w telf_trabajo]\n"
-"\t[-h telf_casa] [-o otro] [usuario]\n"
+"Modo de uso: %s [opciones] USUARIO\n"
+"\n"
+"Opciones:\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Modo de uso: %s [-f nombre_completo] [-r num_habitación] [-w telf_trabajo]\n"
-"\t[-h telf_casa]\n"
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    muestra este mensaje de ayuda y termina\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Nombre completo"
 
@@ -608,25 +700,27 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 "Modo de uso: %s [opciones]\n"
 "\n"
 "Opciones:\n"
-"  -c, --crypt-method            el método de cifrado (uno de %s)\n"
-"  -e, --encrypted               las contraseñas proporcionadas están "
-"cifradas\n"
-"  -h, --help                    muestra este mensaje de ayuda y termina\n"
-"  -m, --md5                     usa el algoritmo MD5 para cifrar las\n"
-"                                contraseñas\n"
-"%s\n"
 
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr "  -c, --crypt-method <MÉTODO>   el método de cifrado (uno de %s)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+"  -e, --encrypted               se cifran las contraseñas proporcionadas\n"
+
 msgid ""
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
+msgstr ""
+"  -m, --md5                     cifra la contraseña en claro utilizando\n"
+"                                el algoritmo MD5\n"
+
+msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
 "                                crypt algorithms\n"
 msgstr ""
@@ -667,35 +761,6 @@
 msgstr "%s: error detectado, cambios ignorados\n"
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Modo de uso: %s [opciones]\n"
-"\n"
-"Opciones:\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method <MÉTODO>   el método de cifrado (uno de %s)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-"  -e, --encrypted               se cifran las contraseñas proporcionadas\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-"  -h, --help                    muestra este mensaje de ayuda y termina\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -m, --md5                     cifra la contraseña en claro utilizando\n"
-"                                el algoritmo MD5\n"
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: (línea %d, usuario %s) la contraseña no ha cambiado\n"
 
@@ -703,21 +768,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: línea %d: el usuario «%s» no existe\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
-msgstr ""
-"Modo de uso: chsh [opciones] [USUARIO]\n"
-"\n"
-"Opciones:\n"
-"  -h, --help                    muestra este mensaje de ayuda y termina\n"
-"  -s, --shell CONSOLA           nueva consola de acceso para la cuenta del\n"
-"                                usuario\n"
-"\n"
+#, fuzzy
+#| msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
+msgstr "  -s, --shell CONSOLA           consola de acceso de la nueva cuenta\n"
 
 msgid "Login Shell"
 msgstr "Consola de acceso"
@@ -746,9 +800,36 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: aviso: %s no es un ejecutable\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Modo de uso: expiry {-f|-c}\n"
+#, fuzzy
+#| msgid ""
+#| "  -u, --user                    which user's tcb shadow file to edit\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
+"  -u, --user                    indica que fichero tcb de shadow del "
+"usuario\n"
+"                                editar\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -m, --md5                     cifra la contraseña en claro utilizando\n"
+"                                el algoritmo MD5\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: las opciones %s y %s están en conflicto\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: argumento inesperado: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 "  -a, --all                     muestra los registros de faillog para\n"
@@ -791,9 +872,10 @@
 "USUARIO\n"
 "                                indicado\n"
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "faillog: se produjo un fallo al conseguir la entrada para el UID %lu\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog: Se produjo un fallo al conseguir la entrada para el UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Usuario     Fallos Máximo Último                   Activo\n"
@@ -806,35 +888,36 @@
 msgid " [%lds lock]"
 msgstr "[bloqueados %lds]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr ""
 "faillog: se produjo un fallo al reiniciar el contador de fallos para el UID "
 "%lu\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "faillog: se produjo un fallo al establecer max para el UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr ""
 "faillog: se produjo un fallo al establecer el tiempo de bloqueo para el UID "
 "%lu\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog: usuario o rango desconocido: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "faillog: no se pudo abrir %s: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: no se pudo conseguir el tamaño de %s: %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: no se pudo conseguir el tamaño de %s: %s\n"
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -850,6 +933,12 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete USUARIO          elimina USUARIO del GRUPO\n"
 
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+"  -d, --home-dir DIR_PERSONAL   directorio personal de la nueva cuenta\n"
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         elimina la contraseña de GRUPO\n"
 
@@ -985,8 +1074,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: el GID «%lu» ya existe\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Modo de uso: groupdel grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: no se pudo determinar su nombre de usuario.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1099,16 +1190,52 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: usuario desconocido %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Modo de uso: %s [-r] [-s] [grupo [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Modo de uso: %s [opciones] [acción]\n"
+"\n"
+"Opciones:\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Modo de uso: %s [-r] [-s] [grupo]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Modo de uso: %s [opciones] [acción]\n"
+"\n"
+"Opciones:\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"  -s, --sha-rounds              número de rondas SHA para los algoritmos\n"
+"                                de cifrado SHA*\n"
+
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -l, --list                    lista los miembros del grupo\n"
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s y -r son incompatibles\n"
 
 msgid "invalid group file entry"
@@ -1178,12 +1305,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: sin cambios\n"
 
-msgid "Usage: grpconv\n"
-msgstr "Modo de uso: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "Modo de uso: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: no se pudo borrar %s\n"
@@ -1197,34 +1318,33 @@
 msgid " groups="
 msgstr "grupos="
 
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -t, --time DÍAS               muestra los registros de faillog más "
+"recientes\n"
+"                                que DÍAS\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr ""
+"  -t, --time DÍAS               muestra los registros de faillog más "
+"recientes\n"
+"                                que DÍAS\n"
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Modo de uso: lastlog [opciones]\n"
-"\n"
-"Opciones:\n"
-"  -b, --before DÍAS             muestra los registros de «lastlog» "
-"anteriores\n"
-"                                a DÍAS\n"
-"  -h, --help                    muestra este mensaje de ayuda y termina\n"
-"  -t, --time DÍAS               muestra sólo los registros de «lastlog» más\n"
-"                                recientes que DÍAS\n"
-"  -u, --user USUARIO            muestra el registro de «lastlog» del "
-"USUARIO\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Se produjo un fallo al conseguir la entrada para el UID %lu\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "Nombre           Puerto   De               Último"
 
@@ -1235,14 +1355,6 @@
 msgstr "**Nunca ha accedido**"
 
 #, 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 "lastlog: no se pudo conseguir el tamaño de %s: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Modo de uso: %s [-p] [nombre]\n"
 
@@ -1311,6 +1423,11 @@
 msgid "Login incorrect"
 msgstr "Identificación incorrecta"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: línea %d: no se puede encontrar el usuario %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1429,57 +1546,98 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: línea %d: no se puede actualizar la entrada\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+"  -a, --all                     muestra los registros de faillog para\n"
+"                                todos los usuarios\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system                  crea una cuenta del sistema\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system                  crea una cuenta del sistema\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+"  -e, --encrypted               se cifran las contraseñas proporcionadas\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -p, --password CONTRASEÑA     cambia la contraseña a CONTRASEÑA (cifrada)\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+"  -u, --uid UID                 identificador del usuario de la nueva "
+"cuenta\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds              número de rondas SHA para los algoritmos\n"
+"                                de cifrado SHA*\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr "  -q, --quiet                   modo silencioso\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system                  crea una cuenta del sistema\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+"  -u, --uid UID                 identificador del usuario de la nueva "
+"cuenta\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Modo de uso: passwd [opciones] [USUARIO]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     informa del estado de las contraseñas de\n"
-"                                todas las cuentas\n"
-"  -d, --delete                  borra la contraseña para la cuenta indicada\n"
-"  -e, --expire                  fuerza a que la contraseña de la cuenta\n"
-"                                caduque\n"
-"  -h, --help                    muestra este mensaje de ayuda y termina\n"
-"  -k, --keep-tokens             cambia la contraseña sólo si ha caducado\n"
-"  -i, --inactive INACTIVO       establece la contraseña inactiva después de\n"
-"                                caducar a INACTIVO\n"
-"  -l, --lock                    bloquea la contraseña de la cuenta indicada\n"
-"  -n, --mindays DÍAS_MIN        establece el número mínimo de días antes\n"
-"                                de que se cambie la contraseña a DÍAS_MIN\n"
-"  -q, --quiet                   modo silencioso\n"
-"  -r, --repository REP          cambia la contraseña en el repositorio REP\n"
-"  -S, --status                  informa del estado de la contraseña la "
-"cuenta\n"
-"                                indicada\n"
-"  -u, --unlock                  desbloquea la contraseña de la cuenta "
-"indicada\n"
-"  -w, --warndays DÍAS_AVISO     establece el aviso de caducidad a "
-"DÍAS_AVISO\n"
-"  -x, --maxdays DÍAS_MAX        establece el número máximo de días antes de\n"
-"                                cambiar la contraseña a DÍAS_MAX\n"
-"\n"
+"  -s, --sha-rounds              número de rondas SHA para los algoritmos\n"
+"                                de cifrado SHA*\n"
 
 msgid "Old password: "
 msgstr "Contraseña antigua: "
@@ -1563,17 +1721,38 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: información de caducidad de la contraseña cambiada.\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Modo de uso: %s [-q] [-r] [passwd]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Modo de uso: %s [opciones] [acción]\n"
+"\n"
+"Opciones:\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Modo de uso: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Modo de uso: %s [opciones] [acción]\n"
+"\n"
+"Opciones:\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s y -r son incompatibles\n"
+#, fuzzy
+#| msgid "  -q, --quiet                   quiet mode\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr "  -q, --quiet                   modo silencioso\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1635,8 +1814,8 @@
 msgid ""
 "user %s has an entry in %s, but its password field in %s is not set to 'x'\n"
 msgstr ""
-"el usuario %s tiene una entrada en %s, pero su campo de la contraseña en %s no "
-"está establecido a «x»\n"
+"el usuario %s tiene una entrada en %s, pero su campo de la contraseña en %s "
+"no está establecido a «x»\n"
 
 msgid "invalid shadow password file entry"
 msgstr "entrada del fichero shadow de contraseñas incorrecta"
@@ -1653,9 +1832,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: no se pudieron ordenar las entradas en %s\n"
 
-msgid "Usage: pwconv\n"
-msgstr "Modo de uso: pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: no puede funcionar con tcb activado\n"
@@ -1664,9 +1840,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: se produjo un fallo al cambiar el modo de %s a 0600\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "Modo de uso: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "El acceso a «su» en esa cuenta se ha DENEGADO.\n"
 
@@ -1732,18 +1905,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: debe ejecutarse desde un terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ignorado)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: error %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Id desconocido: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "No está autorizado a usar su %s\n"
 
@@ -1751,14 +1920,6 @@
 msgstr "(Introduzca su propia contraseña)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ignorado)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: se produjo un fallo en la autenticación\n"
 
@@ -1766,9 +1927,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s: no está autorizado a usar su en este momento\n"
 
-msgid "No shell\n"
-msgstr "Sin consola\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Sin entrada de contraseña para el administrador («root»)"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: debe ejecutarse desde un terminal\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: error %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot remove the content of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: no se pudo eliminar el contenido de %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "No se puede ejecutar %s"
+
 msgid "No password file"
 msgstr "Sin fichero de contraseñas"
 
@@ -1813,8 +1994,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: línea demasiado larga en %s: %s..."
 
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: renombrar: %s: %s"
 
 #, c-format
@@ -1825,9 +2007,15 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: demasiados grupos especificados (el máximo es %d).\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1979,10 +2167,6 @@
 msgstr "%s: -Z necesita que el núcleo tenga activado SELinux\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: las opciones %s y %s están en conflicto\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 "%s: se produjo un fallo al reiniciar la entrada de faillog del UID %lu: %s\n"
@@ -2048,31 +2232,44 @@
 "%s: aviso: el directorio personal ya existe.\n"
 "No se va a copiar ningún fichero del directorio «skel» en él.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -f, --force                   exit successfully if the group already "
+#| "exists,\n"
+#| "                                and cancel -g if the GID is already used\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Modo de uso: userdel [opciones] USUARIO\n"
-"\n"
-"Opciones:\n"
-"  -f, --force                   forzar la eliminación de los ficheros,\n"
-"                                incluso si no pertenecen al usuario\n"
-"  -h, --help                    muestra este mensaje de ayuda y termina\n"
-"  -r, --remove                  elimina el directorio personal y el buzón "
-"de\n"
-"                                correo\n"
-"\n"
+"  -f, --force                   termina si el grupo ya existe, y cancela -g\n"
+"                                si el GID ya se está en uso\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+"  -r, --reset                   reinicia el contador de accesos fallidos\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: no se pudo eliminar el grupo primario del usuario «%s»\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr "%s: grupo %s es el grupo primario de otro usuario y no se eliminará.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: %s directorio personal (%s) no encontrado\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: aviso: no se puede eliminar %s: %s\n"
@@ -2102,10 +2299,6 @@
 msgstr "%s: el usuario %s es un usuario NIS\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: el usuario %s está actualmente identificado en el sistema\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: %s directorio personal (%s) no encontrado\n"
 
@@ -2119,62 +2312,109 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: error eliminando el directorio %s\n"
 
-#, c-format
+#, fuzzy
+#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr "  -c, --comment COMENTARIO      campo GECOS de la nueva cuenta\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+"  -d, --home-dir DIR_PERSONAL   directorio personal de la nueva cuenta\n"
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+"  -e, --expiredate FECHA_CADUCIDAD  fecha de caducidad de la nueva cuenta\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -p, --password CONTRASEÑA     cambia la contraseña a CONTRASEÑA (cifrada)\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr "  -g, --gid GID                 utiliza GID para el nuevo grupo\n"
+
+#, fuzzy
+#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -M, --members USUARIO,...     establece la lista de miembros de GRUPO\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+"  -u, --uid UID                 identificador del usuario de la nueva "
+"cuenta\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
+#| "the\n"
+#| "                                new account\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -b, --base-dir DIR_BASE       directorio base para el directorio personal\n"
+"                                de la nueva cuenta\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
+#| "GID\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -o, --non-unique              permite utilizar un GID duplicado (no "
+"único)\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       use this encrypted password for the new "
+#| "group\n"
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Modo de uso: usermod [opciones] USUARIO\n"
-"\n"
-"Opciones:\n"
-"  -c, --comment COMENTARIO      nuevo valor del campo GECOS\n"
-"  -d, --home DIR_PERSONAL       nuevo directorio personal del nuevo usuario\n"
-"  -e, --expiredate FECHA_EXPIR  establece la fecha de caducidad de la\n"
-"                                cuenta a FECHA_EXPIR\n"
-"  -f, --inactive INACTIVO       establece el tiempo de inactividad después\n"
-"                                de que caduque la cuenta a INACTIVO\n"
-"  -g, --gid GRUPO               fuerza el uso de GRUPO para la nueva cuenta\n"
-"                                de usuario\n"
-"  -G, --groups GRUPOS           lista de grupos suplementarios\n"
-"  -h, --help                    muestra este mensaje de ayuda y termina\n"
-"  -l, --login NOMBRE            nuevo nombre para el usuario\n"
-"  -L, --lock                    bloquea la cuenta de usuario\n"
-"  -m, --move-home               mueve los contenidos del directorio\n"
-"                                personal al directorio nuevo (usar sólo\n"
-"                                junto con -d)\n"
-"  -o, --non-unique              permite usar UID duplicados (no únicos)\n"
-"  -p, --password CONTRASEÑA     usar la contraseña cifrada para la nueva "
+"  -p, --password CONTRASEÑA     utiliza esta contraseña cifrada para el "
+"nuevo\n"
+"                                grupo\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+"  -u, --uid UID                 identificador del usuario de la nueva "
 "cuenta\n"
-"  -s, --shell CONSOLA           la consola de acceso para la nueva cuenta "
-"de\n"
-"                                usuario\n"
-"  -u, --uid UID                 fuerza el uso del UID para la nueva cuenta\n"
-"                                de usuario\n"
-"  -U, --unlock                  desbloquea la cuenta de usuario\n"
-"%s\n"
 
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+"  -u, --uid UID                 identificador del usuario de la nueva "
+"cuenta\n"
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2195,19 +2435,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: el usuario «%s» ya existe en %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: no se pudo abrir %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: no se ha proporcionado ninguna opción\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr "%s: las opciones -L, -p y -U son exclusivas\n"
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: se necesitan contraseñas de shadow para -e y -f\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr "%s: las opciones -L, -p y -U son exclusivas\n"
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr "%s: el UID «%lu» ya existe\n"
 
@@ -2283,9 +2524,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -p, --passwd                  edita la base de datos de «passwd»\n"
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -q, --quiet                   modo silencioso\n"
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -s, --shadow                  edita la base de datos shadow o gshadow\n"
@@ -2348,6 +2586,339 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: se produjo un fallo al buscar el directorio tcb de %s\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) falló\n"
+
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Modo de uso: chage [opciones] [USUARIO]\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "  -d, --lastday ÚLTIMO_DÍA      establece el día del último cambio de la\n"
+#~ "                                contraseña a ÚLTIMO_DÍA\n"
+#~ "  -E, --expiredate FECHA_CAD    establece la fecha de caducidad a "
+#~ "FECHA_CAD\n"
+#~ "  -h, --help                    muestra este mensaje de ayuda y termina\n"
+#~ "  -I, --inactive INACTIVA       deshabilita la cuenta después de "
+#~ "INACTIVA\n"
+#~ "                                días de la fecha de caducidad\n"
+#~ "  -l, --list                    muestra la información de la edad de la "
+#~ "cuenta\n"
+#~ "  -m, --mindays DÍAS_MIN        establece el número mínimo de días antes "
+#~ "de\n"
+#~ "                                cambiar la contraseña a DÍAS_MIN\n"
+#~ "  -M, --maxdays DÍAS_MAX        establece el número máximo de días antes "
+#~ "de\n"
+#~ "                                cambiar la contraseña a DÍAS_MAX\n"
+#~ "  -W, --warndays DÍAS_AVISO     establece los días de aviso de expiración "
+#~ "a\n"
+#~ "                                DÍAS_AVISO\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: la autenticación PAM falló\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Modo de uso: %s [-f nombre_completo] [-r num_habitación] [-w "
+#~ "telf_trabajo]\n"
+#~ "\t[-h telf_casa] [-o otro] [usuario]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Modo de uso: %s [-f nombre_completo] [-r num_habitación] [-w "
+#~ "telf_trabajo]\n"
+#~ "\t[-h telf_casa]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Modo de uso: %s [opciones]\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "  -c, --crypt-method            el método de cifrado (uno de %s)\n"
+#~ "  -e, --encrypted               las contraseñas proporcionadas están "
+#~ "cifradas\n"
+#~ "  -h, --help                    muestra este mensaje de ayuda y termina\n"
+#~ "  -m, --md5                     usa el algoritmo MD5 para cifrar las\n"
+#~ "                                contraseñas\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Modo de uso: chsh [opciones] [USUARIO]\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "  -h, --help                    muestra este mensaje de ayuda y termina\n"
+#~ "  -s, --shell CONSOLA           nueva consola de acceso para la cuenta "
+#~ "del\n"
+#~ "                                usuario\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Modo de uso: expiry {-f|-c}\n"
+
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr ""
+#~ "faillog: se produjo un fallo al conseguir la entrada para el UID %lu\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "faillog: no se pudo abrir %s: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: no se pudo conseguir el tamaño de %s: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Modo de uso: groupdel grupo\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Modo de uso: %s [-r] [-s] [grupo [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Modo de uso: %s [-r] [-s] [grupo]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s y -r son incompatibles\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Modo de uso: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Modo de uso: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Modo de uso: lastlog [opciones]\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "  -b, --before DÍAS             muestra los registros de «lastlog» "
+#~ "anteriores\n"
+#~ "                                a DÍAS\n"
+#~ "  -h, --help                    muestra este mensaje de ayuda y termina\n"
+#~ "  -t, --time DÍAS               muestra sólo los registros de «lastlog» "
+#~ "más\n"
+#~ "                                recientes que DÍAS\n"
+#~ "  -u, --user USUARIO            muestra el registro de «lastlog» del "
+#~ "USUARIO\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Modo de uso: passwd [opciones] [USUARIO]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     informa del estado de las contraseñas de\n"
+#~ "                                todas las cuentas\n"
+#~ "  -d, --delete                  borra la contraseña para la cuenta "
+#~ "indicada\n"
+#~ "  -e, --expire                  fuerza a que la contraseña de la cuenta\n"
+#~ "                                caduque\n"
+#~ "  -h, --help                    muestra este mensaje de ayuda y termina\n"
+#~ "  -k, --keep-tokens             cambia la contraseña sólo si ha caducado\n"
+#~ "  -i, --inactive INACTIVO       establece la contraseña inactiva después "
+#~ "de\n"
+#~ "                                caducar a INACTIVO\n"
+#~ "  -l, --lock                    bloquea la contraseña de la cuenta "
+#~ "indicada\n"
+#~ "  -n, --mindays DÍAS_MIN        establece el número mínimo de días antes\n"
+#~ "                                de que se cambie la contraseña a "
+#~ "DÍAS_MIN\n"
+#~ "  -q, --quiet                   modo silencioso\n"
+#~ "  -r, --repository REP          cambia la contraseña en el repositorio "
+#~ "REP\n"
+#~ "  -S, --status                  informa del estado de la contraseña la "
+#~ "cuenta\n"
+#~ "                                indicada\n"
+#~ "  -u, --unlock                  desbloquea la contraseña de la cuenta "
+#~ "indicada\n"
+#~ "  -w, --warndays DÍAS_AVISO     establece el aviso de caducidad a "
+#~ "DÍAS_AVISO\n"
+#~ "  -x, --maxdays DÍAS_MAX        establece el número máximo de días antes "
+#~ "de\n"
+#~ "                                cambiar la contraseña a DÍAS_MAX\n"
+#~ "\n"
+
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Modo de uso: %s [-q] [-r] [passwd]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Modo de uso: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Modo de uso: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Modo de uso: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Id desconocido: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Sin consola\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Modo de uso: userdel [opciones] USUARIO\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "  -f, --force                   forzar la eliminación de los ficheros,\n"
+#~ "                                incluso si no pertenecen al usuario\n"
+#~ "  -h, --help                    muestra este mensaje de ayuda y termina\n"
+#~ "  -r, --remove                  elimina el directorio personal y el buzón "
+#~ "de\n"
+#~ "                                correo\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: el usuario %s está actualmente identificado en el sistema\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Modo de uso: usermod [opciones] USUARIO\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "  -c, --comment COMENTARIO      nuevo valor del campo GECOS\n"
+#~ "  -d, --home DIR_PERSONAL       nuevo directorio personal del nuevo "
+#~ "usuario\n"
+#~ "  -e, --expiredate FECHA_EXPIR  establece la fecha de caducidad de la\n"
+#~ "                                cuenta a FECHA_EXPIR\n"
+#~ "  -f, --inactive INACTIVO       establece el tiempo de inactividad "
+#~ "después\n"
+#~ "                                de que caduque la cuenta a INACTIVO\n"
+#~ "  -g, --gid GRUPO               fuerza el uso de GRUPO para la nueva "
+#~ "cuenta\n"
+#~ "                                de usuario\n"
+#~ "  -G, --groups GRUPOS           lista de grupos suplementarios\n"
+#~ "  -h, --help                    muestra este mensaje de ayuda y termina\n"
+#~ "  -l, --login NOMBRE            nuevo nombre para el usuario\n"
+#~ "  -L, --lock                    bloquea la cuenta de usuario\n"
+#~ "  -m, --move-home               mueve los contenidos del directorio\n"
+#~ "                                personal al directorio nuevo (usar sólo\n"
+#~ "                                junto con -d)\n"
+#~ "  -o, --non-unique              permite usar UID duplicados (no únicos)\n"
+#~ "  -p, --password CONTRASEÑA     usar la contraseña cifrada para la nueva "
+#~ "cuenta\n"
+#~ "  -s, --shell CONSOLA           la consola de acceso para la nueva cuenta "
+#~ "de\n"
+#~ "                                usuario\n"
+#~ "  -u, --uid UID                 fuerza el uso del UID para la nueva "
+#~ "cuenta\n"
+#~ "                                de usuario\n"
+#~ "  -U, --unlock                  desbloquea la cuenta de usuario\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: no se ha proporcionado ninguna opción\n"
+
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
@@ -2886,9 +3457,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/eu.po
===================================================================
--- upstream/trunk/po/eu.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/eu.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2009-07-03 11:06+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-eu at lists.debian.org>\n"
@@ -42,6 +42,14 @@
 "konfigurazio errorea - %s item ezezaguna (eman honen berri "
 "administratzaileari)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Pasahitza: "
 
@@ -229,6 +237,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "huts egin du postontzia jabez aldatzean"
+
+#, fuzzy, c-format
 #| msgid "%s: Can't get unique system UID (no more available UIDs)\n"
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr ""
@@ -313,6 +326,33 @@
 msgstr "%s(r)en pasahitz okerra.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: huts baimenak kentzerakoan (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: etxeko tlf baliogabea: '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: ezin da %s direktorioa sortu\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: ezin da %s direktorioa sortu\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -342,47 +382,80 @@
 msgid "Unable to determine your tty name."
 msgstr "Ezin da zure tty izena zehaztu."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) huts egin du\n"
-
 msgid "No"
 msgstr "Ez"
 
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"Erabilera: %s [aukerak]\n"
+"\n"
+"Aukerak:\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
+"                                algoritmoa erabiliaz\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
+"                                SHA erronda kopurua\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
+"                                SHA erronda kopurua\n"
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Erabilera: chage [aukerak] [IZENA]\n"
-"\n"
-"Aukerak:\n"
-"  -d, --lastday AZKEN_EGUNA         ezarri pasahitz aldaketa AZKEN_EGUNA\n"
-"  -E, --expiredate IRAUNGITZE_DATA  ezarri kontu iraungitze data\n"
-"                                    IRAUNGITZE_DATA-ra\n"
-"  -h, --help                        laguntza mezu hau bistarazi eta  irten\n"
-"  -I, --inactive INACTIVE           ezarri pasahitza ezgaitua bezala\n"
-"                                    -INACTIVE iraungitzean\n"
-"  -l, --list                        kontu denbora informazioa bistarazi\n"
-"  -m, --mindays GUTXI_EGUN          pasahitz aldaketa gutxieneko data\n"
-"                                    GUTXI_EGUN-era aldatu\n"
-"  -M, --maxdays GEHI_EGUN           pasashitz aldaketa gehienezko data\n"
-"                                    GEHI_EGUN-era aldatu\n"
-"  -W, --warndays ABISU_EGUN         iraungitze abisua ABISU_EGUN-era ezarri\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Idatzi balio berria, edo sakatu 'Sartu' tekla lehenetsirako"
@@ -455,9 +528,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -480,10 +554,6 @@
 msgstr "%s: ezin da itzalpeko (shadow) pasahitz fitxategia ez dago\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: huts baimenak kentzerakoan (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: `%s' erabiltzailea ez da %s-en existitzen\n"
 
@@ -495,18 +565,41 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: errorea eremuak aldatzean\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Erabilera: %s [-f izen_osoa] [-r gela_zenb] [-w lan_tlf]\n"
-"\t[-h etxe_tlf] [-o bestelakoa] [erabiltzaile-izena]\n"
+"Erabilera: %s [aukerak]\n"
+"\n"
+"Aukerak:\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
-msgstr "Erabilera: %s [-f izen_osoa] [-r gela_zb] [-w lan_tlf] [-h etxe_tlf]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
+msgstr ""
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Izen osoa"
 
@@ -586,25 +679,27 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 "Erabilera: %s [aukerak]\n"
 "\n"
 "Aukerak:\n"
-"  -c, --crypt-method            kriptografia metodoa (%s-etako bat)\n"
-"  -e, --encrypted              emandako pasahitzak enkripatzen dira\n"
-"  -h, --help                    laguntzako mezu hau erakutsi eta irten\n"
-"                                egiten da\n"
-"  -m, --md5                     erabili MD5 enkriptatze algoritmoa ,\n"
-"                                pasahitzak enkriptatuta ez daudenean\n"
-"%s\n"
 
+#, fuzzy, c-format
+#| msgid "  -c, --crypt-method            the crypt method (one of %s)\n"
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr "  -c, --crypt-method            zifratze metodoa (%s-etako bat)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr "  -e, --encrypted               emandako pasahitzak zifraturik daude\n"
+
 msgid ""
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
+msgstr ""
+"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
+"                                algoritmoa erabiliaz\n"
+
+msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
 "                                crypt algorithms\n"
 msgstr ""
@@ -644,35 +739,6 @@
 msgstr "%s:errorea atzeman da, aldaketak alde batera utzi dira\n"
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Erabilera: %s [aukerak]\n"
-"\n"
-"Aukerak:\n"
-
-#, fuzzy, c-format
-#| msgid "  -c, --crypt-method            the crypt method (one of %s)\n"
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method            zifratze metodoa (%s-etako bat)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr "  -e, --encrypted               emandako pasahitzak zifraturik daude\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
-"                                algoritmoa erabiliaz\n"
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: `(%d lerroa, %s erabiltzailea) pasahitza ez da aldatu\n"
 
@@ -680,20 +746,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: %d lerroa: '%s' erabiltzailea ez da existitzen\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
-msgstr ""
-"Erabilera: chsh [aukerak] [IZENA]\n"
-"\n"
-"Aukerak:\n"
-"  -h, --help                    laguntza testu hau bistarazi eta irten\n"
-"  -r, --shell IZENA             erabiltzaile kontukoaren shell berria\n"
-"\n"
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
 
 msgid "Login Shell"
 msgstr "Saio-hasierako shell-a"
@@ -725,10 +781,33 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: abisua: %s ez dago %s(r)en jabegoan\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Erabilera: expiry {-f|-c}\n"
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
 
 #, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
+"                                algoritmoa erabiliaz\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: %s eta %s aukerak elkar-jotzen dute\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: argumentu esperogabea: %s\n"
+
+#, fuzzy
 #| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
@@ -762,9 +841,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "huts-erregistroa: Huts %lu UID-arentat sarrera eskuratzean\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog: Huts %lu UIDaren sarrera eskuratzean\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Saio-hasiera    Hutsegiteak Gehienezkoa Azkena     Aktiboa\n"
@@ -777,30 +857,31 @@
 msgid " [%lds lock]"
 msgstr " [%lds blokeatuta]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr "huts-erregistroa: Errorea %lu UIDaren huts kontua berrabiaraztean\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "huts-erregistroa: Huts %lu UIDarentzat max ezartzean\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "huts-erregistroa: Huts %lu UIDarentzat blokeo-ordua ezartzean\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "azken-erregistroa: Eremu edo erabiltzaile ezezaguna: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "huts-erregistroa: Ezin da %s ireki: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: Ezinda %s-ren tamaina eskuratu: %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "huts-erregistroa: Ezinda %s tamaina eskuratu: %s\n"
-
 #, fuzzy, c-format
 #| msgid ""
 #| "Usage: %s [options]\n"
@@ -823,6 +904,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -976,8 +1060,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: '%lu' GIDa badago dagoeneko\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Erabilera: groupdel taldea\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Ezin da Erabiltzaile izena zehaztu.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1097,16 +1183,53 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: %s erabiltzaile ezezaguna\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Erabilera: %s [-r] [-s] [taldea [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Erabilera: %s [aukerak]\n"
+"\n"
+"Aukerak:\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Erabilera: %s [-r] [-s] [taldea]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Erabilera: %s [aukerak]\n"
+"\n"
+"Aukerak:\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
+"                                SHA erronda kopurua\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s eta -r ezin dira batera erabili\n"
 
 msgid "invalid group file entry"
@@ -1176,12 +1299,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: aldaketarik gabe\n"
 
-msgid "Usage: grpconv\n"
-msgstr "Erabilera: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "Erabilera: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: ezin da %s ezabatu\n"
@@ -1195,34 +1312,25 @@
 msgid " groups="
 msgstr " taldeak="
 
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr ""
+"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Erabilera: lastlog [aukerak]\n"
-"\n"
-"Aukerak:\n"
-"  -b, --before EGUN             EGUN kopurua baino zaharragoak diren\n"
-"                                erregistroak\n"
-"  -h, --help                    laguntzako mezu hau bistaratu eta irten\n"
-"                                egiten da\n"
-"  -t, --time EGUNAK             EGUNAK baino berriagoak diren erregistroak\n"
-"                                bakarrik bistaratzen ditu\n"
-"  -u, --user IZENA              IZENA duen erabiltzailearen lastlog\n"
-"                                erregistroa bistaratzen du\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Huts %lu UIDaren sarrera eskuratzean\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "Erabiltzaile-izena        Ataka      Nondik           Azkena"
 
@@ -1233,14 +1341,6 @@
 msgstr "**Inoiz ez du saiorik hasi**"
 
 #, 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 "lastlog: Ezinda %s-ren tamaina eskuratu: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Erabilera: %s [-p] [izena]\n"
 
@@ -1311,6 +1411,11 @@
 msgid "Login incorrect"
 msgstr "Izen okerra"
 
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: Ezin da Erabiltzaile izena zehaztu.\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1430,58 +1535,94 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: %d lerroa: ezin da sarrera eguneratu\n"
 
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr "  -e, --encrypted               emandako pasahitzak zifraturik daude\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
+"                                algoritmoa erabiliaz\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
+"                                SHA erronda kopurua\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Erabilera: passwd [aukerak] [IZENA]\n"
-"\n"
-"Aukerak:\n"
-"  -a, --all                        kontu guztien pasahitzen egoera "
-"erreportea\n"
-"  -d, --delete                     emandako kontuaren pasahitza ezabatu\n"
-"  -e, --expire                     emandako kontuaren pasahitzaren\n"
-"                                   iraungitzea behartu\n"
-"  -h, --help                       laguntza mezu hau bistarazi eta irten\n"
-"  -k, --keep-tokens                pasahitza iraungirik bakarrik badago\n"
-"                                   aldatu\n"
-"  -i, --inactive INAKTIBO          ezarri iraungiriko pasahitz ezgaitzea\n"
-"                                   INAKTIBO-ra\n"
-"  -l, --lock                       emandako kontua blokeatu\n"
-"  -n, --mindays GUTXI_EGUN         ezarri pasahitz aldaketa gutxieneko data\n"
-"                                   GUTXI_EGUN-ra\n"
-"  -q, --quiet                      ixilik modua\n"
-"  -r, --repository ERREPOSITORIOA  ERREPOSITORIOA errepositorioko pashitza\n"
-"                                   aldatu\n"
-"  -S, --status                     emandako kontuaren pasahitz egoera\n"
-"                                   erreportea egin\n"
-"  -u, --unlock                     emandako kontuaren blokeoa kendu\n"
-"  -w, --warndays ABISU_EGUN        ezarri iraungitze abisu data ABISU_EGUN-"
-"era\n"
-"  -x, --maxdays GEHI_EGUN          ezarri pasahitz aldatu aurretik "
-"gehienezko\n"
-"                                   egun kopurua GEHI_EGUN-era\n"
-"\n"
+"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
+"                                SHA erronda kopurua\n"
 
 msgid "Old password: "
 msgstr "Pasahitz zaharra: "
@@ -1565,19 +1706,38 @@
 msgstr "%s: pasahitz iraungitzea informazioa aldatua.\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Erabilera: %s [-q] [-r] [-s] [pasahitza [itzalpekoa]]\n"
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Erabilera: %s [aukerak]\n"
+"\n"
+"Aukerak:\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Erabilera: %s [-q] [-r] [-s] [pasahitza [itzalpekoa]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s eta -r ezin dira batera erabili\n"
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Erabilera: %s [aukerak]\n"
+"\n"
+"Aukerak:\n"
 
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1657,9 +1817,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: ezin dira %s fitxategiko sarrerak ordenatu\n"
 
-msgid "Usage: pwconv\n"
-msgstr "Erabilera: pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr ""
@@ -1668,9 +1825,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: huts %s-ren modua 0600-ra aldatzean\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "Erabilera: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "kontu honentzako 'su' sarbidea UKATUTA.\n"
 
@@ -1736,18 +1890,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: terminal batetik exekutatu behar da\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ez ikusi egin zaio)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: %d errorea\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "ID ezezaguna: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Ez duzu 'su %s' exekutatzeko baimenik\n"
 
@@ -1755,14 +1905,6 @@
 msgstr "(zure pasahitza idatzi)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ez ikusi egin zaio)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: ¡autentifikazio errorea\n"
 
@@ -1770,9 +1912,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s: Ez duzu orain su erabiltzeko baimenik\n"
 
-msgid "No shell\n"
-msgstr "Ez dago shell-a\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Ez dago 'root'-en pasahitzik"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: terminal batetik exekutatu behar da\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: %d errorea\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "lastlog: Ezinda %s-ren tamaina eskuratu: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Ezin izan da %s exekutatu"
+
 msgid "No password file"
 msgstr "Ez dago pasahitz-fitxategirik"
 
@@ -1814,8 +1976,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: lerro luzeegia %s-n: %s..."
 
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: berrizendatu: %s: %s"
 
 #, c-format
@@ -1833,6 +1996,8 @@
 #| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1997,10 +2162,6 @@
 msgstr "%s: -Z-ek  SELinux gaituriko kernel bat behar du\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: %s eta %s aukerak elkar-jotzen dute\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr "%s: huts %lu UIDaren faillog erregistroa berrezartzean: %s\n"
 
@@ -2065,31 +2226,43 @@
 "%s: abisua: etxe direktorioa badago dagoeneko.\n"
 "Ez da bertara skel direktorioko fitxategirik kopiatuko.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Erabilera: userdel [aukerak] IZENA\n"
-"\n"
-"Aukerak:\n"
-"  -f, --force                   fitxategien ezabatzea indartu nahiz ez\n"
-"                                erabiltzailearenak izan\n"
-"  -h, --help                    laguntza testu hau bistarazi eta irten\n"
-"  -r, --remove                  etxe direktorioa eta posta hilara ezabatu\n"
-"\n"
+"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
+"                                algoritmoa erabiliaz\n"
 
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: Ezin da '%s' erabiltzailearen talde nagusia kendu\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 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"
 
+#, fuzzy, c-format
+#| msgid "%s: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: %s etxe-direktorioa (%s) ez dago\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: abisua: ezin da %s ezabatu: %s\n"
@@ -2122,10 +2295,6 @@
 msgstr "%s:  %s erabiltzailea NIS erabiltzaile bat da\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: une honetan %s erabiltzaileak saioan sartuta dago\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: %s etxe-direktorioa (%s) ez dago\n"
 
@@ -2137,63 +2306,93 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: errorea %s direktorioa ezabatzean\n"
 
-#, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
+"                                algoritmoa erabiliaz\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
+"                                SHA erronda kopurua\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
+"                                SHA erronda kopurua\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
+"                                algoritmoa erabiliaz\n"
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Erabilera: usermod [aukerak] IZENA\n"
-"\n"
-"Aukerak:\n"
-"  -c, --comment IRUZKINA         GECOS eremuaren balio berria\n"
-"  -d, --home-dir ETXE_DIR       erabiltzaile kontu berriaren etxe "
-"direktorioa\n"
-"  -e, --expiredate IRAUNG_DATA  kontu iraungitze data ezarri\n"
-"  -f, --inactive INAKTIBO       iraungitze ondorengo pasahitz ezgaitzea\n"
-"                                to INAKTIBO-ra ezarri\n"
-"  -g, --gid TALDE               erabiltzaile kontu berriarekin TALDE\n"
-"                                erabiltzea behartu\n"
-"  -G, --groups TALDEAK          erabiltzaile kontu berriaren talde\n"
-"                                gehigarriak bistarazi\n"
-"  -a, --append                  gehitu erabiltzailea -G aukerak zehaztutako "
-"talde\n"
-"                                gehigarrietara beste taldeetatik kendu gabe\n"
-"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
-"  -l, --login IZENA             saio hasiera izenaren balio berria\n"
-"  -L, --lock                    erabiltzaile kontua blokeatu\n"
-"  -m, --move-home               etxe direktorioaren edukia kokapen berrira\n"
-"                                mugitu (--d-rekin bakarrik erabilgarri)\n"
-"  -o, --non-unique              onartu UID bikoiztuak (ez bakarrak) "
-"erabiltzea\n"
-"  -p, --password PASAHITZA      Enkriptaturiko pasahitza erabili pasahitz\n"
-"                                berriarentzat\n"
-"  -s, --shell SHELL             erabiltzaile kontuaren saio shell berria\n"
-"  -u, --uid UID                 erabiltzaile kontuaren UID berria\n"
-"  -U, --unlock                  erabiltzaile kontua desblokeatu\n"
-"%s\n"
 
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2215,19 +2414,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: '%s' erabiltzailea badago dagoeneko %s-n\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: ezin da %s ireki\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: ez da banderarik eman\n"
+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: shadow passwords required for -e and -f\n"
 msgstr "%s:  -e eta -f aukerek itzalpeko pasahitzak eskatzen dute\n"
 
 #, c-format
-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' already exists\n"
 msgstr "%s: '%lu' UIDa badago dagoeneko\n"
 
@@ -2311,11 +2511,6 @@
 msgstr "  -r, --system                  sortu sistema kontuak\n"
 
 #, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
-
-#, fuzzy
 #| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
@@ -2395,7 +2590,327 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: oinarrizko '%s' direktorio baliogabea\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) huts egin du\n"
+
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Erabilera: chage [aukerak] [IZENA]\n"
+#~ "\n"
+#~ "Aukerak:\n"
+#~ "  -d, --lastday AZKEN_EGUNA         ezarri pasahitz aldaketa AZKEN_EGUNA\n"
+#~ "  -E, --expiredate IRAUNGITZE_DATA  ezarri kontu iraungitze data\n"
+#~ "                                    IRAUNGITZE_DATA-ra\n"
+#~ "  -h, --help                        laguntza mezu hau bistarazi eta  "
+#~ "irten\n"
+#~ "  -I, --inactive INACTIVE           ezarri pasahitza ezgaitua bezala\n"
+#~ "                                    -INACTIVE iraungitzean\n"
+#~ "  -l, --list                        kontu denbora informazioa bistarazi\n"
+#~ "  -m, --mindays GUTXI_EGUN          pasahitz aldaketa gutxieneko data\n"
+#~ "                                    GUTXI_EGUN-era aldatu\n"
+#~ "  -M, --maxdays GEHI_EGUN           pasashitz aldaketa gehienezko data\n"
+#~ "                                    GEHI_EGUN-era aldatu\n"
+#~ "  -W, --warndays ABISU_EGUN         iraungitze abisua ABISU_EGUN-era "
+#~ "ezarri\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM autentifikazioak huts egin du\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Erabilera: %s [-f izen_osoa] [-r gela_zenb] [-w lan_tlf]\n"
+#~ "\t[-h etxe_tlf] [-o bestelakoa] [erabiltzaile-izena]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Erabilera: %s [-f izen_osoa] [-r gela_zb] [-w lan_tlf] [-h etxe_tlf]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Erabilera: %s [aukerak]\n"
+#~ "\n"
+#~ "Aukerak:\n"
+#~ "  -c, --crypt-method            kriptografia metodoa (%s-etako bat)\n"
+#~ "  -e, --encrypted              emandako pasahitzak enkripatzen dira\n"
+#~ "  -h, --help                    laguntzako mezu hau erakutsi eta irten\n"
+#~ "                                egiten da\n"
+#~ "  -m, --md5                     erabili MD5 enkriptatze algoritmoa ,\n"
+#~ "                                pasahitzak enkriptatuta ez daudenean\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Erabilera: chsh [aukerak] [IZENA]\n"
+#~ "\n"
+#~ "Aukerak:\n"
+#~ "  -h, --help                    laguntza testu hau bistarazi eta irten\n"
+#~ "  -r, --shell IZENA             erabiltzaile kontukoaren shell berria\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Erabilera: expiry {-f|-c}\n"
+
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "huts-erregistroa: Huts %lu UID-arentat sarrera eskuratzean\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "huts-erregistroa: Ezin da %s ireki: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "huts-erregistroa: Ezinda %s tamaina eskuratu: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Erabilera: groupdel taldea\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Erabilera: %s [-r] [-s] [taldea [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Erabilera: %s [-r] [-s] [taldea]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s eta -r ezin dira batera erabili\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Erabilera: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Erabilera: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Erabilera: lastlog [aukerak]\n"
+#~ "\n"
+#~ "Aukerak:\n"
+#~ "  -b, --before EGUN             EGUN kopurua baino zaharragoak diren\n"
+#~ "                                erregistroak\n"
+#~ "  -h, --help                    laguntzako mezu hau bistaratu eta irten\n"
+#~ "                                egiten da\n"
+#~ "  -t, --time EGUNAK             EGUNAK baino berriagoak diren "
+#~ "erregistroak\n"
+#~ "                                bakarrik bistaratzen ditu\n"
+#~ "  -u, --user IZENA              IZENA duen erabiltzailearen lastlog\n"
+#~ "                                erregistroa bistaratzen du\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Erabilera: passwd [aukerak] [IZENA]\n"
+#~ "\n"
+#~ "Aukerak:\n"
+#~ "  -a, --all                        kontu guztien pasahitzen egoera "
+#~ "erreportea\n"
+#~ "  -d, --delete                     emandako kontuaren pasahitza ezabatu\n"
+#~ "  -e, --expire                     emandako kontuaren pasahitzaren\n"
+#~ "                                   iraungitzea behartu\n"
+#~ "  -h, --help                       laguntza mezu hau bistarazi eta irten\n"
+#~ "  -k, --keep-tokens                pasahitza iraungirik bakarrik badago\n"
+#~ "                                   aldatu\n"
+#~ "  -i, --inactive INAKTIBO          ezarri iraungiriko pasahitz ezgaitzea\n"
+#~ "                                   INAKTIBO-ra\n"
+#~ "  -l, --lock                       emandako kontua blokeatu\n"
+#~ "  -n, --mindays GUTXI_EGUN         ezarri pasahitz aldaketa gutxieneko "
+#~ "data\n"
+#~ "                                   GUTXI_EGUN-ra\n"
+#~ "  -q, --quiet                      ixilik modua\n"
+#~ "  -r, --repository ERREPOSITORIOA  ERREPOSITORIOA errepositorioko "
+#~ "pashitza\n"
+#~ "                                   aldatu\n"
+#~ "  -S, --status                     emandako kontuaren pasahitz egoera\n"
+#~ "                                   erreportea egin\n"
+#~ "  -u, --unlock                     emandako kontuaren blokeoa kendu\n"
+#~ "  -w, --warndays ABISU_EGUN        ezarri iraungitze abisu data "
+#~ "ABISU_EGUN-era\n"
+#~ "  -x, --maxdays GEHI_EGUN          ezarri pasahitz aldatu aurretik "
+#~ "gehienezko\n"
+#~ "                                   egun kopurua GEHI_EGUN-era\n"
+#~ "\n"
+
 #, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Erabilera: %s [-q] [-r] [-s] [pasahitza [itzalpekoa]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Erabilera: %s [-q] [-r] [-s] [pasahitza [itzalpekoa]]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Erabilera: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Erabilera: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "ID ezezaguna: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Ez dago shell-a\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Erabilera: userdel [aukerak] IZENA\n"
+#~ "\n"
+#~ "Aukerak:\n"
+#~ "  -f, --force                   fitxategien ezabatzea indartu nahiz ez\n"
+#~ "                                erabiltzailearenak izan\n"
+#~ "  -h, --help                    laguntza testu hau bistarazi eta irten\n"
+#~ "  -r, --remove                  etxe direktorioa eta posta hilara "
+#~ "ezabatu\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: une honetan %s erabiltzaileak saioan sartuta dago\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Erabilera: usermod [aukerak] IZENA\n"
+#~ "\n"
+#~ "Aukerak:\n"
+#~ "  -c, --comment IRUZKINA         GECOS eremuaren balio berria\n"
+#~ "  -d, --home-dir ETXE_DIR       erabiltzaile kontu berriaren etxe "
+#~ "direktorioa\n"
+#~ "  -e, --expiredate IRAUNG_DATA  kontu iraungitze data ezarri\n"
+#~ "  -f, --inactive INAKTIBO       iraungitze ondorengo pasahitz ezgaitzea\n"
+#~ "                                to INAKTIBO-ra ezarri\n"
+#~ "  -g, --gid TALDE               erabiltzaile kontu berriarekin TALDE\n"
+#~ "                                erabiltzea behartu\n"
+#~ "  -G, --groups TALDEAK          erabiltzaile kontu berriaren talde\n"
+#~ "                                gehigarriak bistarazi\n"
+#~ "  -a, --append                  gehitu erabiltzailea -G aukerak "
+#~ "zehaztutako talde\n"
+#~ "                                gehigarrietara beste taldeetatik kendu "
+#~ "gabe\n"
+#~ "  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+#~ "  -l, --login IZENA             saio hasiera izenaren balio berria\n"
+#~ "  -L, --lock                    erabiltzaile kontua blokeatu\n"
+#~ "  -m, --move-home               etxe direktorioaren edukia kokapen "
+#~ "berrira\n"
+#~ "                                mugitu (--d-rekin bakarrik erabilgarri)\n"
+#~ "  -o, --non-unique              onartu UID bikoiztuak (ez bakarrak) "
+#~ "erabiltzea\n"
+#~ "  -p, --password PASAHITZA      Enkriptaturiko pasahitza erabili "
+#~ "pasahitz\n"
+#~ "                                berriarentzat\n"
+#~ "  -s, --shell SHELL             erabiltzaile kontuaren saio shell berria\n"
+#~ "  -u, --uid UID                 erabiltzaile kontuaren UID berria\n"
+#~ "  -U, --unlock                  erabiltzaile kontua desblokeatu\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: ez da banderarik eman\n"
+
+#, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"

Modified: upstream/trunk/po/fi.po
===================================================================
--- upstream/trunk/po/fi.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/fi.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2007-11-24 22:54+0100\n"
 "Last-Translator: Tommi Vainikainen <thv+debian at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -36,6 +36,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "asetusvirhe - tuntematon kohta \"%s\" (kerro ylläpidolle)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Salasana: "
 
@@ -227,6 +235,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "postilaatikon omistajan vaihtaminen epäonnistui"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: ei saa ainutkertaista UID:tä\n"
 
@@ -310,6 +323,33 @@
 msgstr "Väärä salasana käyttäjälle \"%s\".\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: virheellinen kotipuhelin: \"%s\"\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: hakemistoa %s ei voi luoda\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: hakemistoa %s ei voi luoda\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -337,72 +377,55 @@
 msgid "Unable to determine your tty name."
 msgstr "Tty-päätteesi nimeä ei voi selvittää."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) epäonnistui\n"
-
 #, fuzzy
 #| msgid "No\n"
 msgid "No"
 msgstr "Ei\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "Käyttö: %s [syöte]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Käyttö: chage [valitsimet] [TUNNUS]\n"
-"\n"
-"Valitsimet:\n"
-"  -d, --lastday VIIM_PVM        Aseta edelliseksi salasanan vaihtopäiväksi\n"
-"                                VIIM_PVM\n"
-"  -E, --expiredate VANH_PVM     Aseta tilin vanhenemispäiväykseksi VANH_PVM\n"
-"  -h, --help                    Näytä tämä ohje ja lopeta\n"
-"  -I, --inactive POISKÄYTÖSTÄ   Ota salasana pois käytöstä POISKÄYTÖSTÄ\n"
-"                                päivää vanhenemisen jälkeen\n"
-"  -l, --list                    Näytä tilin vanhenemistiedot\n"
-"  -m, --mindays MIN_PÄIVIÄ      Aseta pienimmäksi sallittuksi määräksi\n"
-"                                päiviä ennen salasanan vaihtamista "
-"MIN_PÄIVIÄ\n"
-"  -M, --maxdays MAX_PÄIVIÄ      Aseta suurimmaksi sallituksi määräksi "
-"päiviä\n"
-"                                ennen salasanan vaihtamista MAX_PÄIVIÄ\n"
-"  -W, --warndays VAR_PÄIVIÄ     Aseta vanhenemisen varoitusajaksi "
-"VAR_PÄIVIÄ\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Syötä uusi arvo tai paina ENTER jättääksesi oletuksen"
@@ -475,9 +498,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -502,10 +526,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: varjosalasanatiedostoa ei ole\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: Oikeuksien pudottaminen epäonnistui (%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"
@@ -518,18 +538,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: virhe muutettaessa kenttiä\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "Käyttö: %s [syöte]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Käyttö: %s [-f koko_nimi] [-r huonenro] [-w työpuh]\n"
-"\t[-h kotipuh] [-o muu] [käyttäjä]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
-msgstr "Käyttö: %s [-f koko_nimi] [-r huonenro] [-w työpuh] [-h kotipuh]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Koko nimi"
 
@@ -607,24 +641,24 @@
 msgstr "%s: kentät liian pitkiä\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "Käyttö: %s [syöte]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Käyttö: chpasswd [valitsimet]\n"
-"\n"
-"Valitsimet:\n"
-"  -e, --encrypted               Annetut salasanat ovat salakirjoitettuja\n"
-"  -h, --help                    Näytä tämä ohje ja lopeta\n"
-"  -m, --md5                     Käytä MD5:tä eikä DES:iä kun annetut\n"
-"                                salasanat eivät ole salakirjoitettuja\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -666,29 +700,6 @@
 msgstr "%s: virhe havaittu, muutokset ohitetaan\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Käyttö: %s [syöte]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: käyttäjää %s ei ole olemassa\n"
 
@@ -696,21 +707,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: käyttäjää %s ei ole olemassa\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Käyttö: chsh [valitsimet] [TUNNUS]\n"
-"\n"
-"Valitsimet:\n"
-"  -h, --help                    Näytä tämä ohje ja poistu\n"
-"  -s, --shell KUORI             Aseta uusi sisäänkirjautumiskuori "
-"käyttäjälle\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "Sisäänkirjautumiskuori"
@@ -743,9 +741,24 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: varoitus: tiedoston %s omistaja ei ole %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Käyttö: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: odottamaton argumentti: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -772,9 +785,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: hakemistoa %s ei voi luoda\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Tunnus      Epäonn.  Enint.  Edellinen                Päätteellä\n"
@@ -788,31 +802,30 @@
 msgid " [%lds lock]"
 msgstr " [%lds lukittu]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: hakemistoa %s ei voi luoda\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: hakemistoa %s ei voi luoda\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "Tuntematon käyttäjä: %s\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"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: hakemistoa %s ei voi uudelleennimetä hakemistoksi %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -827,6 +840,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -954,8 +970,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Käyttäjätunnusta ei voi selvittää.\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1059,16 +1077,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: Tuntematon käyttäjä %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Käyttö: %s [-r] [-s] [ryhmä [ryhmävarjo]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Käyttö: %s [syöte]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Käyttö: %s [-r] [-s] [ryhmä]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "Käyttö: %s [syöte]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: valitsimet -s ja -r eivät sovi yhteen\n"
 
 msgid "invalid group file entry"
@@ -1138,16 +1173,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: ei muutoksia\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "Käyttö: groupdel ryhmä\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "Käyttö: groupdel ryhmä\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1162,30 +1187,17 @@
 msgid " groups="
 msgstr " ryhmät="
 
-#, fuzzy
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -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 ""
-"Käyttö: lastlog [valitsimet]\n"
-"\n"
-"Valitsimet:\n"
-"  -b, --before PÄIVÄÄ        Tulosta vain PÄIVÄÄ vanhemmat lastlog-tietueet\n"
-"  -t, --time PÄIVÄÄ          Tulosta vain PÄIVÄÄ tuoreemmat lastlog-"
-"tietueet\n"
-"  -u, --login TUNNUS         Tulosta lastlog-tietue käyttäjälle TUNNUS\n"
-"  -h, --help                 Näytä tämä ohje ja lopeta\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1198,14 +1210,6 @@
 msgstr "**Ei koskaan kirjautunut sisää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"
 
@@ -1278,6 +1282,11 @@
 msgid "Login incorrect"
 msgstr "Sisäänkirjautuminen epäonnistui"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: rivi %d: käyttäjää %s ei löydy\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1401,81 +1410,59 @@
 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"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Käyttö: passwd [valitsimet] [TUNNUS]\n"
-"\n"
-"Valitsimet:\n"
-"  -a, --all                     Ilmoita jokaisen tunnuksen salasanatilanne\n"
-"  -d, --delete                  Poista annetun tunnuksen salasana\n"
-"  -e, --expire                  Aseta annetun tunnuksen salasana\n"
-"                                vanhentuneeksi\n"
-"  -h, --help                    Näytä tämä ohje ja lopeta\n"
-"  -k, --keep-tokens             Vaihda vain vanhentunut salasana\n"
-"  -i, --inactive POISKÄYTÖSTÄ   Ota salasana pois käytöstä POISKÄYTÖSTÄ\n"
-"                                päivää vanhenemisen jälkeen\n"
-"  -l, --lock                    Lukitse annettu tunnus\n"
-"  -n, --mindays VÄH_PÄIVÄ       Aseta vähin määrä päiviä ennen kuin\n"
-"                                salasanan voi vaihtaa VÄH_PÄIVÄksi\n"
-"  -q, --quiet                   Hiljainen toiminta\n"
-"  -r, --repository TIETOLÄHDE   Vaihda salasana tietolähteessä TIETOLÄHDE\n"
-"  -S, --status                  Ilmoita annetun tunnuksen salasanan tila\n"
-"  -u, --unlock                  Avaa annetun tunnuksen lukitus\n"
-"  -w, --warndays VAR_PÄIVÄÄ     Aseta varoituspäiviksi VAR_PÄIVÄÄ ennen\n"
-"                                vanhentumista\n"
-"  -x, --maxdays KORK_PÄIVÄ      Aseta korkein määrä päivä ennen kuin\n"
-"                                salasana täytyy vaihtaa KORK_PÄIVÄksi\n"
-"\n"
 
 msgid "Old password: "
 msgstr "Vanha salasana: "
@@ -1558,19 +1545,24 @@
 msgstr "Salasanan vanhenemisvaroitus"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Käyttö: %s [-q] [-r] [-s] [passwd [varjo]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "Käyttö: %s [syöte]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Käyttö: %s [-q] [-r] [-s] [passwd [varjo]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: valitsimet -s ja -r eivät sovi yhteen\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Käyttö: %s [syöte]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1653,11 +1645,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: tiedostoa %s ei voi lukita\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "Käyttö: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1667,11 +1654,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "Käyttö: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Tunnuksen vaihtaminen täksi käyttäjäksi EVÄTTY.\n"
 
@@ -1737,32 +1719,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: täytyy suorittaa päätteessä\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ohitettu)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: virhe %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Tuntematon id: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Sinulla ei ole lupaa asettua käyttäjäksi %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(Syötä oma salasanasi)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ohitettu)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1773,9 +1743,29 @@
 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"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Ei salasanatietuetta pääkäyttäjälle (\"root\")"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: täytyy suorittaa päätteessä\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: virhe %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: hakemistoa %s ei voi uudelleennimetä hakemistoksi %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Ei voi suorittaa %s"
+
 msgid "No password file"
 msgstr "Ei salasanatiedosto"
 
@@ -1821,7 +1811,7 @@
 # Kannattaako tuota kääntää, siinä viitataan rename()-funktioon...
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: rename: %s"
 
 #, c-format
@@ -1836,6 +1826,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "Käyttö: %s [syöte]\n"
@@ -1953,10 +1945,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -2022,27 +2010,24 @@
 "%s: varoitus: kotihakemisto on jo olemassa.\n"
 "Ei kopioida yhtään tiedostoa sinne skel-hakemistosta.\n"
 
-#, fuzzy
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Käyttö: userdel [valitsimet] TUNNUS\n"
-"\n"
-"Valitsimet:\n"
-"  -f, --force                   Pakota tiedostojen poisto vaikkei niitä\n"
-"                                omistaisikaan käyttäjä\n"
-"  -h, --help                    Näytä tämä ohje ja poistu\n"
-"  -r, --remove                  Poista kotihakemistoja ja postilaatikko\n"
-"\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: ei voi vaihtaa käyttäjää \"%s\" NIS-asiakkaalla.\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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"
@@ -2051,6 +2036,11 @@
 "ryhmä.\n"
 
 #, fuzzy, c-format
+#| msgid "%s: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: virheellinen kotihakemisto \"%s\"\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: varoitus: ei voi poistaa tiedostoa "
@@ -2082,10 +2072,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: käyttäjä %s on NIS-käyttäjä\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: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2100,61 +2086,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: virhe poistettaessa hakemistoa %s\n"
 
-#, fuzzy, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Käyttö: usermod [valitsimet] TUNNUS\n"
-"\n"
-"Valitsimet:\n"
-"  -a, --append RYHMÄ            Lisää käyttäjä ryhmään RYHMÄ\n"
-"                                (käytetään vain valitsimen -G kanssa)\n"
-"  -c, --comment KOMMENTTI       Aseta GECOS-kenttään uusi arvo\n"
-"  -d, --home KOTIHAK            Käyttäjätunnuksen uusi kotihakemisto\n"
-"  -e, --expiredate VANH_PVM     Aseta tilin vanhenemispäiväykseksi VANH_PVM\n"
-"  -f, --inactive POISKÄYTÖSTÄ   Ota salasana pois käytöstä POISKÄYTÖSTÄ\n"
-"                                päivää vanhenemisen jälkeen\n"
-"  -g, --gid RYHMÄ               Aseta RYHMÄ uudeksi "
-"sisäänkirjautumisryhmäksi\n"
-"  -G, --groups RYHMÄT           Luettelo lisäryhmistä\n"
-"  -h, --help                    Näytä tämä ohje ja lopeta\n"
-"  -l, --login TUNNUS            Uusi arvo tunnukseksi\n"
-"  -L, --lock                    Lukitse annettu tunnus\n"
-"  -m, --move-home               Siirrä kotihakemiston sisältö uuteen\n"
-"                                sijaintiin (käytä vain yhdessä valitsimen\n"
-"                                -d kanssa)\n"
-"  -o, --non-unique              Salli UID:n uudelleenkäyttö (ei-uniikki "
-"UID)\n"
-"  -p, --password SALASANA       Käytä salakirjoitettua salasanaa\n"
-"  -s, --shell KUORI             Käyttäjätunnuksen uusi "
-"sisäänkirjautumiskuori\n"
-"  -u, --uid UID                 Uusi UID käyttäjätunnukselle\n"
-"  -U, --unlock                  Avaa annetun tunnuksen lukitus\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2171,18 +2155,19 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: käyttäjä %s on olemassa\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: tiedostoa %s ei voi lukita\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: lippuja ei annettu\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: varjosalasanat vaaditaan valitsimille -e ja -f\n"
 
-#, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
@@ -2251,9 +2236,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2338,8 +2320,375 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: virheellinen perushakemisto \"%s\"\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) epäonnistui\n"
+
 #, fuzzy
 #~| msgid ""
+#~| "Usage: chage [options] [LOGIN]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+#~| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -l, --list                    show account aging information\n"
+#~| "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~| "password\n"
+#~| "                                change to MIN_DAYS\n"
+#~| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~| "password\n"
+#~| "                                change to MAX_DAYS\n"
+#~| "  -W, --warndays WARN_DAYS      set expiration warning days to "
+#~| "WARN_DAYS\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Käyttö: chage [valitsimet] [TUNNUS]\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+#~ "  -d, --lastday VIIM_PVM        Aseta edelliseksi salasanan "
+#~ "vaihtopäiväksi\n"
+#~ "                                VIIM_PVM\n"
+#~ "  -E, --expiredate VANH_PVM     Aseta tilin vanhenemispäiväykseksi "
+#~ "VANH_PVM\n"
+#~ "  -h, --help                    Näytä tämä ohje ja lopeta\n"
+#~ "  -I, --inactive POISKÄYTÖSTÄ   Ota salasana pois käytöstä POISKÄYTÖSTÄ\n"
+#~ "                                päivää vanhenemisen jälkeen\n"
+#~ "  -l, --list                    Näytä tilin vanhenemistiedot\n"
+#~ "  -m, --mindays MIN_PÄIVIÄ      Aseta pienimmäksi sallittuksi määräksi\n"
+#~ "                                päiviä ennen salasanan vaihtamista "
+#~ "MIN_PÄIVIÄ\n"
+#~ "  -M, --maxdays MAX_PÄIVIÄ      Aseta suurimmaksi sallituksi määräksi "
+#~ "päiviä\n"
+#~ "                                ennen salasanan vaihtamista MAX_PÄIVIÄ\n"
+#~ "  -W, --warndays VAR_PÄIVIÄ     Aseta vanhenemisen varoitusajaksi "
+#~ "VAR_PÄIVIÄ\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM-todennus epäonnistui\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Käyttö: %s [-f koko_nimi] [-r huonenro] [-w työpuh]\n"
+#~ "\t[-h kotipuh] [-o muu] [käyttäjä]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr "Käyttö: %s [-f koko_nimi] [-r huonenro] [-w työpuh] [-h kotipuh]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Käyttö: chpasswd [valitsimet]\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+#~ "  -e, --encrypted               Annetut salasanat ovat salakirjoitettuja\n"
+#~ "  -h, --help                    Näytä tämä ohje ja lopeta\n"
+#~ "  -m, --md5                     Käytä MD5:tä eikä DES:iä kun annetut\n"
+#~ "                                salasanat eivät ole salakirjoitettuja\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Käyttö: chsh [valitsimet] [TUNNUS]\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+#~ "  -h, --help                    Näytä tämä ohje ja poistu\n"
+#~ "  -s, --shell KUORI             Aseta uusi sisäänkirjautumiskuori "
+#~ "käyttäjälle\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Käyttö: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: tiedostoa %s ei voi lukita\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Käyttö: groupdel ryhmä\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Käyttö: %s [-r] [-s] [ryhmä [ryhmävarjo]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Käyttö: %s [-r] [-s] [ryhmä]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: valitsimet -s ja -r eivät sovi yhteen\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Käyttö: groupdel ryhmä\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Käyttö: groupdel ryhmä\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Käyttö: lastlog [valitsimet]\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+#~ "  -b, --before PÄIVÄÄ        Tulosta vain PÄIVÄÄ vanhemmat lastlog-"
+#~ "tietueet\n"
+#~ "  -t, --time PÄIVÄÄ          Tulosta vain PÄIVÄÄ tuoreemmat lastlog-"
+#~ "tietueet\n"
+#~ "  -u, --login TUNNUS         Tulosta lastlog-tietue käyttäjälle TUNNUS\n"
+#~ "  -h, --help                 Näytä tämä ohje ja lopeta\n"
+#~ "\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Käyttö: passwd [valitsimet] [TUNNUS]\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+#~ "  -a, --all                     Ilmoita jokaisen tunnuksen "
+#~ "salasanatilanne\n"
+#~ "  -d, --delete                  Poista annetun tunnuksen salasana\n"
+#~ "  -e, --expire                  Aseta annetun tunnuksen salasana\n"
+#~ "                                vanhentuneeksi\n"
+#~ "  -h, --help                    Näytä tämä ohje ja lopeta\n"
+#~ "  -k, --keep-tokens             Vaihda vain vanhentunut salasana\n"
+#~ "  -i, --inactive POISKÄYTÖSTÄ   Ota salasana pois käytöstä POISKÄYTÖSTÄ\n"
+#~ "                                päivää vanhenemisen jälkeen\n"
+#~ "  -l, --lock                    Lukitse annettu tunnus\n"
+#~ "  -n, --mindays VÄH_PÄIVÄ       Aseta vähin määrä päiviä ennen kuin\n"
+#~ "                                salasanan voi vaihtaa VÄH_PÄIVÄksi\n"
+#~ "  -q, --quiet                   Hiljainen toiminta\n"
+#~ "  -r, --repository TIETOLÄHDE   Vaihda salasana tietolähteessä "
+#~ "TIETOLÄHDE\n"
+#~ "  -S, --status                  Ilmoita annetun tunnuksen salasanan tila\n"
+#~ "  -u, --unlock                  Avaa annetun tunnuksen lukitus\n"
+#~ "  -w, --warndays VAR_PÄIVÄÄ     Aseta varoituspäiviksi VAR_PÄIVÄÄ ennen\n"
+#~ "                                vanhentumista\n"
+#~ "  -x, --maxdays KORK_PÄIVÄ      Aseta korkein määrä päivä ennen kuin\n"
+#~ "                                salasana täytyy vaihtaa KORK_PÄIVÄksi\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Käyttö: %s [-q] [-r] [-s] [passwd [varjo]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Käyttö: %s [-q] [-r] [-s] [passwd [varjo]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Käyttö: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Käyttö: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Tuntematon id: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Ei kuorta\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Käyttö: userdel [valitsimet] TUNNUS\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+#~ "  -f, --force                   Pakota tiedostojen poisto vaikkei niitä\n"
+#~ "                                omistaisikaan käyttäjä\n"
+#~ "  -h, --help                    Näytä tämä ohje ja poistu\n"
+#~ "  -r, --remove                  Poista kotihakemistoja ja postilaatikko\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: käyttäjä %s on nyt sisäänkirjautuneena\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Käyttö: usermod [valitsimet] TUNNUS\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+#~ "  -a, --append RYHMÄ            Lisää käyttäjä ryhmään RYHMÄ\n"
+#~ "                                (käytetään vain valitsimen -G kanssa)\n"
+#~ "  -c, --comment KOMMENTTI       Aseta GECOS-kenttään uusi arvo\n"
+#~ "  -d, --home KOTIHAK            Käyttäjätunnuksen uusi kotihakemisto\n"
+#~ "  -e, --expiredate VANH_PVM     Aseta tilin vanhenemispäiväykseksi "
+#~ "VANH_PVM\n"
+#~ "  -f, --inactive POISKÄYTÖSTÄ   Ota salasana pois käytöstä POISKÄYTÖSTÄ\n"
+#~ "                                päivää vanhenemisen jälkeen\n"
+#~ "  -g, --gid RYHMÄ               Aseta RYHMÄ uudeksi "
+#~ "sisäänkirjautumisryhmäksi\n"
+#~ "  -G, --groups RYHMÄT           Luettelo lisäryhmistä\n"
+#~ "  -h, --help                    Näytä tämä ohje ja lopeta\n"
+#~ "  -l, --login TUNNUS            Uusi arvo tunnukseksi\n"
+#~ "  -L, --lock                    Lukitse annettu tunnus\n"
+#~ "  -m, --move-home               Siirrä kotihakemiston sisältö uuteen\n"
+#~ "                                sijaintiin (käytä vain yhdessä "
+#~ "valitsimen\n"
+#~ "                                -d kanssa)\n"
+#~ "  -o, --non-unique              Salli UID:n uudelleenkäyttö (ei-uniikki "
+#~ "UID)\n"
+#~ "  -p, --password SALASANA       Käytä salakirjoitettua salasanaa\n"
+#~ "  -s, --shell KUORI             Käyttäjätunnuksen uusi "
+#~ "sisäänkirjautumiskuori\n"
+#~ "  -u, --uid UID                 Uusi UID käyttäjätunnukselle\n"
+#~ "  -U, --unlock                  Avaa annetun tunnuksen lukitus\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: lippuja ei annettu\n"
+
+#, fuzzy
+#~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
 #~| "Options:\n"
@@ -2871,9 +3220,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/fr.po
===================================================================
--- upstream/trunk/po/fr.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/fr.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2011-04-06 00:03+0200\n"
 "Last-Translator: Thomas Blein <tblein at tblein.eu>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -50,6 +50,14 @@
 "erreur de configuration - élément « %s » inconnu (avertissez "
 "l'administrateur)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Mot de passe : "
 
@@ -228,6 +236,11 @@
 "%s : configuration non valable : SYS_GID_MIN (%lu), GID_MIN (%lu), "
 "SYS_GID_MAX (%lu)\n"
 
+#, fuzzy, c-format
+#| msgid "failed to allocate memory"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "impossible d'allouer la mémoire"
+
 # , c-format
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
@@ -322,6 +335,33 @@
 msgstr "Mot de passe incorrect pour %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s : échec lors de l'abandon des privilèges (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s : téléphone personnel non valable : « %s »\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot create directory %s: %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s : impossible de créer le répertoire %s : %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Failed to create tcb directory for %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s : impossible de créer le répertoire tcb pour %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -351,51 +391,87 @@
 msgid "Unable to determine your tty name."
 msgstr "Impossible de déterminer le nom de votre tty."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "échec de malloc(%d)\n"
-
 msgid "No"
 msgstr "Non"
 
-#
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"Utilisation : %s [options] LOGIN\n"
+"\n"
+"Options :\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -e, --expiredate DATE_EXPIR   fixer la date de fin de validité du\n"
+"                                compte à DATE_EXPIR\n"
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    afficher ce message d'aide et quitter\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -p, --password MOT_DE_PASSE   remplacer le mot de passe par le mot de\n"
+"                                passe chiffré MOT_DE_PASSE\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+"  -r, --reset                   réinitialiser les compteurs d'échecs de "
+"connexion\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              nombre de passes SHA pour les algorithmes \n"
+"                                de chiffrement SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              nombre de passes SHA pour les algorithmes \n"
+"                                de chiffrement SHA*\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+"  -d, --home-dir REP_PERS       répertoire personnel pour le compte du\n"
+"                                nouvel utilisateur\n"
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Syntaxe : chage [options] [IDENTIFIANT]\n"
-"\n"
-"Options :\n"
-"  -d, --lastday DERNIER_JOUR    fixer la dernière modification du mot de\n"
-"                                passe à DERNIER_JOUR\n"
-"  -E, --expiredate FIN_VALIDITÉ fixer la date de fin de validité du compte\n"
-"                                à FIN_VALIDITÉ\n"
-"  -h, --help                    afficher ce message d'aide et quitter\n"
-"  -I, --inactive INACTIF        fixer la durée d'inactivité du mot de\n"
-"                                passe après sa fin de validité à INACTIF\n"
-"  -l, --list                    afficher les informations concernant la\n"
-"                                validité du compte au cours du temps\n"
-"  -m, --mindays JOURS_MIN       fixer le nombre minimum de jours avant la\n"
-"                                modification du mot de passe à JOURS_MIN\n"
-"  -M, --maxdays JOURS_MAX       fixer le nombre maximum de jours avant la\n"
-"                                modification du mot de passe à JOURS_MAX\n"
-"  -W, --warndays JOURS_AVERT    fixer le nombre de jours d'avertissement\n"
-"                                de fin de validité à JOURS_AVERT\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr ""
@@ -473,9 +549,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s : %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -498,10 +575,6 @@
 msgstr "%s : le fichier des mots de passe cachés /etc/shadow n'existe pas\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s : échec lors de l'abandon des privilèges (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s : l'utilisateur « %s » n'existe pas dans %s\n"
 
@@ -513,20 +586,41 @@
 msgid "%s: error changing fields\n"
 msgstr "%s : erreur lors de la modification des champs\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Syntaxe : %s [-f nom_complet] [-r num_bureau] [-w tel_bureau]\n"
-"\t[-h tel_perso] [-o autre] [utilisateur]\n"
+"Utilisation : %s [options] LOGIN\n"
+"\n"
+"Options :\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Syntaxe : %s [-f nom_complet] [-r num_bureau] [-w tel_bureau] [-h "
-"tel_maison]\n"
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    afficher ce message d'aide et quitter\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Nom complet"
 
@@ -606,23 +700,27 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"Utilisation : %s [options]\n"
+"\n"
+"Options:\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+"  -c, --crypt-method <METHODE>  méthode de chiffrement\n"
+"                               (parmi %s)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+"  -e, --encrypted               les mots de passe fournis sont chiffrés\n"
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Syntaxe : %s [options]\n"
-"\n"
-"Options :\n"
-"  -c, --crypt-method            méthode de chiffrement\n"
-"                                (parmi %s)\n"
-"  -e, --encrypted               les mots de passe fournis sont chiffrés\n"
-"  -h, --help                    afficher ce message d'aide et quitter\n"
 "  -m, --md5                     utiliser le chiffrement MD5 pour les mots\n"
 "                                de passe\n"
-"%s\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -664,37 +762,6 @@
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s : erreur détectée ; modifications ignorées\n"
 
-#, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Utilisation : %s [options]\n"
-"\n"
-"Options:\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-"  -c, --crypt-method <METHODE>  méthode de chiffrement\n"
-"                               (parmi %s)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-"  -e, --encrypted               les mots de passe fournis sont chiffrés\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-"  -h, --help                    afficher ce message d'aide et quitter\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -m, --md5                     utiliser le chiffrement MD5 pour les mots\n"
-"                                de passe\n"
-
 # , c-format
 #, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
@@ -704,21 +771,12 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s : ligne %d : l'utilisateur « %s » n'existe pas\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+#, fuzzy
+#| msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Syntaxe : chsh [options] [IDENTIFIANT]\n"
-"\n"
-"Options :\n"
-"  -h, --help                    afficher cette page d'aide et quitter\n"
-"  -s, --shell INTERPRÉTEUR      nouvel interpréteur de commandes initial\n"
-"                                pour le compte de l'utilisateur\n"
-"\n"
+"  -s, --shell INTERPRÉTEUR      interpréteur de commandes initial pour le\n"
+"                                compte du nouvel utilisateur\n"
 
 msgid "Login Shell"
 msgstr "Interpréteur de commandes initial"
@@ -747,9 +805,34 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s : attention : %s n'est pas exécutable\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Syntaxe : expiry {-f|-c}\n"
+#, fuzzy
+#| msgid ""
+#| "  -u, --user                    which user's tcb shadow file to edit\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
+"  -u, --user                 quel fichier tcb shadow utilisateur éditer\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -m, --md5                     utiliser le chiffrement MD5 pour les mots\n"
+"                                de passe\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s : les options %s et %s sont en conflit\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog : paramètre inattendu : %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 "  -a, --all                     afficher les enregistrements d'échec "
@@ -796,10 +879,11 @@
 "plage                                 d'identifiants PLAGE\n"
 
 # , c-format
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
 msgstr ""
-"failog : impossible d'obtenir l'entrée pour l'identifiant d'utilisateur "
+"lastlog : échec de l'obtention de l'entrée pour l'identifiant d'utilisateur "
 "(UID) %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
@@ -814,38 +898,39 @@
 msgstr " [%lds verrou]"
 
 # , c-format
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr ""
 "faillog : impossible de réinitialiser le compteur d'échecs de l'identifiant "
 "d'utilisateur (UID) %lu\n"
 
 # , c-format
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr ""
 "faillog : impossible de définir la valeur maximum pour l'identifiant "
 "d'utilisateur (UID) %lu\n"
 
 # , c-format
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr ""
 "faillog : échec de positionnement de locktime pour l'identifiant "
 "d'utilisateur %lu\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog : utilisateur inconnu ou plage inconnue : %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "failog : impossible d'ouvrir le %s : %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog : impossible d'obtenir la taille de %s : %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog : impossible d'obtenir la taille de %s : %s\n"
-
 # , c-format
 #, c-format
 msgid ""
@@ -863,6 +948,13 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete UTILISATEUR   supprimer UTILISATEUR du groupe GROUPE\n"
 
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+"  -d, --home-dir REP_PERS       répertoire personnel pour le compte du\n"
+"                                nouvel utilisateur\n"
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 "  -r, --remove-password        supprimer le mot de passe du groupe GROUPE\n"
@@ -1011,8 +1103,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s : l'identifiant de groupe (GID) « %lu » existe déjà\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Syntaxe : groupdel groupe\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s : Impossible de déterminer votre nom d'utilisateur.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1125,16 +1219,53 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s : utilisateur %s inconnu\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Syntaxe : %s [-r] [-s] [groupe [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Utilisation : %s [options] [action]\n"
+"\n"
+"Options :\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Syntaxe : %s [-r] [-s] [groupe]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Utilisation : %s [options] [action]\n"
+"\n"
+"Options :\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"  -s, --sha-rounds              nombre de passes SHA pour les algorithmes \n"
+"                                de chiffrement SHA*\n"
+
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -l, --list                    lister les membres du groupe\n"
+
+# , c-format
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s : -s et -r sont incompatibles\n"
 
 msgid "invalid group file entry"
@@ -1205,14 +1336,6 @@
 msgid "%s: no changes\n"
 msgstr "%s : aucun changement\n"
 
-#
-msgid "Usage: grpconv\n"
-msgstr "Syntaxe : grpconv\n"
-
-#
-msgid "Usage: grpunconv\n"
-msgstr "Syntaxe : grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s : impossible de supprimer %s\n"
@@ -1226,35 +1349,32 @@
 msgid " groups="
 msgstr " groupes="
 
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -t, --time DAYS               afficher les enregistrements d'échecs de "
+"connexion\n"
+"                                plus récents que DAYS jours\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Syntaxe : lastlog [options]\n"
-"\n"
-"Options :\n"
-"   b, --before JOURS            n'afficher que les enregistrements de\n"
-"                                « lastlog » plus anciens que JOURS\n"
-"  -h, --help                    afficher ce message d'aide et quitter\n"
-"  -t, --time NB_JOURS           afficher uniquement les enregistrements de\n"
-"                                « lastlog » plus récents que NB_JOURS jours\n"
-"  -u, --user LOGIN              afficher l'enregistrement « lastlog » pour\n"
-"                                l'utilisateur dont le compte est LOGIN\n"
-"\n"
+"  -t, --time DAYS               afficher les enregistrements d'échecs de "
+"connexion\n"
+"                                plus récents que DAYS jours\n"
 
-# , c-format
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
-"lastlog : échec de l'obtention de l'entrée pour l'identifiant d'utilisateur "
-"(UID) %lu\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "Utilisateur      Port     Venant de        Dernière"
@@ -1266,14 +1386,6 @@
 msgstr "**Jamais connecté**"
 
 #, 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 "lastlog : impossible d'obtenir la taille de %s : %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Syntaxe : %s [-p] [nom]\n"
 
@@ -1349,6 +1461,13 @@
 msgid "Login incorrect"
 msgstr "Identifiant de connexion incorrect"
 
+#, fuzzy, c-format
+#| msgid "%s: Cannot fork user shell\n"
+msgid "Cannot find user (%s)\n"
+msgstr ""
+"%s : Impossible de cloner (« fork ») l'interpréteur de commandes de "
+"l'utilisateur\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1474,56 +1593,102 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s : ligne %d : impossible de mettre l'entrée à jour\n"
 
-#
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+"  -a, --all                     afficher les enregistrements d'échec "
+"(« faillog »)\n"
+"                                pour tous les utilisateurs\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system                  créer un compte système\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system                  créer un compte système\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+"  -e, --encrypted               les mots de passe fournis sont chiffrés\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -p, --password MOT_DE_PASSE   remplacer le mot de passe par le mot de\n"
+"                                passe chiffré MOT_DE_PASSE\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+"  -u, --uid UID                 forcer l'utilisation de l'identifiant\n"
+"                                « UID » pour le compte du nouvel "
+"utilisateur\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds              nombre de passes SHA pour les algorithmes \n"
+"                                de chiffrement SHA*\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr "  -q, --quiet                 mode silencieux\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system                  créer un compte système\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+"  -u, --uid UID                 forcer l'utilisation de l'identifiant\n"
+"                                « UID » pour le compte du nouvel "
+"utilisateur\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Syntaxe : passwd [options] [IDENTIFIANT]\n"
-"\n"
-"Options :\n"
-"  -a, --all                     afficher l'état des mots de passe de tous\n"
-"                                les comptes\n"
-"  -d, --delete                  supprimer le mot de passe du compte indiqué\n"
-"  -e, --expire                  forcer la fin de validité du compte indiqué\n"
-"  -h, --help                    afficher ce message d'aide et quitter\n"
-"  -k, --keep-tokens             ne changer le mot de passe que s'il\n"
-"                                est arrivé en fin de validité\n"
-"  -i, --inactive INACTIF        fixer la durée d'inactivation du mot de\n"
-"                                passe après sa fin de validité à INACTIF\n"
-"  -l, --lock                    bloquer le compte indiqué\n"
-"  -n, --mindays JOURS_MIN       fixer le nombre minimum de jours avant le\n"
-"                                changement de mot de passe à JOURS_MIN\n"
-"  -q, --quiet                   mode silencieux\n"
-"  -r, --repository DÉPÔT        changer le mot de passe dans le dépôt DÉPÔT\n"
-"  -S, --status                  afficher l'état du mot de passe du compte\n"
-"                                indiqué\n"
-"  -u, --unlock                  déverrouiller le compte indiqué\n"
-"  -w, --warndays JOURS_AVERT    fixer le nombre de jours d'avertissement\n"
-"                                de fin de validité à JOURS_AVERT\n"
-"  -x, --maxdays JOURS_MAX       fixer le nombre maximum de jours avant le\n"
-"                                changement de mot de passe à JOURS_MAX\n"
-"\n"
+"  -s, --sha-rounds              nombre de passes SHA pour les algorithmes \n"
+"                                de chiffrement SHA*\n"
 
 msgid "Old password: "
 msgstr "Ancien mot de passe : "
@@ -1613,18 +1778,38 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s : expiration du mot de passe modifiée.\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Syntaxe : %s [-q] [-r] [passwd]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Utilisation : %s [options] [action]\n"
+"\n"
+"Options :\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Syntaxe : %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Utilisation : %s [options] [action]\n"
+"\n"
+"Options :\n"
 
-# , c-format
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s : -s et -r sont incompatibles\n"
+#, fuzzy
+#| msgid "  -q, --quiet                   quiet mode\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr "  -q, --quiet                 mode silencieux\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1703,10 +1888,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s : impossible de trier les entrées de %s\n"
 
-#
-msgid "Usage: pwconv\n"
-msgstr "Syntaxe : pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s : impossible de travailler avec tcb activé\n"
@@ -1715,10 +1896,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s : impossible de changer le mode de %s en 0600\n"
 
-#
-msgid "Usage: pwunconv\n"
-msgstr "Syntaxe : pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Accès à « su » à partir de ce compte REFUSÉ.\n"
 
@@ -1789,18 +1966,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s : doit être lancé à partir d'un terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s : %s\n"
+"(Ignoré)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s : pam_start : erreur %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "identifiant inconnu : %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Vous n'êtes pas autorisé à utiliser « su » %s\n"
 
@@ -1808,14 +1981,6 @@
 msgstr "(Entrez votre propre mot de passe)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s : %s\n"
-"(Ignoré)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s : échec de l'authentification\n"
 
@@ -1823,9 +1988,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s : vous n'êtes pas autorisé à utiliser « su » cet instant\n"
 
-msgid "No shell\n"
-msgstr "Pas d'interpréteur de commandes\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Pas de mot de passe pour « root »"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s : doit être lancé à partir d'un terminal\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s : pam_start : erreur %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot remove the content of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s : impossible de supprimer le contenu de %s : %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Impossible d'exécuter %s"
+
 msgid "No password file"
 msgstr "Pas de fichier des mots de passe"
 
@@ -1870,8 +2055,9 @@
 msgstr "%s : ligne trop longue dans %s : %s…"
 
 # , c-format
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s : renomme : %s : %s"
 
 #, c-format
@@ -1882,9 +2068,15 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s : trop de groupes spécifiés (max %d).\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -2043,10 +2235,6 @@
 msgstr "%s : -Z nécessite un noyau avec l'option SELinux active\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s : les options %s et %s sont en conflit\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 "%s : impossible de réinitialiser l'entrée faillog de l'identifiant "
@@ -2115,32 +2303,50 @@
 "%s : attention, le répertoire personnel existe déjà.\n"
 "Aucun fichier du répertoire « skels » n'y sera copié.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -f, --force                   exit successfully if the group already "
+#| "exists,\n"
+#| "                                and cancel -g if the GID is already used\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Syntaxe : userdel [options] IDENTIFIANT\n"
-"\n"
-"Options :\n"
-"  -f, --force                   forcer la suppression des fichiers, même\n"
-"                                s'ils n'appartiennent pas à l'utilisateur\n"
-"  -h, --help                    afficher cette page d'aide et quitter\n"
-"  -r, --remove                  supprimer le répertoire personnel et le\n"
-"                                spool du courrier\n"
-"\n"
+"  -f, --force                   terminer avec succès si le groupe existe "
+"déjà\n"
+"                                ou interrompre -g si le GID est déjà "
+"utilisé\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+"  -r, --reset                   réinitialiser les compteurs d'échecs de "
+"connexion\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr ""
+"%s : impossible de supprimer le groupe primaire de l'utilisateur « %s »\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s : le groupe %s est le groupe primaire d'un autre utilisateur et il ne "
 "sera pas supprimé.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s : le répertoire personnel de %s (%s) n'a pas été trouvé\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s : attention : impossible de supprimer %s : %s\n"
@@ -2172,10 +2378,6 @@
 msgstr "%s : le compte %s est un compte NIS\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s : l'utilisateur %s est connecté\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s : le répertoire personnel de %s (%s) n'a pas été trouvé\n"
 
@@ -2189,69 +2391,121 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s : erreur lors de l'effacement du répertoire %s\n"
 
-#, c-format
+#, fuzzy
+#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+"  -c, --comment COMMENTAIRE     définir le champ « GECOS » du compte du\n"
+"                                nouvel utilisateur\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+"  -d, --home-dir REP_PERS       répertoire personnel pour le compte du\n"
+"                                nouvel utilisateur\n"
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+"  -e, --expiredate DATE_EXPIR   fixer la date de fin de validité du\n"
+"                                compte à DATE_EXPIR\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -p, --password MOT_DE_PASSE   remplacer le mot de passe par le mot de\n"
+"                                passe chiffré MOT_DE_PASSE\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+"  -g, --gid GID                 utiliser cet identifiant (GID) pour le "
+"nouveau groupe\n"
+
+#, fuzzy
+#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -M, --members UTILISATEUR,…\n"
+"                                définir la liste des membres du groupe "
+"GROUPE\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+"  -u, --uid UID                 forcer l'utilisation de l'identifiant\n"
+"                                « UID » pour le compte du nouvel "
+"utilisateur\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
+#| "the\n"
+#| "                                new account\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -b, --base-dir REP_BASE       répertoire de base pour le répertoire "
+"personnel\n"
+"                                du compte du nouvel utilisateur\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
+#| "GID\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -o, --non-unique              utiliser un identifiant de groupe déjà\n"
+"                                utilisé\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       use this encrypted password for the new "
+#| "group\n"
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Syntaxe : usermod [options] IDENTIFIANT\n"
-"\n"
-"Options :\n"
-"  -c, --comment COMMENT         définir une nouvelle valeur pour le champ\n"
-"                                « GECOS »\n"
-"  -d, --home REP_PERS           définir un nouveau répertoire personnel\n"
-"                                pour le compte de l'utilisateur\n"
-"  -e, --expiredate DATE_EXPIR   fixer la date de fin de validité du compte\n"
-"                                à DATE_EXPIR\n"
-"  -f, --inactive INACTIF        fixer la durée d'inactivité du mot de passe\n"
-"                                après sa fin de validité à INACTIF\n"
-"  -g, --gid GROUPE              forcer l'utilisation de GROUPE comme\n"
-"                                 nouveau groupe primaire\n"
-"  -G, --groups GROUPES          définir une nouvelle liste de groupes\n"
-"                                supplémentaires\n"
-"  -a, --append                  ajouter l'utilisateur aux GROUPES\n"
-"                                supplémentaires mentionnés par l'option -G\n"
-"                                sans supprimer l 'utilisateur des autres\n"
-"                                groupes\n"
-"  -h, --help                    afficher ce message d'aide et quitter\n"
-"  -l, --login IDENTIFIANT       définir un nouveau nom pour le compte\n"
-"  -L, --lock                    bloquer le compte de l'utilisateur\n"
-"  -m, --move-home               déplacer le contenu du répertoire personnel\n"
-"                                vers le nouvel emplacement (à n'utiliser\n"
-"                                qu'avec -d)\n"
-"  -o, --non-unique              autoriser l'utilisation d'un identifiant\n"
-"                                d'utilisateur (UID) dupliqué (non unique)\n"
-"  -p, --password MOT_DE_PASSE   utiliser un mot de passe chiffré pour le\n"
-"                                nouveau mot de passe\n"
-"  -s, --shell INTERPRÉTEUR      définir un nouvel interpréteur de commandes\n"
-"                                initial pour le compte de l'utilisateur\n"
-"  -u, --uid UID                 définir un nouvel identifiant (UID) pour le\n"
-"                                compte de l'utilisateur\n"
-"  -U, --unlock                  déverrouiller le compte de l'utilisateur\n"
-"%s\n"
+"  -p, --password MOT_DE_PASSE   utiliser ce mot de passe chiffré pour le "
+"nouveau groupe\n"
 
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+"  -u, --uid UID                 forcer l'utilisation de l'identifiant\n"
+"                                « UID » pour le compte du nouvel "
+"utilisateur\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+"  -u, --uid UID                 forcer l'utilisation de l'identifiant\n"
+"                                « UID » pour le compte du nouvel "
+"utilisateur\n"
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2273,19 +2527,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s : l'utilisateur « %s » existe déjà dans %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s : impossible d'ouvrir %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s : aucun indicateur n'a été précisé\n"
+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: shadow passwords required for -e and -f\n"
 msgstr "%s : les mots de passe cachés sont nécessaires avec -e ou -f\n"
 
 #, c-format
-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' already exists\n"
 msgstr "%s : l'identifiant d'utilisateur (UID) « %lu » existe déjà\n"
 
@@ -2361,9 +2616,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -p, --passwd                  édition de la base de données passwd\n"
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -q, --quiet                 mode silencieux\n"
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -s, --shadow                     édition des bases de données shadow ou "
@@ -2427,6 +2679,355 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s : impossible de trouver le répertoire tcb pour %s\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "échec de malloc(%d)\n"
+
+#
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Syntaxe : chage [options] [IDENTIFIANT]\n"
+#~ "\n"
+#~ "Options :\n"
+#~ "  -d, --lastday DERNIER_JOUR    fixer la dernière modification du mot de\n"
+#~ "                                passe à DERNIER_JOUR\n"
+#~ "  -E, --expiredate FIN_VALIDITÉ fixer la date de fin de validité du "
+#~ "compte\n"
+#~ "                                à FIN_VALIDITÉ\n"
+#~ "  -h, --help                    afficher ce message d'aide et quitter\n"
+#~ "  -I, --inactive INACTIF        fixer la durée d'inactivité du mot de\n"
+#~ "                                passe après sa fin de validité à INACTIF\n"
+#~ "  -l, --list                    afficher les informations concernant la\n"
+#~ "                                validité du compte au cours du temps\n"
+#~ "  -m, --mindays JOURS_MIN       fixer le nombre minimum de jours avant "
+#~ "la\n"
+#~ "                                modification du mot de passe à JOURS_MIN\n"
+#~ "  -M, --maxdays JOURS_MAX       fixer le nombre maximum de jours avant "
+#~ "la\n"
+#~ "                                modification du mot de passe à JOURS_MAX\n"
+#~ "  -W, --warndays JOURS_AVERT    fixer le nombre de jours d'avertissement\n"
+#~ "                                de fin de validité à JOURS_AVERT\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s : échec de la méthode d'authentification PAM\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Syntaxe : %s [-f nom_complet] [-r num_bureau] [-w tel_bureau]\n"
+#~ "\t[-h tel_perso] [-o autre] [utilisateur]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Syntaxe : %s [-f nom_complet] [-r num_bureau] [-w tel_bureau] [-h "
+#~ "tel_maison]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Syntaxe : %s [options]\n"
+#~ "\n"
+#~ "Options :\n"
+#~ "  -c, --crypt-method            méthode de chiffrement\n"
+#~ "                                (parmi %s)\n"
+#~ "  -e, --encrypted               les mots de passe fournis sont chiffrés\n"
+#~ "  -h, --help                    afficher ce message d'aide et quitter\n"
+#~ "  -m, --md5                     utiliser le chiffrement MD5 pour les "
+#~ "mots\n"
+#~ "                                de passe\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Syntaxe : chsh [options] [IDENTIFIANT]\n"
+#~ "\n"
+#~ "Options :\n"
+#~ "  -h, --help                    afficher cette page d'aide et quitter\n"
+#~ "  -s, --shell INTERPRÉTEUR      nouvel interpréteur de commandes initial\n"
+#~ "                                pour le compte de l'utilisateur\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Syntaxe : expiry {-f|-c}\n"
+
+# , c-format
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr ""
+#~ "failog : impossible d'obtenir l'entrée pour l'identifiant d'utilisateur "
+#~ "(UID) %lu\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "failog : impossible d'ouvrir le %s : %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog : impossible d'obtenir la taille de %s : %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Syntaxe : groupdel groupe\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Syntaxe : %s [-r] [-s] [groupe [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Syntaxe : %s [-r] [-s] [groupe]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s : -s et -r sont incompatibles\n"
+
+#
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Syntaxe : grpconv\n"
+
+#
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Syntaxe : grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Syntaxe : lastlog [options]\n"
+#~ "\n"
+#~ "Options :\n"
+#~ "   b, --before JOURS            n'afficher que les enregistrements de\n"
+#~ "                                « lastlog » plus anciens que JOURS\n"
+#~ "  -h, --help                    afficher ce message d'aide et quitter\n"
+#~ "  -t, --time NB_JOURS           afficher uniquement les enregistrements "
+#~ "de\n"
+#~ "                                « lastlog » plus récents que NB_JOURS "
+#~ "jours\n"
+#~ "  -u, --user LOGIN              afficher l'enregistrement « lastlog » "
+#~ "pour\n"
+#~ "                                l'utilisateur dont le compte est LOGIN\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Syntaxe : passwd [options] [IDENTIFIANT]\n"
+#~ "\n"
+#~ "Options :\n"
+#~ "  -a, --all                     afficher l'état des mots de passe de "
+#~ "tous\n"
+#~ "                                les comptes\n"
+#~ "  -d, --delete                  supprimer le mot de passe du compte "
+#~ "indiqué\n"
+#~ "  -e, --expire                  forcer la fin de validité du compte "
+#~ "indiqué\n"
+#~ "  -h, --help                    afficher ce message d'aide et quitter\n"
+#~ "  -k, --keep-tokens             ne changer le mot de passe que s'il\n"
+#~ "                                est arrivé en fin de validité\n"
+#~ "  -i, --inactive INACTIF        fixer la durée d'inactivation du mot de\n"
+#~ "                                passe après sa fin de validité à INACTIF\n"
+#~ "  -l, --lock                    bloquer le compte indiqué\n"
+#~ "  -n, --mindays JOURS_MIN       fixer le nombre minimum de jours avant "
+#~ "le\n"
+#~ "                                changement de mot de passe à JOURS_MIN\n"
+#~ "  -q, --quiet                   mode silencieux\n"
+#~ "  -r, --repository DÉPÔT        changer le mot de passe dans le dépôt "
+#~ "DÉPÔT\n"
+#~ "  -S, --status                  afficher l'état du mot de passe du "
+#~ "compte\n"
+#~ "                                indiqué\n"
+#~ "  -u, --unlock                  déverrouiller le compte indiqué\n"
+#~ "  -w, --warndays JOURS_AVERT    fixer le nombre de jours d'avertissement\n"
+#~ "                                de fin de validité à JOURS_AVERT\n"
+#~ "  -x, --maxdays JOURS_MAX       fixer le nombre maximum de jours avant "
+#~ "le\n"
+#~ "                                changement de mot de passe à JOURS_MAX\n"
+#~ "\n"
+
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Syntaxe : %s [-q] [-r] [passwd]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Syntaxe : %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Syntaxe : pwconv\n"
+
+#
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Syntaxe : pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "identifiant inconnu : %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Pas d'interpréteur de commandes\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Syntaxe : userdel [options] IDENTIFIANT\n"
+#~ "\n"
+#~ "Options :\n"
+#~ "  -f, --force                   forcer la suppression des fichiers, même\n"
+#~ "                                s'ils n'appartiennent pas à "
+#~ "l'utilisateur\n"
+#~ "  -h, --help                    afficher cette page d'aide et quitter\n"
+#~ "  -r, --remove                  supprimer le répertoire personnel et le\n"
+#~ "                                spool du courrier\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s : l'utilisateur %s est connecté\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Syntaxe : usermod [options] IDENTIFIANT\n"
+#~ "\n"
+#~ "Options :\n"
+#~ "  -c, --comment COMMENT         définir une nouvelle valeur pour le "
+#~ "champ\n"
+#~ "                                « GECOS »\n"
+#~ "  -d, --home REP_PERS           définir un nouveau répertoire personnel\n"
+#~ "                                pour le compte de l'utilisateur\n"
+#~ "  -e, --expiredate DATE_EXPIR   fixer la date de fin de validité du "
+#~ "compte\n"
+#~ "                                à DATE_EXPIR\n"
+#~ "  -f, --inactive INACTIF        fixer la durée d'inactivité du mot de "
+#~ "passe\n"
+#~ "                                après sa fin de validité à INACTIF\n"
+#~ "  -g, --gid GROUPE              forcer l'utilisation de GROUPE comme\n"
+#~ "                                 nouveau groupe primaire\n"
+#~ "  -G, --groups GROUPES          définir une nouvelle liste de groupes\n"
+#~ "                                supplémentaires\n"
+#~ "  -a, --append                  ajouter l'utilisateur aux GROUPES\n"
+#~ "                                supplémentaires mentionnés par l'option -"
+#~ "G\n"
+#~ "                                sans supprimer l 'utilisateur des autres\n"
+#~ "                                groupes\n"
+#~ "  -h, --help                    afficher ce message d'aide et quitter\n"
+#~ "  -l, --login IDENTIFIANT       définir un nouveau nom pour le compte\n"
+#~ "  -L, --lock                    bloquer le compte de l'utilisateur\n"
+#~ "  -m, --move-home               déplacer le contenu du répertoire "
+#~ "personnel\n"
+#~ "                                vers le nouvel emplacement (à n'utiliser\n"
+#~ "                                qu'avec -d)\n"
+#~ "  -o, --non-unique              autoriser l'utilisation d'un identifiant\n"
+#~ "                                d'utilisateur (UID) dupliqué (non "
+#~ "unique)\n"
+#~ "  -p, --password MOT_DE_PASSE   utiliser un mot de passe chiffré pour le\n"
+#~ "                                nouveau mot de passe\n"
+#~ "  -s, --shell INTERPRÉTEUR      définir un nouvel interpréteur de "
+#~ "commandes\n"
+#~ "                                initial pour le compte de l'utilisateur\n"
+#~ "  -u, --uid UID                 définir un nouvel identifiant (UID) pour "
+#~ "le\n"
+#~ "                                compte de l'utilisateur\n"
+#~ "  -U, --unlock                  déverrouiller le compte de l'utilisateur\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s : aucun indicateur n'a été précisé\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"

Modified: upstream/trunk/po/gl.po
===================================================================
--- upstream/trunk/po/gl.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/gl.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2006-07-18 23:27+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
@@ -38,6 +38,14 @@
 "erro de configuración - elemento \"%s\" descoñecido (avise ao "
 "administrador)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Contrasinal: "
 
@@ -227,6 +235,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "non se puido cambiar o propietario da caixa do correo"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: non se pode obter un UID único\n"
 
@@ -310,6 +323,33 @@
 msgstr "Contrasinal incorrecto para %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: non se puido deixar os privilexios (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: teléfono da casa non válido: \"%s\"\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: non se pode crear o directorio %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: non se pode crear o directorio %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -337,51 +377,55 @@
 msgid "Unable to determine your tty name."
 msgstr "Non se pode determinar o nome do seu tty."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "A chamada a malloc(%d) fallou\n"
-
 #, fuzzy
 #| msgid "No\n"
 msgid "No"
 msgstr "Non\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "Emprego: %s [entrada]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Emprego: chage [opcións] [USUARIO]\n"
-"\n"
-"Opcións:\n"
-"  -d, --lastday ÚLTIMO\t\tfixa o último cambio de\tcontrasinal ao\n"
-"\t\t\t\tdía ÚLTIMO\n"
-"  -E, --expiredate CADUCA\tfixa a data de caducidade ao día CADUCA\n"
-"  -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n"
-"  -I, --inactive INACTIVO\tfixa o tempo de inactividade do contrasinal\n"
-"\t\t\t\ttrala caducidade a INACTIVO\n"
-"  -l, --list\t\t\tamosa a información de caducidade das contas\n"
-"  -m, --mindays MÍNIMO\t\tfixa o número mínimo de días antes do\n"
-"\t\t\t\tcambio de contrasinal a MÍNIMO\n"
-"  -M, --maxdays MÁXIMO\t\tfixa o número máximo de días antes do\n"
-"\t\t\t\tcambio de contrasinal a MÁXIMO\n"
-"  -W, --warndays AVISO\t\tfixa o número de días de aviso de caducidade\n"
-"\t\t\t\ta AVISO\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Introduza o novo valor ou prema Intro para o valor por defecto"
@@ -454,9 +498,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -481,10 +526,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: o ficheiro de contrasinais shadow non está presente\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: non se puido deixar os privilexios (%s)\n"
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: o usuario %s non existe\n"
@@ -497,19 +538,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: erro ao cambiar os campos\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "Emprego: %s [entrada]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Emprego: %s [-f nome] [-r num_cuarto] [-w tlf_traballo]\n"
-"\t[-h tlf_casa] [-o outro] [usuario]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
 msgstr ""
-"Emprego: %s [-f nome] [-r num_cuarto] [-w tlf_traballo] [-h tlf_casa]\n"
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Nome completo"
 
@@ -587,25 +641,24 @@
 msgstr "%s: campos longos de máis\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "Emprego: %s [entrada]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Emprego: chpasswd [opcións]\n"
-"\n"
-"Opcións:\n"
-"  -e, --encrypted\tos contrasinais fornecidos xa están cifrados\n"
-"  -h, --help\t\tamosa esta mensaxe de axuda e sae\n"
-"  -m, --md5\t\tempregar cifrado MD5 no canto de DES se os\n"
-"\t\t\tcontrasinais fornecidos non están cifrados\n"
-"\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -647,29 +700,6 @@
 msgstr "%s: detectouse un erro, ignóranse os cambios\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Emprego: %s [entrada]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: o usuario %s non existe\n"
 
@@ -677,21 +707,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: o usuario %s non existe\n"
 
-#, fuzzy
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Emprego: chsh [opcións] [USUARIO]\n"
-"\n"
-"Opcións:\n"
-"  -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n"
-"  -s, --shell INTÉRPRETE\tnovo intérprete de ordes da conta de usuario\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "Intérprete de ordes"
@@ -724,9 +741,24 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: aviso: %s non pertence a %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Emprego: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: non se esperaba un argumento: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -753,9 +785,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: non se pode crear o directorio %s\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Usuario     Fallos   Máximo  Último                   O\n"
@@ -769,31 +802,30 @@
 msgid " [%lds lock]"
 msgstr " [bloqueado %lds]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: non se pode crear o directorio %s\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: non se puido deixar os privilexios (%s)\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: non se pode crear o directorio %s\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "Usuario descoñecido: %s\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"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: non se pode cambiar o nome do directorio %s a %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -808,6 +840,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -935,8 +970,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "O membro xa existe\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Emprego: groupdel grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Non se pode determinar o seu nome de usuario.\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1040,16 +1077,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: usuario %s descoñecido\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Emprego: %s [-r] [-s] [grupo [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Emprego: %s [entrada]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Emprego: %s [-r] [-s] [grupo]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "Emprego: %s [entrada]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s e -r son incompatibles\n"
 
 msgid "invalid group file entry"
@@ -1119,16 +1173,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: non hai cambios\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "Emprego: groupdel grupo\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "Emprego: groupdel grupo\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1143,31 +1187,17 @@
 msgid " groups="
 msgstr " grupos="
 
-#, fuzzy
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -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 ""
-"Emprego: lastlog [opcións]\n"
-"\n"
-"Opcións:\n"
-"  -b, --before DÍAS\tamosa só os rexistros de última entrada de máis\n"
-"\t\t\tde DÍAS días\n"
-"  -h, --help\t\tamosa esta mensaxe de axuda e sae\n"
-"  -t, --time DÍAS\tamosa só os rexistros de última entrada de menos\n"
-"\t\t\tde DÍAS días\n"
-"  -u, --user USUARIO\tamosa o rexistro de última entrada do USUARIO\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1180,14 +1210,6 @@
 msgstr "**Nunca entrou**"
 
 #, 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"
 
@@ -1262,6 +1284,11 @@
 msgid "Login incorrect"
 msgstr "Entrada incorrecta"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: liña %d: non se pode atopar o usuario %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1384,53 +1411,59 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: liña %d: non se pode actualizar a entrada\n"
 
-#, fuzzy
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Emprego: passwd [opcións] [USUARIO]\n"
-"\n"
-"Opcións:\n"
-"  -a, --all\t\t\tinforma do estado dos contrasinais en tódalas contas\n"
-"  -d, --delete\t\t\telimina o contrasinal da conta indicada\n"
-"  -e, --expire\t\t\tfai caducar o contrasinal da conta indicada\n"
-"  -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n"
-"  -k, --keep-tokens\t\tcambia o contrasinal só se caducou\n"
-"  -i, --inactive INACT\t\tcambia o tempo de inactividade trala caducidade\n"
-"\t\t\t\tda conta a INACT\n"
-"  -l, --lock\t\t\tbloquea a conta indicada\n"
-"  -n, --mindays MÍN\tfixa o número mínimo de días antes do cambio de\n"
-"\t\t\t\tcontrasinal a MÍN\n"
-"  -q, --quiet\t\t\tmodo silencioso\n"
-"  -r, --repository REP\t\tcambia o contrasinal do repositorio REP\n"
-"  -S, --status\t\t\tinforma do estado do contrasinal da conta indicada\n"
-"  -u, --unlock\t\t\tdesbloquea a conta indicada\n"
-"  -w, --warndays AVISO\tfixa o tempo de aviso antes da caducidade a AVISO\n"
-"\t\t\t\tdías\n"
-"  -x, --maxdays MÁX\t\tfixa o número máximo de días antes do cambio de\n"
-"\t\t\t\tcontrasinal a MÁX\n"
-"\n"
 
 msgid "Old password: "
 msgstr "Contrasinal antigo: "
@@ -1513,19 +1546,24 @@
 msgstr "Aviso de caducidade de contrasinal"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Emprego: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "Emprego: %s [entrada]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Emprego: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s e -r son incompatibles\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Emprego: %s [entrada]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1608,11 +1646,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: non se pode abrir o ficheiro %s\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "Emprego: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1622,11 +1655,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "Emprego: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "O acceso a su para esa conta está DENEGADO.\n"
 
@@ -1692,32 +1720,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: débese executar dende un terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ignórase)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start(): erro %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Id. descoñecido: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Non está autorizado para facer su %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(Introduza o seu propio contrasinal)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ignórase)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1728,9 +1744,29 @@
 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"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Non hai unha entrada de contrasinal para \"root\""
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: débese executar dende un terminal\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start(): erro %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: non se pode cambiar o nome do directorio %s a %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Non se pode executar %s"
+
 msgid "No password file"
 msgstr "Non é un ficheiro de contrasinais"
 
@@ -1775,7 +1811,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: rename: %s"
 
 #, c-format
@@ -1790,6 +1826,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "Emprego: %s [entrada]\n"
@@ -1907,10 +1945,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -1976,26 +2010,24 @@
 "%s: aviso: o directorio inicial xa existe.\n"
 "Non se copia nel ningún ficheiro do directorio skel.\n"
 
-#, fuzzy
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Emprego: userdel [opcións] USUARIO\n"
-"\n"
-"Opcións:\n"
-"  -f, --force\t\t\ttamén elimina os ficheiros se non son do usuario\n"
-"  -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n"
-"  -r, --remove\t\t\telimina o directorio inicial e o correo\n"
-"\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: non se pode cambiar o usuario \"%s\" no cliente NIS.\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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"
@@ -2004,6 +2036,11 @@
 "usuario.\n"
 
 #, fuzzy, c-format
+#| msgid "%s: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: directorio inicial \"%s\" non válido\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: aviso: non se pode eliminar "
@@ -2035,10 +2072,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: o usuario %s é un usuario NIS\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: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2054,58 +2087,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: erro ao borrar o directorio %s\n"
 
-#, fuzzy, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Emprego: usermod [opcións] USUARIO\n"
-"\n"
-"Opcións:\n"
-"  -a, --append GRUPO\t\tengade o usuario ao GRUPO suplementario\n"
-"\t\t\t\t(emprégueo só con -G)\n"
-"  -c, --comment COMENTARIO\tnovo valor do campo GECOS\n"
-"  -d, --home DIR_INICIAL\tnovo directorio inicial da conta de usuario\n"
-"  -e, --expiredate DATA_CAD\tfixa a data de caducidade da conta a DATA_CAD\n"
-"  -f, --inactive INACTIVA\tfixa o tempo de inactividade do contrasinal\n"
-"\t\t\t\ttrala caducidade a INACTIVA\n"
-"  -g, --gid GRUPO\t\tusa o GRUPO coma novo grupo primario\n"
-"  -G, --groups GRUPOS\t\tnova lista de GRUPOS suplementarios\n"
-"  -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n"
-"  -l, --login NOVO_USUARIO\tnovo valor do nome de usuario\n"
-"  -L, --lock\t\t\tbloquea a conta do usuario\n"
-"  -m, --move-home\t\tmove o contido do directorio inicial á nova\n"
-"\t\t\t\tlocalización (emprégueo só con -d)\n"
-"  -o, --non-unique\t\tpermite empregar UIDs duplicados (non únicos)\n"
-"  -p, --password CONTRASINAL\temprega o constrasinal cifrado coma novo\n"
-"\t\t\t\tcontrasinal\n"
-"  -s, --shell INTÉRPRETE\tnovo intérprete de ordes da conta de usuario\n"
-"  -u, --uid UID\t\t\tnovo UID para a conta de usuario\n"
-"  -U, --unlock\t\t\tdesbloquea a conta do usuario\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2122,18 +2156,19 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: o usuario %s existe\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: non se pode abrir o ficheiro %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: non se forneceu ningún modificador\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: precísase de contrasinais de shadow para -e e -f\n"
 
-#, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
@@ -2202,9 +2237,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2288,8 +2320,318 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: directorio base \"%s\" non válido\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "A chamada a malloc(%d) fallou\n"
+
 #, fuzzy
 #~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Emprego: chage [opcións] [USUARIO]\n"
+#~ "\n"
+#~ "Opcións:\n"
+#~ "  -d, --lastday ÚLTIMO\t\tfixa o último cambio de\tcontrasinal ao\n"
+#~ "\t\t\t\tdía ÚLTIMO\n"
+#~ "  -E, --expiredate CADUCA\tfixa a data de caducidade ao día CADUCA\n"
+#~ "  -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n"
+#~ "  -I, --inactive INACTIVO\tfixa o tempo de inactividade do contrasinal\n"
+#~ "\t\t\t\ttrala caducidade a INACTIVO\n"
+#~ "  -l, --list\t\t\tamosa a información de caducidade das contas\n"
+#~ "  -m, --mindays MÍNIMO\t\tfixa o número mínimo de días antes do\n"
+#~ "\t\t\t\tcambio de contrasinal a MÍNIMO\n"
+#~ "  -M, --maxdays MÁXIMO\t\tfixa o número máximo de días antes do\n"
+#~ "\t\t\t\tcambio de contrasinal a MÁXIMO\n"
+#~ "  -W, --warndays AVISO\t\tfixa o número de días de aviso de caducidade\n"
+#~ "\t\t\t\ta AVISO\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: a autenticación con PAM fallou\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Emprego: %s [-f nome] [-r num_cuarto] [-w tlf_traballo]\n"
+#~ "\t[-h tlf_casa] [-o outro] [usuario]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Emprego: %s [-f nome] [-r num_cuarto] [-w tlf_traballo] [-h tlf_casa]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Emprego: chpasswd [opcións]\n"
+#~ "\n"
+#~ "Opcións:\n"
+#~ "  -e, --encrypted\tos contrasinais fornecidos xa están cifrados\n"
+#~ "  -h, --help\t\tamosa esta mensaxe de axuda e sae\n"
+#~ "  -m, --md5\t\tempregar cifrado MD5 no canto de DES se os\n"
+#~ "\t\t\tcontrasinais fornecidos non están cifrados\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Emprego: chsh [opcións] [USUARIO]\n"
+#~ "\n"
+#~ "Opcións:\n"
+#~ "  -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n"
+#~ "  -s, --shell INTÉRPRETE\tnovo intérprete de ordes da conta de usuario\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Emprego: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: non se pode abrir o ficheiro %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Emprego: groupdel grupo\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Emprego: %s [-r] [-s] [grupo [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Emprego: %s [-r] [-s] [grupo]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s e -r son incompatibles\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Emprego: groupdel grupo\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Emprego: groupdel grupo\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Emprego: lastlog [opcións]\n"
+#~ "\n"
+#~ "Opcións:\n"
+#~ "  -b, --before DÍAS\tamosa só os rexistros de última entrada de máis\n"
+#~ "\t\t\tde DÍAS días\n"
+#~ "  -h, --help\t\tamosa esta mensaxe de axuda e sae\n"
+#~ "  -t, --time DÍAS\tamosa só os rexistros de última entrada de menos\n"
+#~ "\t\t\tde DÍAS días\n"
+#~ "  -u, --user USUARIO\tamosa o rexistro de última entrada do USUARIO\n"
+#~ "\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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Emprego: passwd [opcións] [USUARIO]\n"
+#~ "\n"
+#~ "Opcións:\n"
+#~ "  -a, --all\t\t\tinforma do estado dos contrasinais en tódalas contas\n"
+#~ "  -d, --delete\t\t\telimina o contrasinal da conta indicada\n"
+#~ "  -e, --expire\t\t\tfai caducar o contrasinal da conta indicada\n"
+#~ "  -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n"
+#~ "  -k, --keep-tokens\t\tcambia o contrasinal só se caducou\n"
+#~ "  -i, --inactive INACT\t\tcambia o tempo de inactividade trala "
+#~ "caducidade\n"
+#~ "\t\t\t\tda conta a INACT\n"
+#~ "  -l, --lock\t\t\tbloquea a conta indicada\n"
+#~ "  -n, --mindays MÍN\tfixa o número mínimo de días antes do cambio de\n"
+#~ "\t\t\t\tcontrasinal a MÍN\n"
+#~ "  -q, --quiet\t\t\tmodo silencioso\n"
+#~ "  -r, --repository REP\t\tcambia o contrasinal do repositorio REP\n"
+#~ "  -S, --status\t\t\tinforma do estado do contrasinal da conta indicada\n"
+#~ "  -u, --unlock\t\t\tdesbloquea a conta indicada\n"
+#~ "  -w, --warndays AVISO\tfixa o tempo de aviso antes da caducidade a "
+#~ "AVISO\n"
+#~ "\t\t\t\tdías\n"
+#~ "  -x, --maxdays MÁX\t\tfixa o número máximo de días antes do cambio de\n"
+#~ "\t\t\t\tcontrasinal a MÁX\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Emprego: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Emprego: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Emprego: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Emprego: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Id. descoñecido: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Non hai un intérprete de ordes\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Emprego: userdel [opcións] USUARIO\n"
+#~ "\n"
+#~ "Opcións:\n"
+#~ "  -f, --force\t\t\ttamén elimina os ficheiros se non son do usuario\n"
+#~ "  -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n"
+#~ "  -r, --remove\t\t\telimina o directorio inicial e o correo\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: o usuario %s está conectado\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Emprego: usermod [opcións] USUARIO\n"
+#~ "\n"
+#~ "Opcións:\n"
+#~ "  -a, --append GRUPO\t\tengade o usuario ao GRUPO suplementario\n"
+#~ "\t\t\t\t(emprégueo só con -G)\n"
+#~ "  -c, --comment COMENTARIO\tnovo valor do campo GECOS\n"
+#~ "  -d, --home DIR_INICIAL\tnovo directorio inicial da conta de usuario\n"
+#~ "  -e, --expiredate DATA_CAD\tfixa a data de caducidade da conta a "
+#~ "DATA_CAD\n"
+#~ "  -f, --inactive INACTIVA\tfixa o tempo de inactividade do contrasinal\n"
+#~ "\t\t\t\ttrala caducidade a INACTIVA\n"
+#~ "  -g, --gid GRUPO\t\tusa o GRUPO coma novo grupo primario\n"
+#~ "  -G, --groups GRUPOS\t\tnova lista de GRUPOS suplementarios\n"
+#~ "  -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n"
+#~ "  -l, --login NOVO_USUARIO\tnovo valor do nome de usuario\n"
+#~ "  -L, --lock\t\t\tbloquea a conta do usuario\n"
+#~ "  -m, --move-home\t\tmove o contido do directorio inicial á nova\n"
+#~ "\t\t\t\tlocalización (emprégueo só con -d)\n"
+#~ "  -o, --non-unique\t\tpermite empregar UIDs duplicados (non únicos)\n"
+#~ "  -p, --password CONTRASINAL\temprega o constrasinal cifrado coma novo\n"
+#~ "\t\t\t\tcontrasinal\n"
+#~ "  -s, --shell INTÉRPRETE\tnovo intérprete de ordes da conta de usuario\n"
+#~ "  -u, --uid UID\t\t\tnovo UID para a conta de usuario\n"
+#~ "  -U, --unlock\t\t\tdesbloquea a conta do usuario\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: non se forneceu ningún modificador\n"
+
+#, fuzzy
+#~ msgid ""
 #~ "Usage: vipw [options]\n"
 #~ "\n"
 #~ "Options:\n"
@@ -2785,9 +3127,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/he.po
===================================================================
--- upstream/trunk/po/he.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/he.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2004-07-21 23:59+0300\n"
 "Last-Translator: Lior Kaplan <webmaster at guides.co.il>\n"
 "Language-Team: Hebrew <en at li.org>\n"
@@ -38,6 +38,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "שגיאת הגדרות - רכיב לא ידוע '%s' (הודע למנהל)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "סיסמה: "
 
@@ -208,6 +216,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "%s: שדות ארוכים מידי\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
@@ -290,6 +303,30 @@
 msgstr ""
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: מספר טלפון בבית לא חוקי: \"%s\"\n"
+
+#, fuzzy, c-format
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: לא יכול לשנות משתמש `%s' על לקוח NIS.\n"
+
+#, fuzzy, c-format
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "ספרית שורש לא חוקית \"%s\"\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -318,30 +355,51 @@
 msgid "Unable to determine your tty name."
 msgstr "%s: לא יכול לקבוע את שם המשתמש שלך.\n"
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) נכשל\n"
-
 msgid "No"
 msgstr ""
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
 
 msgid "Enter the new value, or press ENTER for the default"
@@ -420,9 +478,9 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: לא יכול לקבוע את שם המשתמש שלך.\n"
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr "%s: זיהוי PAM נכשל\n"
+#, fuzzy, c-format
+msgid "%s: PAM: %s\n"
+msgstr "passwd: %s\n"
 
 #, fuzzy, c-format
 #| msgid "Cannot lock the password file; try again later.\n"
@@ -446,10 +504,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: לא יכול לפתוח קובץ סיסמאות צל\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
@@ -464,14 +518,29 @@
 
 #, c-format
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "שם מלא"
 
@@ -551,12 +620,18 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 
 msgid ""
@@ -596,28 +671,6 @@
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: שגיאה זוהתה, מתעלם משינויים\n"
 
-#, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "%s: line %d: unknown user %s\n"
 msgid "%s: (line %d, user %s) password not changed\n"
@@ -628,13 +681,7 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
 
 msgid "Login Shell"
@@ -666,9 +713,23 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "שימוש: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: unexpected argument: %s\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -695,9 +756,9 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "ספרית שורש לא חוקית \"%s\"\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr ""
@@ -710,31 +771,27 @@
 msgid " [%lds lock]"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "ספרית שורש לא חוקית \"%s\"\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: מספר טלפון בעבודה לא חוקי: \"%s\"\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "ספרית שורש לא חוקית \"%s\"\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Unknown user or range: %s\n"
+msgstr "%s: לא יכול לנעול קובץ צל\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: לא יכול לשנות משתמש `%s' על לקוח NIS.\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -747,6 +804,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -866,8 +926,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-msgid "Usage: groupdel group\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: לא יכול לקבוע את שם המשתמש שלך.\n"
 
 #, fuzzy, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -967,15 +1029,29 @@
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "שימוש: %s [-r|-R] group\n"
+
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
 msgstr ""
 
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr ""
 
 #, fuzzy
@@ -1047,14 +1123,6 @@
 msgid "%s: no changes\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: grpconv\n"
-msgstr "שימוש: id\n"
-
-msgid "Usage: grpunconv\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: לא יכול לנעול קובץ צל\n"
@@ -1069,19 +1137,16 @@
 msgstr ""
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1093,14 +1158,6 @@
 msgid "**Never logged in**"
 msgstr ""
 
-#, c-format
-msgid "lastlog: unexpected argument: %s\n"
-msgstr ""
-
-#, c-format
-msgid "lastlog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "שימוש: %s [-p] [name]\n"
@@ -1164,6 +1221,11 @@
 msgid "Login incorrect"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: לא יכול לקבוע את שם המשתמש שלך.\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1282,28 +1344,57 @@
 msgstr ""
 
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
 
 msgid "Old password: "
@@ -1380,15 +1471,20 @@
 msgstr "אזהרת תוקף סיסמה"
 
 #, fuzzy, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
 msgstr "שימוש: %s [-p] [name]\n"
 
 #, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
+msgid "  -q, --quiet                   report errors only\n"
 msgstr ""
 
 #, c-format
@@ -1469,11 +1565,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: לא יכול לכתוב מחדש קובץ סיסמאות\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "שימוש: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't lock shadow file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1483,11 +1574,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "שימוש: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr ""
 
@@ -1541,30 +1627,18 @@
 msgstr ""
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
 msgstr ""
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr ""
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr ""
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr ""
 
 msgid "(Enter your own password)"
 msgstr ""
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1574,9 +1648,27 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr ""
 
-msgid "No shell\n"
+#, c-format
+msgid "No passwd entry for user '%s'\n"
 msgstr ""
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr ""
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: לא יכול לשנות משתמש `%s' על לקוח NIS.\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "לא יכול להריץ %s"
+
 #, fuzzy
 msgid "No password file"
 msgstr "  בחר סיסמה חדשה.\n"
@@ -1617,7 +1709,7 @@
 msgstr "%s: שורה %d: לא יכול לעדכן רשומת סיסמה\n"
 
 #, fuzzy, c-format
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: שורה %d: לא יכול לעדכן רשומת סיסמה\n"
 
 #, c-format
@@ -1631,6 +1723,8 @@
 #, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1748,10 +1842,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -1809,21 +1899,31 @@
 msgstr ""
 
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: לא יכול לשנות משתמש `%s' על לקוח NIS.\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "ספרית שורש לא חוקית \"%s\"\n"
+
+#, fuzzy, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: שורה %d: לא יכול לעדכן רשומת סיסמה\n"
 
@@ -1851,10 +1951,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr ""
 
-#, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "ספרית שורש לא חוקית \"%s\"\n"
@@ -1867,34 +1963,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr ""
 
-#, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -1910,8 +2031,13 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "%s: can't open shadow file\n"
+msgid "%s: no options\n"
+msgstr "%s: לא יכול לפתוח קובץ צל\n"
+
 #, c-format
-msgid "%s: no flags given\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
 #, c-format
@@ -1919,10 +2045,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr ""
 
@@ -1985,9 +2107,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2049,7 +2168,31 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "ספרית שורש לא חוקית \"%s\"\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) נכשל\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: זיהוי PAM נכשל\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "שימוש: expiry {-f|-c}\n"
+
 #, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "שימוש: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "שימוש: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "שימוש: id\n"
+
+#, fuzzy
 #~ msgid "Password set to expire."
 #~ msgstr "תוקף הסיסמה שלך פג."
 
@@ -2130,10 +2273,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/hu.po
===================================================================
--- upstream/trunk/po/hu.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/hu.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2007-11-25 20:56+0100\n"
 "Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
 "Language-Team: Hungarian <gnome at gnome.hu>\n"
@@ -36,6 +36,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "beállítási hiba - ismeretlen '%s' elem (értesítsd a rendszergazdát)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Jelszó: "
 
@@ -222,6 +230,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "a postafiók tulajdonosának váltása sikertelen"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: nem kérhető le egyedi felhasználói azonosító\n"
 
@@ -305,6 +318,33 @@
 msgstr "Hibás jelszó ehhez: %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: érvénytelen otthoni telefonszám: \"%s\"\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: %s könyvtár nem hozható létre\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: %s könyvtár nem hozható létre\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -332,73 +372,55 @@
 msgid "Unable to determine your tty name."
 msgstr "Sikertelen tty név meghatározás."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "Sikertelen malloc(%d)\n"
-
 #, fuzzy
 #| msgid "No\n"
 msgid "No"
 msgstr "Nem\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "Használat: %s [bemenet]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Használat: chage [kapcsolók] [NÉV]\n"
-"\n"
-"Kapcsolók:\n"
-"  -d, --lastday UTOLSÓ_NAP         utolsó jelszómódosítás beállítása az\n"
-"                                   UTOLSÓ_NAPRA\n"
-"  -E, --expiredate LEJÁRATI_DÁTUM  fiók lejárati dátumának beállítása a\n"
-"                                   LEJÁRATI_DÁTUMRA\n"
-"  -h, --help                       ezen súgószöveg megjelenítése és kilépés\n"
-"  -I, --inactive INAKTÍV           a jelszó inaktívvá tétele lejárat után\n"
-"                                   az INAKTÍV értékre\n"
-"  -l, --list                       fiókelévülési információk megjelenítése\n"
-"  -m, --mindays MIN_NAPOK          napok minimális számának beállítása\n"
-"                                   jelszómódosítás előtt a MIN_NAPOK "
-"értékre\n"
-"  -M, --maxdays MAX_NAPOK          napok maximális számának beállítása\n"
-"                                   jelszómódosítás előtt a MAX_NAPOK "
-"értékre\n"
-"  -W, --warndays FIGYELM_NAPOK     a lejáratra figyelmeztetés napjai\n"
-"                                   számának beállítása FIGYELM_NAPOK-ra\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Add meg az új értéket vagy üss ENTER-t az alapértelmezetthez"
@@ -471,9 +493,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -498,10 +521,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: nincs meg az árnyék jelszófájl\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: %s felhasználó nem létezik\n"
@@ -514,20 +533,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: hiba a mezők módosításakor\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "Használat: %s [bemenet]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Használat: %s [-f TELJES_Név] [-r szobaszám] [-w munka_tel]\n"
-"\t[-h otthoni_tel] [-o egyéb] [felhasználónév]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
 msgstr ""
-"Használat: %s [-f TELJES_Név] [-r szobaszám] [-w munka_tel] \t[-h "
-"otthoni_tel]\n"
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "TELJES Név"
 
@@ -605,25 +636,24 @@
 msgstr "%s: túl hosszú mezők\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "Használat: %s [bemenet]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Használat: chpasswd [kapcsolók]\n"
-"\n"
-"Kapcsolók:\n"
-"  -e, --encrypted               a megadott jelszavak titkosítottak\n"
-"  -h, --help                    ezen súgó megjelenítése és kilépés\n"
-"  -m, --md5                     MD5 titkosítás használata DES helyett,ha a\n"
-"                                megadott jelszavak nem titkosítottak\n"
-"\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -665,29 +695,6 @@
 msgstr "%s: hibákat észleltem, a változások elvetve\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Használat: %s [bemenet]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: %s felhasználó nem létezik\n"
 
@@ -695,20 +702,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: %s felhasználó nem létezik\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Használat: chsh [kapcsolók] NÉV\n"
-"\n"
-"Kapcsolók:\n"
-"  -h, --help                    kiírja e súgót és kilép\n"
-"  -s, --shell                   új bejelentkező héj a felhasználói fiókhoz\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "Bejelentkező héj"
@@ -741,9 +736,24 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: figyelem: %s tulajdonosa nem %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Használat: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: váratlan argumentum: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -770,9 +780,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: %s könyvtár nem hozható létre\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Név         Hibás Maximális Legutóbbi                   Ezen\n"
@@ -786,31 +797,30 @@
 msgid " [%lds lock]"
 msgstr " [%lds zárolva]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: %s könyvtár nem hozható létre\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: %s könyvtár nem hozható létre\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "Ismeretlen felhasználó: %s\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"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: nem tudom átnevezni %s könyvtárat erre: %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -825,6 +835,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -952,8 +965,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: A felhasználóneved megállapítása sikertelen\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1057,16 +1072,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: ismeretlen %s felhasználó\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Használat: %s [-r] [-s] [csoport [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Használat: %s [bemenet]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Használat: %s [-r] [-s] [csoport]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "Használat: %s [bemenet]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s és -r inkompatibilisek\n"
 
 msgid "invalid group file entry"
@@ -1136,16 +1168,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: nincs változás\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "Használat: groupdel csoport\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "Használat: groupdel csoport\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1161,30 +1183,16 @@
 msgstr " csoportok="
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -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 ""
-"Használat: lastlog [kapcsolók]\n"
-"\n"
-"Kapcsolók:\n"
-"  -b, --before NAP              csak a NAPOK számánál régebbi lastlog\n"
-"                                rekordok megjelenítése\n"
-"  -h, --help                    ezen súgószöveg megjelenítése és kilépés\n"
-"  -t, --time NAP                csak a megadott NAPNÁL újabb lastlog\n"
-"                                rekordok kiírása\n"
-"  -u, --user NÉV                a megadott NEVŰ felhasználó lastlog\n"
-"                                rekordjainak kiírása\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1197,14 +1205,6 @@
 msgstr "**Sosem lépett be**"
 
 #, 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"
 
@@ -1279,6 +1279,11 @@
 msgid "Login incorrect"
 msgstr "Hibás bejelentkezés"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: %d. sor: nem találom e felhasználót: %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1401,80 +1406,59 @@
 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"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Használat: passwd [kapcsolók] [NÉV]\n"
-"\n"
-"Kapcsolók:\n"
-"  -a, --all                     jelszóállapot jelentés az összes fiókon\n"
-"  -d, --delete                  a megadott fiók jelszavának törlése\n"
-"  -e, --expire                  a megadott fiók jelszava lejáratának\n"
-"                                kényszerítése\n"
-"  -h, --help                    kiírja e súgót és kilép\n"
-"  -k, --keep-tokens             a jelszót csak annak lejáratakor módosítsa\n"
-"  -i, --inactive INAKTÍV        a jelszó inaktívvá tétele lejárat után\n"
-"                                az INAKTÍV értékre\n"
-"  -l, --lock                    a megadott fiók zárolása\n"
-"  -n, --mindays MIN_NAPOK       napok minimális számának beállítása\n"
-"                                jelszómódosítás előtt a MIN_NAPOK értékre\n"
-"  -q, --quiet                   csendes mód\n"
-"  -r, --repository LERAKAT      jelszó módosítása a LERAKAT lerakatban\n"
-"  -S, --status                  jelentés a megadott fiók jelszóállapotáról\n"
-"  -u, --unlock                  a megadott fiók zárolásának feloldása\n"
-"  -w, --warndays FIGYELEM_NAPOK a lejáratra figyelmeztetés napjai számának\n"
-"  -x, --maxdays MAX_NAPOK       napok maximális számának beállítása\n"
-"                                jelszómódosítás előtt a MAX_NAPOK értékre\n"
-"\n"
 
 msgid "Old password: "
 msgstr "Régi jelszó: "
@@ -1557,19 +1541,24 @@
 msgstr "Jelszó elévülési figyelmeztetés"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Használat: %s [-q] [-r] [-s] [jelszó [árnyék]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "Használat: %s [bemenet]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Használat: %s [-q] [-r] [-s] [jelszó [árnyék]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s és -r inkompatibilisek\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Használat: %s [bemenet]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1652,11 +1641,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: %s fájl nem nyitható meg\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "Használat: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1666,11 +1650,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "Használat: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "A su-zás e hozzáféréshez ELUTASÍTVA.\n"
 
@@ -1737,32 +1716,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: terminálból kell futnia\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Átlépve)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: hiba: %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Ismeretlen azonosító: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Nem vagy jogosult ehhez: su %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(Add meg saját jelszavad)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Átlépve)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1773,9 +1740,29 @@
 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"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Nincs 'root' jelszó bejegyzés"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: terminálból kell futnia\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: hiba: %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: nem tudom átnevezni %s könyvtárat erre: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "%s nem futtatható"
+
 msgid "No password file"
 msgstr "Nincs jelszófájl"
 
@@ -1820,7 +1807,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: átnevezés: %s"
 
 #, c-format
@@ -1835,6 +1822,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "Használat: %s [bemenet]\n"
@@ -1952,10 +1941,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -2022,26 +2007,23 @@
 "Nem másolok semmit bele a vázkönyvtárból.\n"
 
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Használat: userdel [kapcsolók] NÉV\n"
-"\n"
-"Kapcsolók:\n"
-"  -f, --force                   fájlok eltávolításának kényszerítése, még\n"
-"                                ha nem a felhasználó a tulajdonos is\n"
-"  -h, --help                    ezen súgószöveg megjelenítése és kilépés\n"
-"  -r, --remove                  saját könyvtár és levelezési sor "
-"eltávolítása\n"
-"\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: `%s' felhasználó nem módosítható NIS kliensen.\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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"
@@ -2050,6 +2032,11 @@
 "csoportja.\n"
 
 #, fuzzy, c-format
+#| msgid "%s: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: érvénytelen saját könyvtár: \"%s\"\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: figyelem: nem törölhető: "
@@ -2081,10 +2068,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: %s egy NIS felhasználó\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: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2098,70 +2081,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: hiba %s könyvtár törlésekor\n"
 
-# FIXME
-#, fuzzy, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Használat: usermod [kapcsolók] NÉV\n"
-"\n"
-"Kapcsolók:\n"
-"  -a, --append                     felhasználó adása a kiegészítő "
-"CSOPORTHOZ\n"
-"                                   (csak -G-vel használd)\n"
-"  -c, --comment MEGJEGYZÉS         a GECOS mező új értéke\n"
-"  -d, --home SAJÁT_KVT             új bejelentkezési könyvtár az új\n"
-"                                   felhasználói\n"
-"  -e, --expiredate LEJÁRATI_DÁTUM  fiók lejárati dátumának beállítása a\n"
-"                                   LEJÁRATI_DÁTUMRA\n"
-"  -f, --inactive INAKTÍV           a jelszó inaktívvá tétele lejárat után\n"
-"                                   az INAKTÍV értékre\n"
-"  -g, --gid CSOPORT                a CSOPORT használatának kényszerítése\n"
-"                                   az új felhasználói fiókhoz\n"
-"  -G, --groups CSOPORTOK           kiegészítő csoportok felsorolása az új\n"
-"                                   felhasználói fiókhoz\n"
-"  -h, --help                       ezen súgószöveg megjelenítése és kilépés\n"
-"  -l, --login NÉV                  a bejelentkezési név új értéke\n"
-"  -L, --lock                       a megadott fiók zárolása\n"
-"  -m, --move-home                  a saját könyvtár tartalmának áthelyezése "
-"az\n"
-"                                   új helyre (csak a -d kapcsolóval "
-"használd)\n"
-"  -o, --non-unique                 engedélyezi a csoport létrehozását "
-"többször\n"
-"                                   szereplő (nem egyedi) GID értékkel\n"
-"  -p, --password JELSZÓ            az új jelszó titkosított\n"
-"  -s, --shell PARANCSÉRTELMEZŐ     a PARANCSÉRTELMEZŐ használata a\n"
-"                                   passwd-ben megadott alapértelmezett "
-"helyett\n"
-"  -u, --uid UID                    új UID a felhasználó fiókjához\n"
-"  -U, --unlock                     a felhasználói fiók zárolásának "
-"feloldása\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2178,18 +2150,19 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: %s felhasználó létezik\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: %s fájl nem nyitható meg\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: nincs kapcsoló megadva\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: -e és -f árnyék jelszavakat vár\n"
 
-#, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
@@ -2257,9 +2230,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2343,8 +2313,394 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: érvénytelen alapkönyvtár: \"%s\"\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "Sikertelen malloc(%d)\n"
+
 #, fuzzy
 #~| msgid ""
+#~| "Usage: chage [options] [LOGIN]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+#~| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -l, --list                    show account aging information\n"
+#~| "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~| "password\n"
+#~| "                                change to MIN_DAYS\n"
+#~| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~| "password\n"
+#~| "                                change to MAX_DAYS\n"
+#~| "  -W, --warndays WARN_DAYS      set expiration warning days to "
+#~| "WARN_DAYS\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Használat: chage [kapcsolók] [NÉV]\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ "  -d, --lastday UTOLSÓ_NAP         utolsó jelszómódosítás beállítása az\n"
+#~ "                                   UTOLSÓ_NAPRA\n"
+#~ "  -E, --expiredate LEJÁRATI_DÁTUM  fiók lejárati dátumának beállítása a\n"
+#~ "                                   LEJÁRATI_DÁTUMRA\n"
+#~ "  -h, --help                       ezen súgószöveg megjelenítése és "
+#~ "kilépés\n"
+#~ "  -I, --inactive INAKTÍV           a jelszó inaktívvá tétele lejárat "
+#~ "után\n"
+#~ "                                   az INAKTÍV értékre\n"
+#~ "  -l, --list                       fiókelévülési információk "
+#~ "megjelenítése\n"
+#~ "  -m, --mindays MIN_NAPOK          napok minimális számának beállítása\n"
+#~ "                                   jelszómódosítás előtt a MIN_NAPOK "
+#~ "értékre\n"
+#~ "  -M, --maxdays MAX_NAPOK          napok maximális számának beállítása\n"
+#~ "                                   jelszómódosítás előtt a MAX_NAPOK "
+#~ "értékre\n"
+#~ "  -W, --warndays FIGYELM_NAPOK     a lejáratra figyelmeztetés napjai\n"
+#~ "                                   számának beállítása FIGYELM_NAPOK-ra\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM hitelesítési hiba\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Használat: %s [-f TELJES_Név] [-r szobaszám] [-w munka_tel]\n"
+#~ "\t[-h otthoni_tel] [-o egyéb] [felhasználónév]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Használat: %s [-f TELJES_Név] [-r szobaszám] [-w munka_tel] \t[-h "
+#~ "otthoni_tel]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Használat: chpasswd [kapcsolók]\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ "  -e, --encrypted               a megadott jelszavak titkosítottak\n"
+#~ "  -h, --help                    ezen súgó megjelenítése és kilépés\n"
+#~ "  -m, --md5                     MD5 titkosítás használata DES helyett,ha "
+#~ "a\n"
+#~ "                                megadott jelszavak nem titkosítottak\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Használat: chsh [kapcsolók] NÉV\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ "  -h, --help                    kiírja e súgót és kilép\n"
+#~ "  -s, --shell                   új bejelentkező héj a felhasználói "
+#~ "fiókhoz\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Használat: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: %s fájl nem nyitható meg\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Használat: groupdel csoport\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Használat: %s [-r] [-s] [csoport [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Használat: %s [-r] [-s] [csoport]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s és -r inkompatibilisek\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Használat: groupdel csoport\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Használat: groupdel csoport\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Használat: lastlog [kapcsolók]\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ "  -b, --before NAP              csak a NAPOK számánál régebbi lastlog\n"
+#~ "                                rekordok megjelenítése\n"
+#~ "  -h, --help                    ezen súgószöveg megjelenítése és kilépés\n"
+#~ "  -t, --time NAP                csak a megadott NAPNÁL újabb lastlog\n"
+#~ "                                rekordok kiírása\n"
+#~ "  -u, --user NÉV                a megadott NEVŰ felhasználó lastlog\n"
+#~ "                                rekordjainak kiírása\n"
+#~ "\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Használat: passwd [kapcsolók] [NÉV]\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ "  -a, --all                     jelszóállapot jelentés az összes fiókon\n"
+#~ "  -d, --delete                  a megadott fiók jelszavának törlése\n"
+#~ "  -e, --expire                  a megadott fiók jelszava lejáratának\n"
+#~ "                                kényszerítése\n"
+#~ "  -h, --help                    kiírja e súgót és kilép\n"
+#~ "  -k, --keep-tokens             a jelszót csak annak lejáratakor "
+#~ "módosítsa\n"
+#~ "  -i, --inactive INAKTÍV        a jelszó inaktívvá tétele lejárat után\n"
+#~ "                                az INAKTÍV értékre\n"
+#~ "  -l, --lock                    a megadott fiók zárolása\n"
+#~ "  -n, --mindays MIN_NAPOK       napok minimális számának beállítása\n"
+#~ "                                jelszómódosítás előtt a MIN_NAPOK "
+#~ "értékre\n"
+#~ "  -q, --quiet                   csendes mód\n"
+#~ "  -r, --repository LERAKAT      jelszó módosítása a LERAKAT lerakatban\n"
+#~ "  -S, --status                  jelentés a megadott fiók "
+#~ "jelszóállapotáról\n"
+#~ "  -u, --unlock                  a megadott fiók zárolásának feloldása\n"
+#~ "  -w, --warndays FIGYELEM_NAPOK a lejáratra figyelmeztetés napjai "
+#~ "számának\n"
+#~ "  -x, --maxdays MAX_NAPOK       napok maximális számának beállítása\n"
+#~ "                                jelszómódosítás előtt a MAX_NAPOK "
+#~ "értékre\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Használat: %s [-q] [-r] [-s] [jelszó [árnyék]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Használat: %s [-q] [-r] [-s] [jelszó [árnyék]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Használat: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Használat: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Ismeretlen azonosító: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Nincs héj\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Használat: userdel [kapcsolók] NÉV\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ "  -f, --force                   fájlok eltávolításának kényszerítése, "
+#~ "még\n"
+#~ "                                ha nem a felhasználó a tulajdonos is\n"
+#~ "  -h, --help                    ezen súgószöveg megjelenítése és kilépés\n"
+#~ "  -r, --remove                  saját könyvtár és levelezési sor "
+#~ "eltávolítása\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: %s felhasználó most be van jelentkezve\n"
+
+# FIXME
+#, fuzzy
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Használat: usermod [kapcsolók] NÉV\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ "  -a, --append                     felhasználó adása a kiegészítő "
+#~ "CSOPORTHOZ\n"
+#~ "                                   (csak -G-vel használd)\n"
+#~ "  -c, --comment MEGJEGYZÉS         a GECOS mező új értéke\n"
+#~ "  -d, --home SAJÁT_KVT             új bejelentkezési könyvtár az új\n"
+#~ "                                   felhasználói\n"
+#~ "  -e, --expiredate LEJÁRATI_DÁTUM  fiók lejárati dátumának beállítása a\n"
+#~ "                                   LEJÁRATI_DÁTUMRA\n"
+#~ "  -f, --inactive INAKTÍV           a jelszó inaktívvá tétele lejárat "
+#~ "után\n"
+#~ "                                   az INAKTÍV értékre\n"
+#~ "  -g, --gid CSOPORT                a CSOPORT használatának kényszerítése\n"
+#~ "                                   az új felhasználói fiókhoz\n"
+#~ "  -G, --groups CSOPORTOK           kiegészítő csoportok felsorolása az "
+#~ "új\n"
+#~ "                                   felhasználói fiókhoz\n"
+#~ "  -h, --help                       ezen súgószöveg megjelenítése és "
+#~ "kilépés\n"
+#~ "  -l, --login NÉV                  a bejelentkezési név új értéke\n"
+#~ "  -L, --lock                       a megadott fiók zárolása\n"
+#~ "  -m, --move-home                  a saját könyvtár tartalmának "
+#~ "áthelyezése az\n"
+#~ "                                   új helyre (csak a -d kapcsolóval "
+#~ "használd)\n"
+#~ "  -o, --non-unique                 engedélyezi a csoport létrehozását "
+#~ "többször\n"
+#~ "                                   szereplő (nem egyedi) GID értékkel\n"
+#~ "  -p, --password JELSZÓ            az új jelszó titkosított\n"
+#~ "  -s, --shell PARANCSÉRTELMEZŐ     a PARANCSÉRTELMEZŐ használata a\n"
+#~ "                                   passwd-ben megadott alapértelmezett "
+#~ "helyett\n"
+#~ "  -u, --uid UID                    új UID a felhasználó fiókjához\n"
+#~ "  -U, --unlock                     a felhasználói fiók zárolásának "
+#~ "feloldása\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: nincs kapcsoló megadva\n"
+
+#, fuzzy
+#~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
 #~| "Options:\n"
@@ -2895,9 +3251,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/id.po
===================================================================
--- upstream/trunk/po/id.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/id.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2007-11-25 20:58+0100\n"
 "Last-Translator: Parlin Imanuel Toh <parlin_i at yahoo.com>\n"
 "Language-Team: Debian Indonesia <debid at yahoogroups.com>\n"
@@ -36,6 +36,14 @@
 msgstr ""
 "Kesalahan konfigurasi - item tidak dikenal '%s' (beritahu administrator)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Kata sandi:"
 
@@ -221,6 +229,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "gagal mengganti pemilik kotak-surat"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: tidak bisa mendapatkan UID yang unik\n"
 
@@ -304,6 +317,32 @@
 msgstr "Kata sandi tidak tepat untuk %s\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: gagal membuang hak (%s)\n"
+
+#, fuzzy, c-format
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: telepon rumah tidak sah: \"%s\"\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: tak dapat membuat direktori %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: tak dapat membuat direktori %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -331,72 +370,55 @@
 msgid "Unable to determine your tty name."
 msgstr "Tak dapat menentukan nama tty anda."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) gagal\n"
-
 #, fuzzy
 #| msgid "No\n"
 msgid "No"
 msgstr "Tidak\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "Penggunaan: %s [input]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Penggunaan: chage [pilihan-pilihan] [NAMA-LOGIN]\n"
-"\n"
-"Pilihan-pilihan:\n"
-"  -d, --lastday LAST_DAY        atur pergantian password terakhir pada "
-"LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE  atur kadaluarsa akun pada tanggal\n"
-"                                EXPIRE_DATE\n"
-"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
-"  -I, --inactive INACTIVE       atur masa inaktif kata sandi setelah\n"
-"                                kadaluarsa pada INACTIVE\n"
-"  -l, --list                    tampilkan informasi umur akun\n"
-"  -m, --mindays MIN_DAYS        atur jumlah hari minimum sebelum kata sandi\n"
-"                                diganti menjadi MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS        atur jumlah hari maksimum sebelum kata "
-"sandi\n"
-"                                diganti menjadi MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS      atur hari peringatan kadaluarsa menjadi\n"
-"                                WARN_DAYS\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Masukkan nilai baru atau tekan ENTER untuk nilai bawaan"
@@ -469,9 +491,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -496,10 +519,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: tak terdapat berkas kata sandi bayangan\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: gagal membuang hak (%s)\n"
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: pengguna %s tak ada\n"
@@ -512,19 +531,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: kesalahan saat mengubah ruas-ruas isian\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "Penggunaan: %s [input]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Penggunaan: %s [-f nama_lkp] [-r no_ruang] [-w telp_ktr]\n"
-"\t[-h telp_rmh] [-o lain_lain] [pengguna]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
 msgstr ""
-"Penggunaan: %s [-f nama_lkp] [-r no_ruang] [-w telp_ktr] [-h telp_rmh]\n"
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Nama Lengkap"
 
@@ -601,24 +633,24 @@
 msgstr "%s: ruas terlalu panjang\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "Penggunaan: %s [input]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Penggunaan: chpasswd [pilihan-pilihan]\n"
-"\n"
-"Pilihan-pilihan:\n"
-"  -e, --encrypted               kata sandi yang diberikan telah terenkripsi\n"
-"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
-"  -m, --md5                     gunakan enkripsi MD5 daripada DES bila kata\n"
-"                                sandi yang diberikan tak terenkripsi\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -660,29 +692,6 @@
 msgstr "%s: kesalahan terdeteksi, perubahan diabaikan\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Penggunaan: %s [input]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: pengguna %s tak ada\n"
 
@@ -690,13 +699,7 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: pengguna %s tak ada\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
 
 msgid "Login Shell"
@@ -730,9 +733,24 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: perhatian %s tak dimiliki oleh %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Penggunaan: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: argumen tak terduga: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -759,9 +777,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: tak dapat membuat direktori %s\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Gagal    Maks.   Terakhir                 Pada\n"
@@ -775,31 +794,30 @@
 msgid " [%lds lock]"
 msgstr " [%lds terkunci]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: tak dapat membuat direktori %s\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: gagal membuang hak (%s)\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: tak dapat membuat direktori %s\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "Pengguna tak dikenal: %s\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"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: tak dapat mengubah nama direktori %s menjadi %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -814,6 +832,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -940,8 +961,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-msgid "Usage: groupdel group\n"
-msgstr "Penggunaan: groupdel grup\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Tidak dapat menentukan nama pengguna anda.\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1044,16 +1067,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: pengguna %s tak dikenal\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Penggunaan: %s [-r] [-s] [grup [gbayangan]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Penggunaan: %s [input]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Penggunaan: %s [-r] [-s] [grup]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "Penggunaan: %s [input]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s dan -r tidak kompatible\n"
 
 msgid "invalid group file entry"
@@ -1121,16 +1161,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: tak ada perubahan\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "Penggunaan: groupdel grup\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "Penggunaan: groupdel grup\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1146,29 +1176,16 @@
 msgstr " grup="
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -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 ""
-"Penggunaan: lastlog [pilihan-pilihan]\n"
-"\n"
-"Pilihan-pilihan:\n"
-"  -b, --before HARI     cetak hanya record lastlog yang lebih tua dari HARI\n"
-"  -h, --help            tampilkan pesan bantuan ini dan keluar\n"
-"  -t, --time HARI       cetak hanya record lastlog yang lebih baru dari "
-"HARI\n"
-"  -u, --user NAMA       cetak record lastlog untuk pengguna dengan nama "
-"NAMA\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1181,14 +1198,6 @@
 msgstr "**Tak pernah log in**"
 
 #, 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"
 
@@ -1262,6 +1271,11 @@
 msgid "Login incorrect"
 msgstr "Login tidak tepat"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: baris %d: tak menemukan pengguna %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1384,57 +1398,59 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: baris %d: tak dapat memperbaharui entri\n"
 
-#, fuzzy
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Penggunaan: passwd [pilihan-pilihan] [nama-pengguna]\n"
-"\n"
-"Pilihan-pilihan:\n"
-"  -a, --all                     laporkan status kata sandi untuk semua akun\n"
-"  -d, --delete                  hapus password untuk pengguna yang "
-"diberikan\n"
-"  -e, --expire                  paksakan kadaluarsa kata sandi untuk akun\n"
-"                                pengguna\n"
-"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
-"  -k, --keep-tokens             ganti kata sandi hanya bila telah "
-"kadaluarsa\n"
-"  -i, --inactive INAKTIF        atur masa inaktif kata sandi setelah\n"
-"                                kadaluarsa pada INAKTIF\n"
-"  -l, --lock                    blok akun pengguna\n"
-"  -n, --mindays HARI_MIN        atur jumlah hari minimum sebelum kata sandi\n"
-"                                diganti pada HARI_MIN\n"
-"  -q, --quiet                   mode tenang\n"
-"  -r, --repository REPOSITORI   ubah kata sandi pada repositori REPOSITORI\n"
-"  -S, --status                  laporkan status kata sandi dari akun "
-"pengguna\n"
-"  -u, --unlock                  buka bloking akun pengguna\n"
-"  -w, --warndays HARI           atur hari peringatan kadaluarsa pada HARI\n"
-"  -x, --maxdays HARI_MAKS       atur jumlah hari maksimum sebelum kata "
-"sandi\n"
-"                                diganti pada HARI_MAKS\n"
-"\n"
 
 msgid "Old password: "
 msgstr "Kata sandi lama: "
@@ -1517,19 +1533,24 @@
 msgstr "Peringatan Kadaluarsanya Kata Sandi"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Penggunaan: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "Penggunaan: %s [input]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Penggunaan: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s dan -r tidak kompatible\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Penggunaan: %s [input]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1612,11 +1633,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: tidak dapat membuka berkas %s\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "Penggunaan: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1626,11 +1642,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "Penggunaan: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Akses su untuk account itu DITOLAK.\n"
 
@@ -1698,32 +1709,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: mesti dijalankan dari sebuah terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Diabaikan)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: kesalahan %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Id tak dikenal: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Anda tak diperbolehkan untuk su %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(Masukkan kata sandi anda sendiri)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Diabaikan)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1734,9 +1733,29 @@
 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"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Tak ada entri kata sandi untuk 'root'"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: mesti dijalankan dari sebuah terminal\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: kesalahan %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: tak dapat mengubah nama direktori %s menjadi %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Tidak dapat menjalankan %s"
+
 msgid "No password file"
 msgstr "Tak ada berkas kata sandi"
 
@@ -1781,7 +1800,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: ubah nama: %s"
 
 #, fuzzy, c-format
@@ -1796,6 +1815,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "Penggunaan: %s [input]\n"
@@ -1913,10 +1934,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -1980,17 +1997,23 @@
 "Tak menyalin berkas apapun dari direktori skel ke situ.\n"
 
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: tidak dapat mengubah pengguna '%s' pada klien NIS.\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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"
@@ -1999,6 +2022,10 @@
 "lain.\n"
 
 #, fuzzy, c-format
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: direktori rumah `%s' tak sah\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: perhatian: tak dapat menghapus "
@@ -2030,10 +2057,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: pengguna %s merupakan pengguna NIS\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: %s home directory (%s) not found\n"
 msgstr "%s: direktori rumah `%s' tak sah\n"
@@ -2046,57 +2069,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: kesalahan saat menghapus direktori %s\n"
 
-#, fuzzy, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Penggunaan: usermod [pilihan-pilihan] NAMA-LOGIN\n"
-"\n"
-"Pilihan-pilihan:\n"
-"  -a, --append GRUP             tambahkan pengguna ke grup tambahan GRUP\n"
-"  -c, --comment KOMENTAR        nilai baru dari ruas GECOS\n"
-"  -d, --home DIR_RUMAH          direktori rumah baru dari pengguna baru\n"
-"  -e, --expiredate TANGGAL      atur tanggal kadaluarsa akun pada TANGGAL\n"
-"  -f, --inactive INAKTIF        atur masa inaktif setelah kadaluarsa\n"
-"                                pada INAKTIF\n"
-"  -g, --gid GRUP                paksakan GRUP sebagai grup login awalan\n"
-"  -G, --groups GRUP-GRUP        daftar grup-grup tambahan\n"
-"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
-"  -l, --login LOGIN             nilai baru dari nama pengguna\n"
-"  -L, --lock                    blok akun pengguna\n"
-"  -m, --move-home               pindahkan isi direktori rumah ke lokasi "
-"baru\n"
-"                                (hanya gunakan dengan -d)\n"
-"  -o, --non-unique              perbolehkan UID terduplikasi (tak-unik)\n"
-"  -p, --password PASSWORD       gunakan kata sandi baru yang terenkripsi\n"
-"  -s, --shell SHELL             shell login baru bagi pengguna\n"
-"  -u, --uid UID                 UID baru untuk pengguna\n"
-"  -U, --unlock                  buka bloking pengguna\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2113,19 +2138,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: pengguna %s telah ada\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: tidak dapat membuka berkas %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: tak diberikan tanda-tanda/bendera\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: diperlukan kata sandi bayangan untuk -e dan -f\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr ""
 
@@ -2191,9 +2217,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2275,8 +2298,313 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: direktori awal `%s' tak sah\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) gagal\n"
+
 #, fuzzy
 #~| msgid ""
+#~| "Usage: chage [options] [LOGIN]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+#~| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -l, --list                    show account aging information\n"
+#~| "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~| "password\n"
+#~| "                                change to MIN_DAYS\n"
+#~| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~| "password\n"
+#~| "                                change to MAX_DAYS\n"
+#~| "  -W, --warndays WARN_DAYS      set expiration warning days to "
+#~| "WARN_DAYS\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Penggunaan: chage [pilihan-pilihan] [NAMA-LOGIN]\n"
+#~ "\n"
+#~ "Pilihan-pilihan:\n"
+#~ "  -d, --lastday LAST_DAY        atur pergantian password terakhir pada "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  atur kadaluarsa akun pada tanggal\n"
+#~ "                                EXPIRE_DATE\n"
+#~ "  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+#~ "  -I, --inactive INACTIVE       atur masa inaktif kata sandi setelah\n"
+#~ "                                kadaluarsa pada INACTIVE\n"
+#~ "  -l, --list                    tampilkan informasi umur akun\n"
+#~ "  -m, --mindays MIN_DAYS        atur jumlah hari minimum sebelum kata "
+#~ "sandi\n"
+#~ "                                diganti menjadi MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        atur jumlah hari maksimum sebelum kata "
+#~ "sandi\n"
+#~ "                                diganti menjadi MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      atur hari peringatan kadaluarsa menjadi\n"
+#~ "                                WARN_DAYS\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: Otentikasi PAM gagal\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Penggunaan: %s [-f nama_lkp] [-r no_ruang] [-w telp_ktr]\n"
+#~ "\t[-h telp_rmh] [-o lain_lain] [pengguna]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Penggunaan: %s [-f nama_lkp] [-r no_ruang] [-w telp_ktr] [-h telp_rmh]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Penggunaan: chpasswd [pilihan-pilihan]\n"
+#~ "\n"
+#~ "Pilihan-pilihan:\n"
+#~ "  -e, --encrypted               kata sandi yang diberikan telah "
+#~ "terenkripsi\n"
+#~ "  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+#~ "  -m, --md5                     gunakan enkripsi MD5 daripada DES bila "
+#~ "kata\n"
+#~ "                                sandi yang diberikan tak terenkripsi\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Penggunaan: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: tidak dapat membuka berkas %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Penggunaan: groupdel grup\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Penggunaan: %s [-r] [-s] [grup [gbayangan]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Penggunaan: %s [-r] [-s] [grup]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s dan -r tidak kompatible\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Penggunaan: groupdel grup\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Penggunaan: groupdel grup\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Penggunaan: lastlog [pilihan-pilihan]\n"
+#~ "\n"
+#~ "Pilihan-pilihan:\n"
+#~ "  -b, --before HARI     cetak hanya record lastlog yang lebih tua dari "
+#~ "HARI\n"
+#~ "  -h, --help            tampilkan pesan bantuan ini dan keluar\n"
+#~ "  -t, --time HARI       cetak hanya record lastlog yang lebih baru dari "
+#~ "HARI\n"
+#~ "  -u, --user NAMA       cetak record lastlog untuk pengguna dengan nama "
+#~ "NAMA\n"
+#~ "\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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Penggunaan: passwd [pilihan-pilihan] [nama-pengguna]\n"
+#~ "\n"
+#~ "Pilihan-pilihan:\n"
+#~ "  -a, --all                     laporkan status kata sandi untuk semua "
+#~ "akun\n"
+#~ "  -d, --delete                  hapus password untuk pengguna yang "
+#~ "diberikan\n"
+#~ "  -e, --expire                  paksakan kadaluarsa kata sandi untuk "
+#~ "akun\n"
+#~ "                                pengguna\n"
+#~ "  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+#~ "  -k, --keep-tokens             ganti kata sandi hanya bila telah "
+#~ "kadaluarsa\n"
+#~ "  -i, --inactive INAKTIF        atur masa inaktif kata sandi setelah\n"
+#~ "                                kadaluarsa pada INAKTIF\n"
+#~ "  -l, --lock                    blok akun pengguna\n"
+#~ "  -n, --mindays HARI_MIN        atur jumlah hari minimum sebelum kata "
+#~ "sandi\n"
+#~ "                                diganti pada HARI_MIN\n"
+#~ "  -q, --quiet                   mode tenang\n"
+#~ "  -r, --repository REPOSITORI   ubah kata sandi pada repositori "
+#~ "REPOSITORI\n"
+#~ "  -S, --status                  laporkan status kata sandi dari akun "
+#~ "pengguna\n"
+#~ "  -u, --unlock                  buka bloking akun pengguna\n"
+#~ "  -w, --warndays HARI           atur hari peringatan kadaluarsa pada "
+#~ "HARI\n"
+#~ "  -x, --maxdays HARI_MAKS       atur jumlah hari maksimum sebelum kata "
+#~ "sandi\n"
+#~ "                                diganti pada HARI_MAKS\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Penggunaan: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Penggunaan: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Penggunaan: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Penggunaan: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Id tak dikenal: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Tak ada shell\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: pengguna %s saat ini sedang login\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Penggunaan: usermod [pilihan-pilihan] NAMA-LOGIN\n"
+#~ "\n"
+#~ "Pilihan-pilihan:\n"
+#~ "  -a, --append GRUP             tambahkan pengguna ke grup tambahan GRUP\n"
+#~ "  -c, --comment KOMENTAR        nilai baru dari ruas GECOS\n"
+#~ "  -d, --home DIR_RUMAH          direktori rumah baru dari pengguna baru\n"
+#~ "  -e, --expiredate TANGGAL      atur tanggal kadaluarsa akun pada "
+#~ "TANGGAL\n"
+#~ "  -f, --inactive INAKTIF        atur masa inaktif setelah kadaluarsa\n"
+#~ "                                pada INAKTIF\n"
+#~ "  -g, --gid GRUP                paksakan GRUP sebagai grup login awalan\n"
+#~ "  -G, --groups GRUP-GRUP        daftar grup-grup tambahan\n"
+#~ "  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+#~ "  -l, --login LOGIN             nilai baru dari nama pengguna\n"
+#~ "  -L, --lock                    blok akun pengguna\n"
+#~ "  -m, --move-home               pindahkan isi direktori rumah ke lokasi "
+#~ "baru\n"
+#~ "                                (hanya gunakan dengan -d)\n"
+#~ "  -o, --non-unique              perbolehkan UID terduplikasi (tak-unik)\n"
+#~ "  -p, --password PASSWORD       gunakan kata sandi baru yang terenkripsi\n"
+#~ "  -s, --shell SHELL             shell login baru bagi pengguna\n"
+#~ "  -u, --uid UID                 UID baru untuk pengguna\n"
+#~ "  -U, --unlock                  buka bloking pengguna\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: tak diberikan tanda-tanda/bendera\n"
+
+#, fuzzy
+#~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
 #~| "Options:\n"
@@ -2793,9 +3121,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/it.po
===================================================================
--- upstream/trunk/po/it.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/it.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\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"
@@ -59,6 +59,14 @@
 "errore di configurazione: oggetto «%s» sconosciuto (avvisare "
 "l'amministratore)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Password: "
 
@@ -248,6 +256,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "impossibile cambiare il proprietario della casella di posta"
+
+#, fuzzy, c-format
 #| msgid "Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "Impossibile ottenere un UID univoco (nessun UID disponibile)\n"
@@ -336,6 +349,33 @@
 msgstr "Password sbagliata per %s\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: telefono di casa «%s» non valido\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: impossibile creare la directory %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: impossibile creare la directory %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -365,69 +405,70 @@
 msgid "Unable to determine your tty name."
 msgstr "Impossibile determinare il nome del terminale."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) non riuscita\n"
-
 msgid "No"
 msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Uso: chage [OPZIONI] [LOGIN]\n"
-"\n"
-"Opzioni:\n"
-"  -d, --lastday ULTIMO_CAMBIO   imposta la data dell'ULTIMO_CAMBIO della\n"
-"                                password\n"
-"  -E, --expiredate SCADENZA     imposta la data di SCADENZA dell'account\n"
-"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
-"  -i, --inactive INATTIVITÀ     imposta il numero di giorni di INATTIVITÀ\n"
-"                                della password oltre la sua scadenza\n"
-"  -l, --list                    mostra le informazioni sulla durata\n"
-"                                dell'account\n"
-"  -m, --mindays MINIMO          imposta a il numero MINIMO di giorni tra i\n"
-"                                cambi di password\n"
-"  -M, --maxdays MASSIMO         imposta il numero MASSIMO di giorni tra i\n"
-"                                cambi di password\n"
-"  -w, --warndays PREAVVISO      imposta il numero di giorni di PREAVVISO\n"
-"                                prima della scadenza della password\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Inserire il nuovo valore o premere INVIO per quello predefinito"
@@ -500,9 +541,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "Cannot lock the password file; try again later.\n"
@@ -529,10 +571,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: manca il file delle shadow password\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: user `%s' does not exist\n"
 msgid "%s: user '%s' does not exist in %s\n"
@@ -546,20 +584,31 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: errore nel cambiare i campi\n"
 
-# NdT: L'output è allineato se "%s" == "chfn".
 #, c-format
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Uso: %s [-f NOME_COMPLETO] [-r NUM_STANZA] [-w TEL_LAVORO]\n"
-"          [-h TEL_CASA] [-o ALTRO] [UTENTE]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Uso: %s [-f NOME_COMPLETO] [-r NUM_STANZA] [-w TEL_LAVORO] [-h TEL_CASA]\n"
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Nome completo"
 
@@ -642,22 +691,25 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Uso: %s [OPZIONI]\n"
-"\n"
-"Opzioni:\n"
-"  -c, --crypt-method            il metodo di cifratura (uno di %s)\n"
-"  -e, --encrypted               le password fornite sono cifrate\n"
-"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
-"  -m, --md5                     cifra la password in chiaro usando\n"
-"                                l'algoritmo MD5\n"
-"%s\n"
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -701,34 +753,6 @@
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: rilevato un errore; le modifiche vengono ignorate\n"
 
-#, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
-"                                algoritmi di cifratura SHA*\n"
-
 #, fuzzy, c-format
 #| msgid "%s: user `%s' does not exist\n"
 msgid "%s: (line %d, user %s) password not changed\n"
@@ -739,20 +763,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: l'utente «%s» non esiste\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Uso: chsh [OPZIONI] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
-"  -s, --shell SHELL             nuova shell di login per l'utente\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "Shell di login"
@@ -785,9 +797,30 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: attenzione: %s non appartiene a %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Uso: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: le opzioni %s e %s sono mutuamente esclusive\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: argomento «%s» non previsto\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -814,9 +847,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: impossibile creare la directory %s\n"
 
 # NdT: Vedere faillog(5) per il significato dei campi. Il campo "On"
 # è il device tty su cui è avvenuto l'ultimo accesso fallito.
@@ -834,33 +868,32 @@
 msgid " [%lds lock]"
 msgstr " [%lds blocco]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: impossibile creare la directory %s\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: impossibile creare la directory %s\n"
 
 #, fuzzy, c-format
 #| msgid "Unknown user or range: %s\n"
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "Utente o intervallo «%s» sconosciuto\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"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: impossibile rinominare la directory %s in %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -873,6 +906,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -1014,8 +1050,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "Membro già esistente\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Uso: groupdel GRUPPO\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: impossibile determinare il proprio nome utente.\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1129,16 +1167,39 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: utente «%s» sconosciuto\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
 msgstr "Uso: %s [-r] [-s] [GRUPPO [GSHADOW]]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [-r] [-s] [group]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
 msgstr "Uso: %s [-r] [-s] [GRUPPO]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s e -r sono incompatibili\n"
 
 msgid "invalid group file entry"
@@ -1208,16 +1269,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: nessuna modifica\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "Uso: groupdel GRUPPO\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "Uso: groupdel GRUPPO\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1233,30 +1284,16 @@
 msgstr " gruppi="
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Uso: lastlog [OPZIONI]\n"
-"\n"
-"Opzioni:\n"
-"  -b, --before GIORNI           mostra solo i record di ultimo accesso più\n"
-"                                vecchi di un numero di GIORNI\n"
-"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
-"  -t, --time GIORNI             mostra solo i record di ultimo accesso più\n"
-"                                recenti di un numero di GIORNI\n"
-"  -u, --user LOGIN              mostra il record di ultimo accesso per\n"
-"                                l'utente specificato da LOGIN\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1269,14 +1306,6 @@
 msgstr "**Nessun accesso effettuato**"
 
 #, 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"
 
@@ -1350,6 +1379,11 @@
 msgid "Login incorrect"
 msgstr "Login non corretto"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: riga %d: impossibile trovare l'utente %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1477,85 +1511,77 @@
 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"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Uso: passwd [OPZIONI] [LOGIN]\n"
-"\n"
-"Opzioni:\n"
-"  -a, --all                     mostra lo stato delle password di tutti gli\n"
-"                                account\n"
-"  -d, --delete                  elimina la password dell'account "
-"specificato\n"
-"  -e, --expire                  segna come scaduta la password dell'account\n"
-"                                specificato\n"
-"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
-"  -k, --keep-tokens             cambia la password solo se è scaduta\n"
-"  -i, --inactive INATTIVITÀ     imposta il numero di giorni di INATTIVITÀ\n"
-"                                della password oltre la sua scadenza\n"
-"  -l, --lock                    blocca l'account specificato\n"
-"  -n, --mindays MINIMO          imposta a il numero MINIMO di giorni tra i\n"
-"                                cambi di password\n"
-"  -q, --quiet                   opera in modalità silenziosa\n"
-"  -r, --repository REPOSITORY   cambia la password nel REPOSITORY\n"
-"                                specificato\n"
-"  -S, --status                  mostra lo stato della password dell'account\n"
-"                                specificato\n"
-"  -u, --unlock                  sblocca l'account specificato\n"
-"  -w, --warndays PREAVVISO      imposta il numero di giorni di PREAVVISO\n"
-"                                prima della scadenza della password\n"
-"  -x, --maxdays MASSIMO         imposta il numero MASSIMO di giorni tra i\n"
-"                                cambi di password\n"
-"\n"
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
 
 msgid "Old password: "
 msgstr "Vecchia password: "
@@ -1646,17 +1672,22 @@
 
 #, fuzzy, c-format
 #| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
 msgstr "Uso: %s [-q] [-r] [-s] [PASSWD [SHADOW]]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
 msgstr "Uso: %s [-q] [-r] [-s] [PASSWD [SHADOW]]\n"
 
-#, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s e -r sono incompatibili\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1740,11 +1771,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: impossibile aprire il file %s\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "Uso: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1754,11 +1780,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "Uso: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "L'accesso all'account tramite «su» è NEGATO.\n"
 
@@ -1824,32 +1845,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: si deve avviare da un terminale\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ignorato)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: errore %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Id «%s» sconosciuto\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Non si è autorizzati a diventare %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(Immettere la propria password)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ignorato)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1860,9 +1869,29 @@
 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"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Manca una voce per «root» nel file delle password"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: si deve avviare da un terminale\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: errore %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: impossibile rinominare la directory %s in %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Impossibile eseguire %s"
+
 msgid "No password file"
 msgstr "Manca il file delle password"
 
@@ -1907,7 +1936,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: rename: %s"
 
 #, c-format
@@ -1921,6 +1950,8 @@
 #, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -2074,10 +2105,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: le opzioni %s e %s sono mutuamente esclusive\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -2143,26 +2170,33 @@
 "%s: attenzione: la directory home esiste già.\n"
 "Non verrà copiato nessun file dalla directory skel.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Uso: userdel [OPZIONI] LOGIN\n"
-"\n"
-"Options:\n"
-"  -f, --force                   rimuove comunuque i file, anche se non\n"
-"                                appartengono all'utente\n"
-"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
-"  -r, --remove                  rimuove directory home e spool di posta\n"
-"\n"
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid ""
+"%s: group %s not removed because it is not 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: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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"
@@ -2171,6 +2205,11 @@
 "altro utente.\n"
 
 #, fuzzy, c-format
+#| msgid "%s: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: directory home «%s» non valida\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: attenzione: impossibile rimuovere "
@@ -2202,10 +2241,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: l'utente %s è un utente NIS\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: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2221,90 +2256,83 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: errore nel rimuovere la directory %s\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: usermod [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --comment COMMENT         new value of the GECOS field\n"
-#| "  -d, --home HOME_DIR           new home directory for the user account\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP as new primary group\n"
-#| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-#| "  -a, --append                  append the user to the supplemental "
-#| "GROUPS\n"
-#| "                                mentioned by the -G option without "
-#| "removing\n"
-#| "                                him/her from other groups\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --login NEW_LOGIN         new value of the login name\n"
-#| "  -L, --lock                    lock the user account\n"
-#| "  -m, --move-home               move contents of the home directory to "
-#| "the\n"
-#| "                                new location (use only with -d)\n"
-#| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new "
-#| "password\n"
-#| "  -s, --shell SHELL             new login shell for the user account\n"
-#| "  -u, --uid UID                 new UID for the user account\n"
-#| "  -U, --unlock                  unlock the user account\n"
-#| "\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Uso: usermod [OPZIONI] LOGIN\n"
-"\n"
-"Opzioni:\n"
-"  -c, --comment COMMENTO        imposta il nuovo valore del campo GECOS\n"
-"  -d, --home DIR_HOME           imposta la nuova directory home dell'utente\n"
-"  -e, --expiredate SCADENZA     imposta la data di SCADENZA dell'account\n"
-"  -f, --inactive INATTIVITÀ     imposta il numero di giorni di INATTIVITÀ\n"
-"                                della password oltre la sua scadenza\n"
-"  -g, --gid GRUPPO              impone l'uso di GRUPPO come nuovo gruppo\n"
-"iniziale\n"
-"  -G, --groups GRUPPI           nuovo elenco di GRUPPI aggiuntivi\n"
-"  -a, --append                  aggiunge l'utente a ulteriori GRUPPI\n"
-"                                specificati dall'opzione -G senza\n"
-"                                rimuoverlo da altri gruppi\n"
-"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
-"  -l, --login NUOVO_LOGIN       imposta il nuovo nome di login dell'utente\n"
-"  -L, --lock                    blocca l'account dell'utente\n"
-"  -m, --move-home               sposta il contenuto della directory home\n"
-"                                nella nuova posizione (usare solo con -d)\n"
-"  -o, --non-unique              permette di usare un UID duplicato (non\n"
-"                                univoco)\n"
-"  -p, --password PASSWORD       imposta la nuova PASSWORD cifrata\n"
-"  -s, --shell SHELL             la nuova shell di login dell'utente\n"
-"  -u, --uid UID                 imposta il nuovo UID dell'utente\n"
-"  -U, --unlock                  sblocca l'account dell'utente\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2327,18 +2355,19 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: l'utente «%s» esiste già\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: impossibile aprire il file %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: non è stata fornita nessuna opzione\n"
+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: shadow passwords required for -e and -f\n"
 msgstr "%s: le shadow password sono necessarie per le opzioni -e e -f\n"
 
-#, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr "%s: i flag -L, -p e -U sono mutuamente esclusivi\n"
-
 #, fuzzy, c-format
 #| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
@@ -2413,9 +2442,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2500,8 +2526,403 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: directory di base «%s» non valida\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) non riuscita\n"
+
 #, fuzzy
 #~| msgid ""
+#~| "Usage: chage [options] [LOGIN]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+#~| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -l, --list                    show account aging information\n"
+#~| "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~| "password\n"
+#~| "                                change to MIN_DAYS\n"
+#~| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~| "password\n"
+#~| "                                change to MAX_DAYS\n"
+#~| "  -W, --warndays WARN_DAYS      set expiration warning days to "
+#~| "WARN_DAYS\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: chage [OPZIONI] [LOGIN]\n"
+#~ "\n"
+#~ "Opzioni:\n"
+#~ "  -d, --lastday ULTIMO_CAMBIO   imposta la data dell'ULTIMO_CAMBIO della\n"
+#~ "                                password\n"
+#~ "  -E, --expiredate SCADENZA     imposta la data di SCADENZA dell'account\n"
+#~ "  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+#~ "  -i, --inactive INATTIVITÀ     imposta il numero di giorni di "
+#~ "INATTIVITÀ\n"
+#~ "                                della password oltre la sua scadenza\n"
+#~ "  -l, --list                    mostra le informazioni sulla durata\n"
+#~ "                                dell'account\n"
+#~ "  -m, --mindays MINIMO          imposta a il numero MINIMO di giorni tra "
+#~ "i\n"
+#~ "                                cambi di password\n"
+#~ "  -M, --maxdays MASSIMO         imposta il numero MASSIMO di giorni tra "
+#~ "i\n"
+#~ "                                cambi di password\n"
+#~ "  -w, --warndays PREAVVISO      imposta il numero di giorni di PREAVVISO\n"
+#~ "                                prima della scadenza della password\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: autenticazione PAM non riuscita\n"
+
+# NdT: L'output è allineato se "%s" == "chfn".
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Uso: %s [-f NOME_COMPLETO] [-r NUM_STANZA] [-w TEL_LAVORO]\n"
+#~ "          [-h TEL_CASA] [-o ALTRO] [UTENTE]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Uso: %s [-f NOME_COMPLETO] [-r NUM_STANZA] [-w TEL_LAVORO] [-h TEL_CASA]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Uso: %s [OPZIONI]\n"
+#~ "\n"
+#~ "Opzioni:\n"
+#~ "  -c, --crypt-method            il metodo di cifratura (uno di %s)\n"
+#~ "  -e, --encrypted               le password fornite sono cifrate\n"
+#~ "  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+#~ "  -m, --md5                     cifra la password in chiaro usando\n"
+#~ "                                l'algoritmo MD5\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: chsh [OPZIONI] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+#~ "  -s, --shell SHELL             nuova shell di login per l'utente\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Uso: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: impossibile aprire il file %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Uso: groupdel GRUPPO\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s e -r sono incompatibili\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Uso: groupdel GRUPPO\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Uso: groupdel GRUPPO\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: lastlog [OPZIONI]\n"
+#~ "\n"
+#~ "Opzioni:\n"
+#~ "  -b, --before GIORNI           mostra solo i record di ultimo accesso "
+#~ "più\n"
+#~ "                                vecchi di un numero di GIORNI\n"
+#~ "  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+#~ "  -t, --time GIORNI             mostra solo i record di ultimo accesso "
+#~ "più\n"
+#~ "                                recenti di un numero di GIORNI\n"
+#~ "  -u, --user LOGIN              mostra il record di ultimo accesso per\n"
+#~ "                                l'utente specificato da LOGIN\n"
+#~ "\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: passwd [OPZIONI] [LOGIN]\n"
+#~ "\n"
+#~ "Opzioni:\n"
+#~ "  -a, --all                     mostra lo stato delle password di tutti "
+#~ "gli\n"
+#~ "                                account\n"
+#~ "  -d, --delete                  elimina la password dell'account "
+#~ "specificato\n"
+#~ "  -e, --expire                  segna come scaduta la password "
+#~ "dell'account\n"
+#~ "                                specificato\n"
+#~ "  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+#~ "  -k, --keep-tokens             cambia la password solo se è scaduta\n"
+#~ "  -i, --inactive INATTIVITÀ     imposta il numero di giorni di "
+#~ "INATTIVITÀ\n"
+#~ "                                della password oltre la sua scadenza\n"
+#~ "  -l, --lock                    blocca l'account specificato\n"
+#~ "  -n, --mindays MINIMO          imposta a il numero MINIMO di giorni tra "
+#~ "i\n"
+#~ "                                cambi di password\n"
+#~ "  -q, --quiet                   opera in modalità silenziosa\n"
+#~ "  -r, --repository REPOSITORY   cambia la password nel REPOSITORY\n"
+#~ "                                specificato\n"
+#~ "  -S, --status                  mostra lo stato della password "
+#~ "dell'account\n"
+#~ "                                specificato\n"
+#~ "  -u, --unlock                  sblocca l'account specificato\n"
+#~ "  -w, --warndays PREAVVISO      imposta il numero di giorni di PREAVVISO\n"
+#~ "                                prima della scadenza della password\n"
+#~ "  -x, --maxdays MASSIMO         imposta il numero MASSIMO di giorni tra "
+#~ "i\n"
+#~ "                                cambi di password\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Uso: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Uso: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Id «%s» sconosciuto\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Nessuna shell\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: userdel [OPZIONI] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   rimuove comunuque i file, anche se non\n"
+#~ "                                appartengono all'utente\n"
+#~ "  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+#~ "  -r, --remove                  rimuove directory home e spool di posta\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: l'utente %s è attualmente collegato\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Usage: usermod [options] LOGIN\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~| "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~| "  -a, --append                  append the user to the supplemental "
+#~| "GROUPS\n"
+#~| "                                mentioned by the -G option without "
+#~| "removing\n"
+#~| "                                him/her from other groups\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~| "  -L, --lock                    lock the user account\n"
+#~| "  -m, --move-home               move contents of the home directory to "
+#~| "the\n"
+#~| "                                new location (use only with -d)\n"
+#~| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~| "  -p, --password PASSWORD       use encrypted password for the new "
+#~| "password\n"
+#~| "  -s, --shell SHELL             new login shell for the user account\n"
+#~| "  -u, --uid UID                 new UID for the user account\n"
+#~| "  -U, --unlock                  unlock the user account\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Uso: usermod [OPZIONI] LOGIN\n"
+#~ "\n"
+#~ "Opzioni:\n"
+#~ "  -c, --comment COMMENTO        imposta il nuovo valore del campo GECOS\n"
+#~ "  -d, --home DIR_HOME           imposta la nuova directory home "
+#~ "dell'utente\n"
+#~ "  -e, --expiredate SCADENZA     imposta la data di SCADENZA dell'account\n"
+#~ "  -f, --inactive INATTIVITÀ     imposta il numero di giorni di "
+#~ "INATTIVITÀ\n"
+#~ "                                della password oltre la sua scadenza\n"
+#~ "  -g, --gid GRUPPO              impone l'uso di GRUPPO come nuovo gruppo\n"
+#~ "iniziale\n"
+#~ "  -G, --groups GRUPPI           nuovo elenco di GRUPPI aggiuntivi\n"
+#~ "  -a, --append                  aggiunge l'utente a ulteriori GRUPPI\n"
+#~ "                                specificati dall'opzione -G senza\n"
+#~ "                                rimuoverlo da altri gruppi\n"
+#~ "  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+#~ "  -l, --login NUOVO_LOGIN       imposta il nuovo nome di login "
+#~ "dell'utente\n"
+#~ "  -L, --lock                    blocca l'account dell'utente\n"
+#~ "  -m, --move-home               sposta il contenuto della directory home\n"
+#~ "                                nella nuova posizione (usare solo con -"
+#~ "d)\n"
+#~ "  -o, --non-unique              permette di usare un UID duplicato (non\n"
+#~ "                                univoco)\n"
+#~ "  -p, --password PASSWORD       imposta la nuova PASSWORD cifrata\n"
+#~ "  -s, --shell SHELL             la nuova shell di login dell'utente\n"
+#~ "  -u, --uid UID                 imposta il nuovo UID dell'utente\n"
+#~ "  -U, --unlock                  sblocca l'account dell'utente\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: non è stata fornita nessuna opzione\n"
+
+#, fuzzy
+#~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
 #~| "Options:\n"
@@ -3098,9 +3519,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/ja.po
===================================================================
--- upstream/trunk/po/ja.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/ja.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2011-04-06 11:18+0900\n"
 "Last-Translator: NAKANO Takeo <nakano at webmasters.gr.jp>\n"
 "Language-Team: Japanese\n"
@@ -39,6 +39,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "設定エラー: 不明な項目 '%s' (管理者に連絡してください)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "パスワード: "
 
@@ -207,6 +215,11 @@
 "(%lu)\n"
 msgstr "%s: 設定が不正: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%lu)\n"
 
+#, fuzzy, c-format
+#| msgid "failed to allocate memory"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "メモリ割当に失敗しました"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr ""
@@ -296,6 +309,33 @@
 msgstr "%s のパスワードが正しくありません。\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: 特権を落とせませんでした (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: 自宅電話番号が不正です: '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot create directory %s: %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: ディレクトリ %s を作成できません: %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Failed to create tcb directory for %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: %s の tcb ディレクトリの作成に失敗しました\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -325,46 +365,78 @@
 msgid "Unable to determine your tty name."
 msgstr "あなたの端末 (tty) 名を決定できません。"
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) に失敗しました\n"
-
 msgid "No"
 msgstr "No"
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"使い方: %s [オプション] LOGIN\n"
+"\n"
+"オプション:\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "  -e, --expiredate EXPIRE_DATE  新アカウントの期限切れ日付\n"
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr "  -h, --help                    このヘルプを表示して終了する\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -p, --password PASSWORD       パスワードをこの (暗号化された) PASSWORD\n"
+"                                に変更する\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr "  -r, --reset                   ログイン失敗のカウンタをリセットする\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir HOME_DIR       新アカウントのホームディレクトリ\n"
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"使い方: chage [オプション] [ログイン名]\n"
-"\n"
-"オプション\n"
-"  -d, --lastday LAST_DAY        パスワードの最終変更日を LAST_DAY にする\n"
-"  -E, --expiredate EXPIRE_DATE  アカウント期限切れの日を EXPIRE_DATE にする\n"
-"  -h, --help                    このヘルプを表示して終了する\n"
-"  -I, --inactive INACTIVE       パスワードを期限切れ後に無効化する日数を\n"
-"                                INACTIVEにする\n"
-"  -l, --list                    アカウントの経時情報を表示する\n"
-"  -m, --mindays MIN_DAYS        パスワードが変更できるまでの最短日数を\n"
-"                                MIN_DAYS に変更する\n"
-"  -M, --maxdays MAX_DAYS        パスワードが変更できる期間の最長日数を\n"
-"                                MAX_DAYS に変更する\n"
-"  -W, --warndays WARN_DAYS      期限切れ警告の日数を WARN_DAYS にする\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr ""
@@ -438,9 +510,10 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: あなたのユーザ名を判定できません。\n"
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr "%s: PAM 認証に失敗しました\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -463,10 +536,6 @@
 msgstr "%s: シャドウパスワードファイルがありません\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: 特権を落とせませんでした (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: ユーザ %s は %s に存在しません\n"
 
@@ -478,18 +547,40 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: フィールド変更の際にエラーが起きました\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"使い方: %s [-f フルネーム] [-r 部屋番号] [-w 職場TEL]\n"
-"\t[-h 自宅TEL] [-o その他] [ユーザ]\n"
+"使い方: %s [オプション] LOGIN\n"
+"\n"
+"オプション:\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
-msgstr "使い方: %s [-f フルネーム] [-r 部屋番号] [-w 職場TEL] [-h 自宅TEL]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
+msgstr ""
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr "  -h, --help                    このヘルプを表示して終了する\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "フルネーム"
 
@@ -569,22 +660,24 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 "使い方: %s [オプション]\n"
 "\n"
 "オプション:\n"
-"  -c, --crypt-method            暗号化の方法 (%s のどれか)\n"
-"  -e, --encrypted               パスワードを暗号化した状態で渡す\n"
-"  -h, --help                    このヘルプメッセージを表示して終了する\n"
-"  -m, --md5                     与えたパスワードが暗号化されていない場合、\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr "  -c, --crypt-method <METHOD>   暗号化の方法 (%s のどれかひとつ)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr "  -e, --encrypted               与えたパスワードを暗号化する\n"
+
+msgid ""
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
+msgstr ""
+"  -m, --md5                     平文テキストのパスワードを\n"
 "                                MD5 アルゴリズムで暗号化する\n"
-"%s\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -625,33 +718,6 @@
 msgstr "%s: エラーが検出されました。変更は行いません\n"
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"使い方: %s [オプション]\n"
-"\n"
-"オプション:\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method <METHOD>   暗号化の方法 (%s のどれかひとつ)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr "  -e, --encrypted               与えたパスワードを暗号化する\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr "  -h, --help                    このヘルプを表示して終了する\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -m, --md5                     平文テキストのパスワードを\n"
-"                                MD5 アルゴリズムで暗号化する\n"
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: (%d 行目, ユーザ %s) パスワードは変更されませんでした\n"
 
@@ -659,20 +725,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: %d 行目: ユーザ '%s' は存在しません\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
-msgstr ""
-"使い方: chsh [オプション]\n"
-"\n"
-"オプション:\n"
-"  -h, --help                    このヘルプメッセージを表示して終了する\n"
-"  -s, --shell SHELL             ユーザのシェルを新たに SHELL にする\n"
-"\n"
+#, fuzzy
+#| msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
+msgstr "  -s, --shell SHELL             新アカウントのログインシェル\n"
 
 msgid "Login Shell"
 msgstr "ログインシェル"
@@ -701,9 +757,33 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: 警告: %s は実行可能ではありません\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "使い方: expiry {-f|-c}\n"
+#, fuzzy
+#| msgid ""
+#| "  -u, --user                    which user's tcb shadow file to edit\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr "  -u, --user                    編集する tcb shadow ファイルのユーザ\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -m, --md5                     平文テキストのパスワードを\n"
+"                                MD5 アルゴリズムで暗号化する\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: オプション %s と %s は同時に指定できません\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: この引き数は不正です: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr "  -a, --all                     全ユーザの faillog 記録を表示する\n"
 
@@ -738,9 +818,10 @@
 "                                -m, -l などを指定した場合は、指定 LOGIN\n"
 "                                についてのみ失敗カウンタや制限値を変更する\n"
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "faillog: UID %lu のエントリを取得できませんでした\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog: UID %lu のエントリを取得できませんでした\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "ログイン名  失敗     最大    最新                     場所\n"
@@ -753,31 +834,32 @@
 msgid " [%lds lock]"
 msgstr "[ロック %ld 秒]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: UID %lu の失敗回数をリセットできませんでした\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "faillog: UID %lu の最大回数を設定できませんでした\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: UID %lu のロック時間を設定できませんでした\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog: 不明なユーザまたは範囲です: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "faillog: ファイル %s を開けません: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: %s のサイズを取得できませんでした: %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: %s のサイズを取得できませんでした: %s\n"
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -793,6 +875,11 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  --d, --delete USER            USER を GROUP から削除する\n"
 
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir HOME_DIR       新アカウントのホームディレクトリ\n"
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         GROUP のパスワードを削除する\n"
 
@@ -928,8 +1015,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: GID '%lu' は既に存在します\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "使い方: groupdel グループ\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: あなたのユーザ名を判定できません。\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1038,16 +1127,51 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: ユーザ %s は不明です\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "使い方: %s [-r] [-s] [group [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"使い方: %s [オプション] [アクション]\n"
+"\n"
+"オプション:\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "使い方: %s [-r] [-s] [group]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"使い方: %s [オプション] [アクション]\n"
+"\n"
+"オプション:\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -l, --list                    グループのメンバーを表示します。\n"
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s と -r は同時に指定できません\n"
 
 msgid "invalid group file entry"
@@ -1117,12 +1241,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: 変更はありません\n"
 
-msgid "Usage: grpconv\n"
-msgstr "使い方: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "使い方: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: %s を削除できません\n"
@@ -1136,31 +1254,29 @@
 msgid " groups="
 msgstr " グループ="
 
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -t, --time DAYS               ここ DAYS 日分の faillog 記録を表示する\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr ""
+"  -t, --time DAYS               ここ DAYS 日分の faillog 記録を表示する\n"
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"使い方: lastlog [オプション]\n"
-"\n"
-"オプション:\n"
-"  -b, --before DAYS             DAYS 日より以前の lastlog 記録だけを表示す"
-"る\n"
-"  -h, --help                    このヘルプメッセージを表示して終了する\n"
-"  -t, --time DAYS               DAYS 日前以降の lastlog 記録だけを表示する\n"
-"  -u, --user LOGIN              指定ユーザ LOGIN の lastlog 記録を表示する\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: UID %lu のエントリを取得できませんでした\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "ユーザ名         ポート   場所             最近のログイン"
 
@@ -1171,14 +1287,6 @@
 msgstr "**一度もログインしていません**"
 
 #, 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 "lastlog: %s のサイズを取得できませんでした: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "使い方: %s [-p] [ユーザ名]\n"
 
@@ -1249,6 +1357,11 @@
 msgid "Login incorrect"
 msgstr "ログインが違います"
 
+#, fuzzy, c-format
+#| msgid "%s: Cannot fork user shell\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: ユーザシェルを起動できません。\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1369,52 +1482,90 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: %d 行: エントリを更新できません\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr "  -a, --all                     全ユーザの faillog 記録を表示する\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system                  システムアカウントを作成します\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system                  システムアカウントを作成します\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr "  -e, --encrypted               与えたパスワードを暗号化する\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -p, --password PASSWORD       パスワードをこの (暗号化された) PASSWORD\n"
+"                                に変更する\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr "  -u, --iud UID                 新アカウントのユーザ ID\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr "  -q, --quiet                   表示抑制モード\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system                  システムアカウントを作成します\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr "  -u, --iud UID                 新アカウントのユーザ ID\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"使い方: passwd [オプション] [ログイン名]\n"
-"\n"
-"オプション:\n"
-"  -a, --all                     全アカウントのパスワード状態をレポートする\n"
-"  -d, --delete                  指定アカウントのパスワードを削除する\n"
-"  -e, --expire                  指定アカウントのパスワードを期限切れにする\n"
-"  -h, --help                    このヘルプメッセージを表示して終了する\n"
-"  -k, --keep-tokens             期限切れの場合にのみパスワードを変更する\n"
-"  -i, --inactive INACTIVE       期限切れ後のパスワード無効化日数を\n"
-"                                INACTIVE にする\n"
-"  -l, --lock                    指定アカウントをロックする\n"
-"  -n, --mindays MIN_DAYS        パスワードが変更できるまでの最短日数を\n"
-"                                MIN_DAYS に変更する\n"
-"  -q, --quiet                   表示抑制モード\n"
-"  -r, --repository REPOSITORY   リポジトリ REPOSITORY のパスワードを変更す"
-"る\n"
-"  -S, --status                  指定アカウントのパスワードの状態を報告する\n"
-"  -u, --unlock                  指定アカウントのロックを解除する\n"
-"  -w, --warndays WARN_DAYS      期限切れ警告の日数を WARN_DAYS にする\n"
-"  -x, --maxdays MAX_DAYS        パスワードが変更できる期間の最長日数を\n"
-"                                MAX_DAYS に変更する\n"
-"\n"
+"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
 
 msgid "Old password: "
 msgstr "古いパスワード: "
@@ -1497,17 +1648,38 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: パスワード期限切れ情報を変更しました\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "使い方: %s [-q] [-r] [passwd [shadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"使い方: %s [オプション] [アクション]\n"
+"\n"
+"オプション:\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "使い方: %s [-q] [-r] [-s] [パスワード [シャドウ]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"使い方: %s [オプション] [アクション]\n"
+"\n"
+"オプション:\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s と -r は同時に指定できません\n"
+#, fuzzy
+#| msgid "  -q, --quiet                   quiet mode\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr "  -q, --quiet                   表示抑制モード\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1584,9 +1756,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: %s のエントリをソートできません\n"
 
-msgid "Usage: pwconv\n"
-msgstr "使い方: pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: tcb が有効になっていると利用できません\n"
@@ -1595,9 +1764,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: %s のモードを 0600 に変更できませんでした\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "使い方: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "このアカウントへの su アクセスは禁止されています。\n"
 
@@ -1661,18 +1827,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: 端末から実行してください\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(無視)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: エラー %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "不明な ID です: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "あなたには su %s する権限がありません\n"
 
@@ -1680,14 +1842,6 @@
 msgstr "(あなたのパスワードを入力してください)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(無視)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: 認証に失敗しました\n"
 
@@ -1695,9 +1849,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s: あなたは現時点では su する権限がありません\n"
 
-msgid "No shell\n"
-msgstr "シェルがありません\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "'root' のパスワードエントリがありません"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: 端末から実行してください\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: エラー %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot remove the content of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: %s の内容を削除できませんでした: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "%s を実行できません"
+
 msgid "No password file"
 msgstr "パスワードファイルがありません"
 
@@ -1739,8 +1913,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: %s の行が長すぎます: %s..."
 
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: ファイル名変更: %s: %s"
 
 #, c-format
@@ -1751,9 +1926,15 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: 指定したグループ数が多すぎます (最大 %d 個)。\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1883,10 +2064,6 @@
 msgstr "%s: -Z は SELinux カーネル以外では使えません\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: オプション %s と %s は同時に指定できません\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr "%s: UID %lu の faillog エントリをリセットできませんでした: %s\n"
 
@@ -1950,29 +2127,46 @@
 "%s: 警告: ホームディレクトリが既に存在します。\n"
 "skel ディレクトリからのコピーは行いません。\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -f, --force                   exit successfully if the group already "
+#| "exists,\n"
+#| "                                and cancel -g if the GID is already used\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"使い方: userdel [オプション] ログイン名\n"
-"\n"
-"オプション:\n"
-"  -f, --force                   当該ユーザの所有でないファイルも削除する\n"
-"  -h, --help                    このヘルプを表示して終了する\n"
-"  -r, --remove                  ホームディレクトリとメールスプールを削除す"
-"る\n"
-"\n"
+"  -f, --force                   グループがすでに存在していたら正常終了しま"
+"す。\n"
+"                                また GID が既に用いられていたら -g をキャンセ"
+"ル\n"
+"                                します\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr "  -r, --reset                   ログイン失敗のカウンタをリセットする\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: ユーザ '%s' のプライマリグループは削除できません。\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 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: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: %s のホームディレクトリ (%s) がありません\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: 警告: %s を削除できません: %s\n"
@@ -2002,10 +2196,6 @@
 msgstr "%s: ユーザ %s は NIS ユーザです\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: ユーザ %s は現在ログイン中です\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: %s のホームディレクトリ (%s) がありません\n"
 
@@ -2018,60 +2208,98 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: ディレクトリ %s の削除でエラーが起きました\n"
 
-#, c-format
+#, fuzzy
+#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr "  -c, --comment COMMENT         新アカウントの GECOS フィールド\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr "  -d, --home-dir HOME_DIR       新アカウントのホームディレクトリ\n"
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr "  -e, --expiredate EXPIRE_DATE  新アカウントの期限切れ日付\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -p, --password PASSWORD       パスワードをこの (暗号化された) PASSWORD\n"
+"                                に変更する\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr "  -g, --gid GID                 この新規グループに GID を用います\n"
+
+#, fuzzy
+#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr "  -M, --members USER,...        GROUP のメンバーのリストを設定する\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr "  -u, --iud UID                 新アカウントのユーザ ID\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
+#| "the\n"
+#| "                                new account\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -b, --base-dir BASE_DIR       新アカウントのホームディクトリの\n"
+"                                ベースディレクトリ\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
+#| "GID\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr "  -o, --non-unique              他と重なる GID を許可する\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       use this encrypted password for the new "
+#| "group\n"
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"使い方: usermod [オプション] ログイン名\n"
-"\n"
-"オプション:\n"
-"  -c, --comment COMMENT         GECOS フィールドの値を再設定する\n"
-"  -d, --home HOME_DIR           ユーザアカウントのホームディレクトリを\n"
-"                                再設定する\n"
-"  -e, --expiredate EXPIRE_DATE  アカウント期限切れの日を EXPIRE_DATE にする\n"
-"  -f, --inactive INACTIVE       パスワードを期限切れ後に無効化する日数を\n"
-"                                INACTIVEにする\n"
-"  -g, --gid GROUP               主グループを GROUP に変更する\n"
-"  -G, --groups GROUPS           新たな補助グループのリストを与える\n"
-"  -a, --append                  ユーザを (-G で指定された) 補助グループ群\n"
-"                                GROUPS に追加する。他のグループからの削除は\n"
-"                                行わない。\n"
-"  -h, --help                    このヘルプを表示して終了する\n"
-"  -l, --login NEW_LOGIN         ログイン名を変更する\n"
-"  -L, --lock                    このユーザアカウントをロックする\n"
-"  -m, --move-home               現ホームディレクトリの内容を新たな場所に\n"
-"                                移動する (-d が指定された場合のみ)\n"
-"  -o, --non-unique              一意でないユーザ (UID の重なるユーザ) を\n"
-"                                許可する\n"
-"  -p, --password PASSWORD       新たな暗号化済みパスワードを与える\n"
-"  -s, --shell SHELL             このユーザのログインシェルを変更する\n"
-"  -u, --uid UID                 このユーザの UID を変更する\n"
-"  -U, --unlock                  このユーザアカウントのロックを解除する\n"
-"%s\n"
+"  -p, --password PASSWORD       新規グループにこの暗号化済パスワードを用い"
+"る\n"
 
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr "  -u, --iud UID                 新アカウントのユーザ ID\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr "  -u, --iud UID                 新アカウントのユーザ ID\n"
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2093,19 +2321,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: ユーザ '%s' は既に %s に存在します\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: %s を開けません\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: ひとつもフラグが指定されていません\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr "%s: -L, -p, -U フラグは同時に指定できません\n"
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: -e および -f にはシャドウパスワードが必要です\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr "%s: -L, -p, -U フラグは同時に指定できません\n"
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr "%s: UID '%lu' は既に存在します\n"
 
@@ -2178,9 +2407,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -p, --passwd                  passwd データベースを編集する\n"
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -q, --quiet                   表示抑制モード\n"
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr "  -s, --shadow                  shadow データベースを編集する\n"
 
@@ -2238,3 +2464,308 @@
 #, c-format
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: %s の tcb ディレクトリが見付かりませんでした\n"
+
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) に失敗しました\n"
+
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "使い方: chage [オプション] [ログイン名]\n"
+#~ "\n"
+#~ "オプション\n"
+#~ "  -d, --lastday LAST_DAY        パスワードの最終変更日を LAST_DAY にする\n"
+#~ "  -E, --expiredate EXPIRE_DATE  アカウント期限切れの日を EXPIRE_DATE にす"
+#~ "る\n"
+#~ "  -h, --help                    このヘルプを表示して終了する\n"
+#~ "  -I, --inactive INACTIVE       パスワードを期限切れ後に無効化する日数を\n"
+#~ "                                INACTIVEにする\n"
+#~ "  -l, --list                    アカウントの経時情報を表示する\n"
+#~ "  -m, --mindays MIN_DAYS        パスワードが変更できるまでの最短日数を\n"
+#~ "                                MIN_DAYS に変更する\n"
+#~ "  -M, --maxdays MAX_DAYS        パスワードが変更できる期間の最長日数を\n"
+#~ "                                MAX_DAYS に変更する\n"
+#~ "  -W, --warndays WARN_DAYS      期限切れ警告の日数を WARN_DAYS にする\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM 認証に失敗しました\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "使い方: %s [-f フルネーム] [-r 部屋番号] [-w 職場TEL]\n"
+#~ "\t[-h 自宅TEL] [-o その他] [ユーザ]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "使い方: %s [-f フルネーム] [-r 部屋番号] [-w 職場TEL] [-h 自宅TEL]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "使い方: %s [オプション]\n"
+#~ "\n"
+#~ "オプション:\n"
+#~ "  -c, --crypt-method            暗号化の方法 (%s のどれか)\n"
+#~ "  -e, --encrypted               パスワードを暗号化した状態で渡す\n"
+#~ "  -h, --help                    このヘルプメッセージを表示して終了する\n"
+#~ "  -m, --md5                     与えたパスワードが暗号化されていない場"
+#~ "合、\n"
+#~ "                                MD5 アルゴリズムで暗号化する\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "使い方: chsh [オプション]\n"
+#~ "\n"
+#~ "オプション:\n"
+#~ "  -h, --help                    このヘルプメッセージを表示して終了する\n"
+#~ "  -s, --shell SHELL             ユーザのシェルを新たに SHELL にする\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "使い方: expiry {-f|-c}\n"
+
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "faillog: UID %lu のエントリを取得できませんでした\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "faillog: ファイル %s を開けません: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: %s のサイズを取得できませんでした: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "使い方: groupdel グループ\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "使い方: %s [-r] [-s] [group [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "使い方: %s [-r] [-s] [group]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s と -r は同時に指定できません\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "使い方: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "使い方: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "使い方: lastlog [オプション]\n"
+#~ "\n"
+#~ "オプション:\n"
+#~ "  -b, --before DAYS             DAYS 日より以前の lastlog 記録だけを表示す"
+#~ "る\n"
+#~ "  -h, --help                    このヘルプメッセージを表示して終了する\n"
+#~ "  -t, --time DAYS               DAYS 日前以降の lastlog 記録だけを表示す"
+#~ "る\n"
+#~ "  -u, --user LOGIN              指定ユーザ LOGIN の lastlog 記録を表示す"
+#~ "る\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\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"
+#~ "  -d, --delete                  指定アカウントのパスワードを削除する\n"
+#~ "  -e, --expire                  指定アカウントのパスワードを期限切れにす"
+#~ "る\n"
+#~ "  -h, --help                    このヘルプメッセージを表示して終了する\n"
+#~ "  -k, --keep-tokens             期限切れの場合にのみパスワードを変更する\n"
+#~ "  -i, --inactive INACTIVE       期限切れ後のパスワード無効化日数を\n"
+#~ "                                INACTIVE にする\n"
+#~ "  -l, --lock                    指定アカウントをロックする\n"
+#~ "  -n, --mindays MIN_DAYS        パスワードが変更できるまでの最短日数を\n"
+#~ "                                MIN_DAYS に変更する\n"
+#~ "  -q, --quiet                   表示抑制モード\n"
+#~ "  -r, --repository REPOSITORY   リポジトリ REPOSITORY のパスワードを変更す"
+#~ "る\n"
+#~ "  -S, --status                  指定アカウントのパスワードの状態を報告す"
+#~ "る\n"
+#~ "  -u, --unlock                  指定アカウントのロックを解除する\n"
+#~ "  -w, --warndays WARN_DAYS      期限切れ警告の日数を WARN_DAYS にする\n"
+#~ "  -x, --maxdays MAX_DAYS        パスワードが変更できる期間の最長日数を\n"
+#~ "                                MAX_DAYS に変更する\n"
+#~ "\n"
+
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "使い方: %s [-q] [-r] [passwd [shadow]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "使い方: %s [-q] [-r] [-s] [パスワード [シャドウ]]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "使い方: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "使い方: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "不明な ID です: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "シェルがありません\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "使い方: userdel [オプション] ログイン名\n"
+#~ "\n"
+#~ "オプション:\n"
+#~ "  -f, --force                   当該ユーザの所有でないファイルも削除する\n"
+#~ "  -h, --help                    このヘルプを表示して終了する\n"
+#~ "  -r, --remove                  ホームディレクトリとメールスプールを削除す"
+#~ "る\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: ユーザ %s は現在ログイン中です\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "使い方: usermod [オプション] ログイン名\n"
+#~ "\n"
+#~ "オプション:\n"
+#~ "  -c, --comment COMMENT         GECOS フィールドの値を再設定する\n"
+#~ "  -d, --home HOME_DIR           ユーザアカウントのホームディレクトリを\n"
+#~ "                                再設定する\n"
+#~ "  -e, --expiredate EXPIRE_DATE  アカウント期限切れの日を EXPIRE_DATE にす"
+#~ "る\n"
+#~ "  -f, --inactive INACTIVE       パスワードを期限切れ後に無効化する日数を\n"
+#~ "                                INACTIVEにする\n"
+#~ "  -g, --gid GROUP               主グループを GROUP に変更する\n"
+#~ "  -G, --groups GROUPS           新たな補助グループのリストを与える\n"
+#~ "  -a, --append                  ユーザを (-G で指定された) 補助グループ"
+#~ "群\n"
+#~ "                                GROUPS に追加する。他のグループからの削除"
+#~ "は\n"
+#~ "                                行わない。\n"
+#~ "  -h, --help                    このヘルプを表示して終了する\n"
+#~ "  -l, --login NEW_LOGIN         ログイン名を変更する\n"
+#~ "  -L, --lock                    このユーザアカウントをロックする\n"
+#~ "  -m, --move-home               現ホームディレクトリの内容を新たな場所に\n"
+#~ "                                移動する (-d が指定された場合のみ)\n"
+#~ "  -o, --non-unique              一意でないユーザ (UID の重なるユーザ) を\n"
+#~ "                                許可する\n"
+#~ "  -p, --password PASSWORD       新たな暗号化済みパスワードを与える\n"
+#~ "  -s, --shell SHELL             このユーザのログインシェルを変更する\n"
+#~ "  -u, --uid UID                 このユーザの UID を変更する\n"
+#~ "  -U, --unlock                  このユーザアカウントのロックを解除する\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: ひとつもフラグが指定されていません\n"

Modified: upstream/trunk/po/kk.po
===================================================================
--- upstream/trunk/po/kk.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/kk.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2011-04-05 10:17+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
@@ -39,6 +39,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "баптау қатесі - белгісіз элемент '%s' (администраторға хабарласыңыз)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Пароль: "
 
@@ -208,6 +216,11 @@
 msgstr ""
 "%s: Қате баптаулар: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%lu)\n"
 
+#, fuzzy, c-format
+#| msgid "failed to allocate memory"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "жадыны бөлу сәтсіз"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s:  Ерекше жүйелік GID алу мүмкін емес (бос GID-тар қалмады)\n"
@@ -291,6 +304,33 @@
 msgstr "%s үшін қате пароль.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: привилегиялар деңгейін төмендету мүмкін емес (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: үй телефон нөмірі қате: '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot create directory %s: %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: %s бумасын жасау мүмкін емес: %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Failed to create tcb directory for %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: %s үшін tcb бумасын жасау мүмкін емес\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -320,52 +360,80 @@
 msgid "Unable to determine your tty name."
 msgstr "Терминалыңыздың атын анықтау мүмкін емес."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "жадыдан %d байт бөлу мүмкін емес\n"
-
 msgid "No"
 msgstr "Жоқ"
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"Қолданылуы: %s [опциялар] ЛОГИН\n"
+"\n"
+"Опциялар:\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -e, --expiredate АЯҚТАЛУ_КҮНІ жаңа тіркелгінің мерзімі аяқталатын күні\n"
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr "  -h, --help                    осы көмек ақпаратын көрсету мен шығу\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -p, --password ПАРОЛЬ         парольді осы ПАРОЛЬге (шифрленген) оранту\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr "  -r, --reset                   сәтсіз кіру талап санағышын нөлдеу\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
+"                                раундтар саны\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
+"                                раундтар саны\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir ҮЙ_БУМАСЫ      жаңа тіркелгі үшін үй бумасы\n"
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Қолданылуы: chage [опциялар] [ПАЙДАЛАНУШЫ_АТЫ]\n"
-"\n"
-"Опциялар:\n"
-"  -d, --lastday LAST_DAY        парольдің аяқталу мерзімін LAST_DAY күніне "
-"орнату\n"
-"  -E, --expiredate EXPIRE_DATE  тіркелгінің аяқталу мерзімі EXPIRE_DATE "
-"күніне орнату\n"
-"  -h, --help                    осы көмек ақпаратын көрсетіп, шығу\n"
-"  -I, --inactive INACTIVE       парольдің мерзімі біткен соң оны INACTIVE "
-"болып\n"
-"                                орнату үшін өтетін күн саны\n"
-"  -l, --list                    тіркелгінің жұмыс уақыты ақпаратын көрсету\n"
-"  -m, --mindays MIN_DAYS        парольді ауыстыру арасында өту керек ең аз "
-"күн санын\n"
-"                                MIN_DAYS мәніне орнату\n"
-"  -M, --maxdays MAX_DAYS        парольді ауыстыру арасында өту керек ең көп "
-"сүн санын\n"
-"                                MAX_DAYS мәніне орнату\n"
-"  -W, --warndays WARN_DAYS      мерзімі аяқталу туралы хабарламаны WARN_DAYS "
-"күн қалғанда көрсете бастау\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Жаңа мәнді енгізіңіз, немесе ұсынылатынды қабылдау үшін ENTER басыңыз"
@@ -440,9 +508,10 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: Сіздің пайдаланушы атын анықтау мүмкін емес.\n"
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr "%s: PAM көмегімен шындылықты тексеру қатемен аяқталды\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -465,10 +534,6 @@
 msgstr "%s: көлеңкелі парольдер файлын жоқ болып тұр\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: привилегиялар деңгейін төмендету мүмкін емес (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: '%s' пайдаланушысы %s ішінде жоқ\n"
 
@@ -480,19 +545,40 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: жолдарды өзгерту қатесі\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Қолданылуы: %s [-f толықl_аты] [-r бөлме_нөмірі] [-w жұмыс_тел]\n"
-"\t[-h үй_тел] [-o басқа] [пайдаланушы аты]\n"
+"Қолданылуы: %s [опциялар] ЛОГИН\n"
+"\n"
+"Опциялар:\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Қолданылуы: %s [-f толық_аты] [-r бөлме_нөмірі] [-w жұмыс_тел] [-h үй_тел]\n"
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr "  -h, --help                    осы көмек ақпаратын көрсету мен шығу\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Толық аты"
 
@@ -572,25 +658,26 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 "Қолданылуы: %s [опциялар]\n"
 "\n"
-"Опциялары:\n"
-"  -c, --crypt-method            шифрлеу тәсіл (%s-дан біреу)\n"
-"  -e, --encrypted               шифрленген пароль енгізіледі\n"
-"  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -m, --md5                     DES орнына MD5 алгоритмін қолдану, егер "
-"пароль\n"
-"                                шифрленбеген түрде енгізілсе\n"
-"%s\n"
+"Опциялар:\n"
 
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr "  -c, --crypt-method <ТӘСІЛ>  шифрлеу тәсілі (%s ішінен біреу)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr "  -e, --encrypted               берілген парольдер шифрленген\n"
+
 msgid ""
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
+msgstr ""
+"  -m, --md5                     MD5 алгоритмін пайдаланып, таза мәтінді\n"
+"                                парольді шифрлеу\n"
+
+msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
 "                                crypt algorithms\n"
 msgstr ""
@@ -630,33 +717,6 @@
 msgstr "%s: қателер орын алды, өзгерістер сақталмады\n"
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Қолданылуы: %s [опциялар]\n"
-"\n"
-"Опциялар:\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method <ТӘСІЛ>  шифрлеу тәсілі (%s ішінен біреу)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr "  -e, --encrypted               берілген парольдер шифрленген\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr "  -h, --help                    осы көмек ақпаратын көрсету мен шығу\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -m, --md5                     MD5 алгоритмін пайдаланып, таза мәтінді\n"
-"                                парольді шифрлеу\n"
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: (жол %d, пайдаланушы %s) пароль өзгертілмеген\n"
 
@@ -664,20 +724,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: жол %d: пайдаланушы '%s' жоқ болып тұр\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
-msgstr ""
-"Қолданылуы: chsh [опциялар] [LOGIN]\n"
-"\n"
-"Опциялары:\n"
-"  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -s, --shell SHELL             пайдаланушы тіркелгісі үшін жаңа қоршам\n"
-"\n"
+#, fuzzy
+#| msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
+msgstr "  -s, --shell ҚОРШАМ            жаңа тіркелгі үшін кіру қоршамы\n"
 
 msgid "Login Shell"
 msgstr "Қоршам"
@@ -706,9 +756,35 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Ескерту: %s орындалатын емес\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Қолданылуы: expiry {-f|-c}\n"
+#, fuzzy
+#| msgid ""
+#| "  -u, --user                    which user's tcb shadow file to edit\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
+"  -u, --user                    қай пайдаланушының tcb shadow файлын түзету "
+"керек\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -m, --md5                     MD5 алгоритмін пайдаланып, таза мәтінді\n"
+"                                парольді шифрлеу\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: %s пен %s опциялары өзара ерегіседі\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: күтпеген аргумент: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 "  -a, --all                     барлық пайдаланушылар үшін faillog "
@@ -748,9 +824,10 @@
 "-r, -m,\n"
 "                                не -l бірге көрсетілсе) басқару\n"
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "faillog: UID %lu үшін жазбаны алу мүмкін емес\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog: UID %lu үшін жазбаны алу мүмкін емес\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Пайдаланушы Сәтсіз кіру саны Максимум Соңғы         Қайда\n"
@@ -763,32 +840,33 @@
 msgid " [%lds lock]"
 msgstr " [%lds оқшаулар саны]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr ""
 "faillog: UID %lu үшін сәтсіз кіру талаптар санағышын нөлдеу сәтсіз аяқталды\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "faillog: UID %lu үшін макс мәнін орнату сәтсіз аяқталды\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: UID %lu үшін блоктау уақытын орнату сәтсіз аяқталды\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog: Белгісіз пайдаланушы не аралық: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "faillog: %s ашу мүмкін емес: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: %s өлшемін алу мүмкін емес: %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: %s өлшемін алу мүмкін емес: %s\n"
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -804,6 +882,11 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete ПАЙД             ПАЙДаланушыны ТОПтан өшіру\n"
 
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir ҮЙ_БУМАСЫ      жаңа тіркелгі үшін үй бумасы\n"
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         ТОП паролін өшіру\n"
 
@@ -937,8 +1020,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: GID '%lu' бар болып тұр\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Қолданылуы: groupdel топ\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Сіздің пайдаланушы атын анықтау мүмкін емес.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1046,16 +1131,52 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: белгісіз пайдаланушы %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Қолданылуы: %s [-r] [-s] [group [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Қолданылуы: %s [опциялар] [әрекет]\n"
+"\n"
+"Опциялар:\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Қолданылуы: %s [-r] [-s] [топ]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Қолданылуы: %s [опциялар] [әрекет]\n"
+"\n"
+"Опциялар:\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
+"                                раундтар саны\n"
+
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -l, --list                    топ мүшелердің тізімін шығару\n"
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s пен -r өзара үйлеспейді\n"
 
 msgid "invalid group file entry"
@@ -1125,12 +1246,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: өзгерістер жоқ\n"
 
-msgid "Usage: grpconv\n"
-msgstr "Қолданылуы: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "Қолданылуы: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: %s өшіру мүмкін емес\n"
@@ -1144,32 +1259,30 @@
 msgid " groups="
 msgstr " топтар="
 
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -t, --time КҮН                КҮНнен кейін болған faillog жазбаларын "
+"көрсету\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Қолданылуы: lastlog [опциялар]\n"
-"\n"
-"Опциялары:\n"
-"  -b, --before КҮН             мерзімі КҮНнен үлкен ғана lastlog жазбаларын "
+"  -t, --time КҮН                КҮНнен кейін болған faillog жазбаларын "
 "көрсету\n"
-"  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -t, --time КҮН               мерзімі КҮНнен кіші ғана lastlog жазбаларын "
-"көрсету\n"
-"  -u, --user ТІРКЕЛГІ          көрсетілген ТІРКЕЛГІ үшін lastlog жазбаларын "
-"көрсету\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: UID %lu үшін жазбаны алу мүмкін емес\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
+msgstr ""
 
 msgid "Username         Port     From             Latest"
 msgstr "Пайдаланушы      Порт     Қайдан           Соңғы"
@@ -1181,14 +1294,6 @@
 msgstr "**Жүйеге ешқашан кірмеген**"
 
 #, 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 "lastlog: %s өлшемін алу мүмкін емес: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Қолданылуы: %s [-p] [аты]\n"
 
@@ -1260,6 +1365,11 @@
 msgid "Login incorrect"
 msgstr "Жүйеге кіру орындалмады"
 
+#, fuzzy, c-format
+#| msgid "%s: Cannot fork user shell\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: Пайдаланушы қоршамын іске қосу мүмкін емес\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1378,58 +1488,93 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: жол %d: жазбаны жаңарту мүмкін емес\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+"  -a, --all                     барлық пайдаланушылар үшін faillog "
+"жазбаларын көрсету\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system                  жүйелік тіркелгіні жасау\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system                  жүйелік тіркелгіні жасау\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr "  -e, --encrypted               берілген парольдер шифрленген\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -p, --password ПАРОЛЬ         парольді осы ПАРОЛЬге (шифрленген) оранту\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr "  -u, --uid UID                 жаңа тіркелгі үшін пайдаланушы ID-і\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
+"                                раундтар саны\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr "  -q, --quiet                   тыныш режимі\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system                  жүйелік тіркелгіні жасау\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr "  -u, --uid UID                 жаңа тіркелгі үшін пайдаланушы ID-і\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Қолданылуы: passwd [опциялар] [ТІРКЕЛГІ]\n"
-"\n"
-"Опциялары:\n"
-"  -a, --all                     барлық тіркелгілер үшін парольдер күйін "
-"шығару\n"
-"  -d, --delete                  көрсетілген тіркелгі үшін парольді өшіру\n"
-"  -e, --expire                  көрсетілген тіркелгі үшін пароль мерзімінің "
-"аяқталуын мәжбүрлету\n"
-"  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -k, --keep-tokens             парольді тек мерзімі аяқталса ғана өзгерту\n"
-"  -i, --inactive INACTIVE       мерзімі аяқталғаннан кейін тіркелгіні "
-"сөндіру үшін\n"
-"                                керек күн санын INACTIVE мәніне орнату\n"
-"  -l, --lock                    көрсетілген тіркелгіні оқшаулау\n"
-"  -n, --mindays MIN_DAYS        парольді өзгерту арасында ең аз рұқсат "
-"етілген күн санын\n"
-"                                MIN_DAYS мәніне орнату\n"
-"  -q, --quiet                   тыныш түрі\n"
-"  -r, --repository REPOSITORY   REPOSITORY репозиторийінде парольді өзгерту\n"
-"  -S, --status                  көрсетілген тіркелгі үшін пароль күйін "
-"шығару\n"
-"  -u, --unlock                  көрсетілген тіркелгіні оқшаулаудан босату\n"
-"  -w, --warndays WARN_DAYS      мерзімі аяқталуы туралы WARN_DAYS қалғанда "
-"ескерте бастау\n"
-"  -x, --maxdays MAX_DAYS        парольді өзгерту арасында ең көп рұқсат "
-"етілген күн санын\n"
-"                                MAX_DAYS мәніне орнату\n"
-"\n"
+"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
+"                                раундтар саны\n"
 
 msgid "Old password: "
 msgstr "Ағымдағы пароль:"
@@ -1511,17 +1656,38 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: пароль мерзімі туралы ақпарат өзгертілді.\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Қолданылуы: %s [-q] [-r] [passwd]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Қолданылуы: %s [опциялар] [әрекет]\n"
+"\n"
+"Опциялар:\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Қолданылуы: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Қолданылуы: %s [опциялар] [әрекет]\n"
+"\n"
+"Опциялар:\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s пен -r өзара үйлеспейді\n"
+#, fuzzy
+#| msgid "  -q, --quiet                   quiet mode\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr "  -q, --quiet                   тыныш режимі\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1599,9 +1765,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: %s ішіндегі жазбаралды сұрыптау мүмкін емес\n"
 
-msgid "Usage: pwconv\n"
-msgstr "Қолданылуы: pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: tcb іске қосулы болса, жұмыс істеу мүмкін емес\n"
@@ -1610,9 +1773,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: %s режимін 0600 мәніне орнату сәтсіз аяқталды\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "Қолданылуы: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Осы тіркелгі үшін su орындауға РҰҚСАТ ЖОҚ.\n"
 
@@ -1678,18 +1838,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: терминалда орындалуы керек\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Елемеу)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: қате %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Белгісіз id: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Сізде su %s жасау үшін құқығыңыз жоқ\n"
 
@@ -1697,14 +1853,6 @@
 msgstr "(Өзіңіздің пароліңізді енгізіңіз)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Елемеу)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: Аутентификация қатесі\n"
 
@@ -1712,9 +1860,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s: Сізде қазір su жасау үшін құқығыңыз жоқ\n"
 
-msgid "No shell\n"
-msgstr "Қоршам жоқ\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "'root' үшін пароль жазбасы жоқ"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: терминалда орындалуы керек\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: қате %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot remove the content of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: %s құрамасын өшіру мүмкін емес: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "%s орындау мүмкін емес"
+
 msgid "No password file"
 msgstr "Парольдер файлы жоқ"
 
@@ -1756,8 +1924,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: %s ішіндегі жол тым ұзын: %s..."
 
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: атын ауыстыру: %s: %s"
 
 #, c-format
@@ -1768,9 +1937,15 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: шектен көп топ саны көрсетілген (максимум %d).\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1906,10 +2081,6 @@
 msgstr "%s: -Z өз алдында SELinux қосулы ядроны талап етеді\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: %s пен %s опциялары өзара ерегіседі\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr "%s: %lu UID-і үшін faillog жазбасын нөлдеу сәтсіз: %s\n"
 
@@ -1971,31 +2142,46 @@
 "%s: ескерту: үй бумасы бар болып тұр.\n"
 "Оның ішіне skel бумасынан бірде-бір файл көшірілмеді.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -f, --force                   exit successfully if the group already "
+#| "exists,\n"
+#| "                                and cancel -g if the GID is already used\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Қолданылуы: userdel [опциялар] ТІРКЕЛГІ\n"
-"\n"
-"Опциялары:\n"
-"  -f, --force                   файлдарды өшіруді мәжбүрлеу,\n"
-"                                пайдаланушы иелігінде болмаса да\n"
-"  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -r, --remove                  үй бумасын мен поштасын өшіру\n"
-"\n"
+"  -f, --force                   топ бар болса сәтті шығу, ал GID қолдануда "
+"болса,\n"
+"                                -g опциясынан бас тарту\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr "  -r, --reset                   сәтсіз кіру талап санағышын нөлдеу\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: '%s' пайдаланушының басты тобын өшіру мүмкін емес\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 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: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: %s үшін үй бумасы (%s) табылмады\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: ексерту: %s өшіру мүмкін емес: %s\n"
@@ -2025,10 +2211,6 @@
 msgstr "%s: %s қазір NIS пайдаланушысы болып тұр\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: %s пайдаланушысы қазір жүйеге кіріп тұр\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: %s үшін үй бумасы (%s) табылмады\n"
 
@@ -2040,64 +2222,100 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: %s бумасын өшіру қатемен аяқталды\n"
 
-#, c-format
+#, fuzzy
+#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr "  -c, --comment COMMENT         жаңа тіркелгінің GECOS өрісі\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr "  -d, --home-dir ҮЙ_БУМАСЫ      жаңа тіркелгі үшін үй бумасы\n"
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+"  -e, --expiredate АЯҚТАЛУ_КҮНІ жаңа тіркелгінің мерзімі аяқталатын күні\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -p, --password ПАРОЛЬ         парольді осы ПАРОЛЬге (шифрленген) оранту\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr "  -g, --gid GID                 жаңа топ үшін GID қолдану\n"
+
+#, fuzzy
+#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr "  -M, --members ПАЙД,...        ТОП мүшелерін орнату\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr "  -u, --uid UID                 жаңа тіркелгі үшін пайдаланушы ID-і\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
+#| "the\n"
+#| "                                new account\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -b, --base-dir НЕГ_БУМА       жаңа тіркелгінің үй бумасы орналасатын\n"
+"                                негізгі бума\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
+#| "GID\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -o, --non-unique              қайталанатын (ерекше емес) GID қолдануға "
+"рұқсат ету\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       use this encrypted password for the new "
+#| "group\n"
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Қолданылуы: usermod [опциялар] ТІРКЕЛГІ\n"
-"\n"
-"Опциялары:\n"
-"  -c, --comment COMMENT         GECOS жазбасы үшін жаңа мәні\n"
-"  -d, --home HOME_DIR          пайдаланушы тіркелгісі үшін жаңа үй бумасы\n"
-"  -e, --expiredate EXPIRE_DATE  тіркелгінің аяқталу мерзімін EXPIRE_DATE "
-"күніне орнату\n"
-"  -f, --inactive INACTIVE       мерзімі аяқталғаннан кейін пароль "
-"сөндірілетін күн\n"
-"                                санын INACTIVE мәніне орнату\n"
-"  -g, --gid ТОП                 жаңа басыңқы топ ретінде ТОПты қолдануды "
-"мәжбүрлету\n"
-"  -G, --groups ТОПТАР           пайдаланушыны қосымша ТОПТАРға қосу\n"
-"  -a, --append                  пайдаланушыны қосымша ТОПТАР ішіне қосу\n"
-"                                -G опциясы сияқты, пайдаланушыны басқа "
-"топтардан\n"
-"                                өшірмейді\n"
-"  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -l, --login NEW_LOGIN         тіркелгі үшін жаңа аты\n"
-"  -L, --lock                    пайдаланушы тіркелгісін оқшаулау\n"
-"  -m, --move-home               үй бумасының құрамасын жаңа жерге ауыстыру\n"
-"                                (тек -d опциясымен бірге қолданыңыз)\n"
-"  -o, --non-unique              қайталанатын (ерекше емес) UID-тарды "
-"қолдануды рұқсат ету\n"
-"  -p, --password PASSWORD       жаңа пароль ретінде шифрленген парольді "
+"  -p, --password ПАРОЛЬ         бұл шифрленген парольді жаңа топ үшін "
 "қолдану\n"
-"  -s, --shell SHELL             пайдаланушы тіркелгісі үшін жаңа қоршам\n"
-"  -u, --uid UID                 пайдаланушы тіркелгісі үшін жаңа UID\n"
-"  -U, --unlock                  пайдаланушы тіркелгісін оқшаулаудан босату\n"
-"%s\n"
 
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr "  -u, --uid UID                 жаңа тіркелгі үшін пайдаланушы ID-і\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr "  -u, --uid UID                 жаңа тіркелгі үшін пайдаланушы ID-і\n"
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2117,19 +2335,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: '%s' пайдаланушысы %s ішінде бар болып тұр\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: %s ашу мүмкін емес\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: жалаушалар көрсетілмеген\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr "%s: -L, -p және -U жалаушаларын бірге қолдануға болмайды\n"
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: -e пен -f үшін көлеңкелі парольдер керек\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr "%s: -L, -p және -U жалаушаларын бірге қолдануға болмайды\n"
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr "%s: '%lu' UID-і бар болып тұр\n"
 
@@ -2202,9 +2421,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -p, --passwd                  passwd дерекқорын түзету\n"
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -q, --quiet                   тыныш режимі\n"
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr "  -s, --shadow                  shadow не gshadow дерекқорын түзету\n"
 
@@ -2264,3 +2480,325 @@
 #, c-format
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: %s үшін tcb бумасын табу сәтсіз\n"
+
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "жадыдан %d байт бөлу мүмкін емес\n"
+
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Қолданылуы: chage [опциялар] [ПАЙДАЛАНУШЫ_АТЫ]\n"
+#~ "\n"
+#~ "Опциялар:\n"
+#~ "  -d, --lastday LAST_DAY        парольдің аяқталу мерзімін LAST_DAY "
+#~ "күніне орнату\n"
+#~ "  -E, --expiredate EXPIRE_DATE  тіркелгінің аяқталу мерзімі EXPIRE_DATE "
+#~ "күніне орнату\n"
+#~ "  -h, --help                    осы көмек ақпаратын көрсетіп, шығу\n"
+#~ "  -I, --inactive INACTIVE       парольдің мерзімі біткен соң оны INACTIVE "
+#~ "болып\n"
+#~ "                                орнату үшін өтетін күн саны\n"
+#~ "  -l, --list                    тіркелгінің жұмыс уақыты ақпаратын "
+#~ "көрсету\n"
+#~ "  -m, --mindays MIN_DAYS        парольді ауыстыру арасында өту керек ең "
+#~ "аз күн санын\n"
+#~ "                                MIN_DAYS мәніне орнату\n"
+#~ "  -M, --maxdays MAX_DAYS        парольді ауыстыру арасында өту керек ең "
+#~ "көп сүн санын\n"
+#~ "                                MAX_DAYS мәніне орнату\n"
+#~ "  -W, --warndays WARN_DAYS      мерзімі аяқталу туралы хабарламаны "
+#~ "WARN_DAYS күн қалғанда көрсете бастау\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM көмегімен шындылықты тексеру қатемен аяқталды\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Қолданылуы: %s [-f толықl_аты] [-r бөлме_нөмірі] [-w жұмыс_тел]\n"
+#~ "\t[-h үй_тел] [-o басқа] [пайдаланушы аты]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Қолданылуы: %s [-f толық_аты] [-r бөлме_нөмірі] [-w жұмыс_тел] [-h "
+#~ "үй_тел]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Қолданылуы: %s [опциялар]\n"
+#~ "\n"
+#~ "Опциялары:\n"
+#~ "  -c, --crypt-method            шифрлеу тәсіл (%s-дан біреу)\n"
+#~ "  -e, --encrypted               шифрленген пароль енгізіледі\n"
+#~ "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
+#~ "  -m, --md5                     DES орнына MD5 алгоритмін қолдану, егер "
+#~ "пароль\n"
+#~ "                                шифрленбеген түрде енгізілсе\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Қолданылуы: chsh [опциялар] [LOGIN]\n"
+#~ "\n"
+#~ "Опциялары:\n"
+#~ "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
+#~ "  -s, --shell SHELL             пайдаланушы тіркелгісі үшін жаңа қоршам\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Қолданылуы: expiry {-f|-c}\n"
+
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "faillog: UID %lu үшін жазбаны алу мүмкін емес\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "faillog: %s ашу мүмкін емес: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: %s өлшемін алу мүмкін емес: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Қолданылуы: groupdel топ\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Қолданылуы: %s [-r] [-s] [group [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Қолданылуы: %s [-r] [-s] [топ]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s пен -r өзара үйлеспейді\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Қолданылуы: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Қолданылуы: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Қолданылуы: lastlog [опциялар]\n"
+#~ "\n"
+#~ "Опциялары:\n"
+#~ "  -b, --before КҮН             мерзімі КҮНнен үлкен ғана lastlog "
+#~ "жазбаларын көрсету\n"
+#~ "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
+#~ "  -t, --time КҮН               мерзімі КҮНнен кіші ғана lastlog "
+#~ "жазбаларын көрсету\n"
+#~ "  -u, --user ТІРКЕЛГІ          көрсетілген ТІРКЕЛГІ үшін lastlog "
+#~ "жазбаларын көрсету\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\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"
+#~ "  -d, --delete                  көрсетілген тіркелгі үшін парольді өшіру\n"
+#~ "  -e, --expire                  көрсетілген тіркелгі үшін пароль "
+#~ "мерзімінің аяқталуын мәжбүрлету\n"
+#~ "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
+#~ "  -k, --keep-tokens             парольді тек мерзімі аяқталса ғана "
+#~ "өзгерту\n"
+#~ "  -i, --inactive INACTIVE       мерзімі аяқталғаннан кейін тіркелгіні "
+#~ "сөндіру үшін\n"
+#~ "                                керек күн санын INACTIVE мәніне орнату\n"
+#~ "  -l, --lock                    көрсетілген тіркелгіні оқшаулау\n"
+#~ "  -n, --mindays MIN_DAYS        парольді өзгерту арасында ең аз рұқсат "
+#~ "етілген күн санын\n"
+#~ "                                MIN_DAYS мәніне орнату\n"
+#~ "  -q, --quiet                   тыныш түрі\n"
+#~ "  -r, --repository REPOSITORY   REPOSITORY репозиторийінде парольді "
+#~ "өзгерту\n"
+#~ "  -S, --status                  көрсетілген тіркелгі үшін пароль күйін "
+#~ "шығару\n"
+#~ "  -u, --unlock                  көрсетілген тіркелгіні оқшаулаудан "
+#~ "босату\n"
+#~ "  -w, --warndays WARN_DAYS      мерзімі аяқталуы туралы WARN_DAYS "
+#~ "қалғанда ескерте бастау\n"
+#~ "  -x, --maxdays MAX_DAYS        парольді өзгерту арасында ең көп рұқсат "
+#~ "етілген күн санын\n"
+#~ "                                MAX_DAYS мәніне орнату\n"
+#~ "\n"
+
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Қолданылуы: %s [-q] [-r] [passwd]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Қолданылуы: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Қолданылуы: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Қолданылуы: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Белгісіз id: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Қоршам жоқ\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Қолданылуы: userdel [опциялар] ТІРКЕЛГІ\n"
+#~ "\n"
+#~ "Опциялары:\n"
+#~ "  -f, --force                   файлдарды өшіруді мәжбүрлеу,\n"
+#~ "                                пайдаланушы иелігінде болмаса да\n"
+#~ "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
+#~ "  -r, --remove                  үй бумасын мен поштасын өшіру\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: %s пайдаланушысы қазір жүйеге кіріп тұр\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Қолданылуы: usermod [опциялар] ТІРКЕЛГІ\n"
+#~ "\n"
+#~ "Опциялары:\n"
+#~ "  -c, --comment COMMENT         GECOS жазбасы үшін жаңа мәні\n"
+#~ "  -d, --home HOME_DIR          пайдаланушы тіркелгісі үшін жаңа үй "
+#~ "бумасы\n"
+#~ "  -e, --expiredate EXPIRE_DATE  тіркелгінің аяқталу мерзімін EXPIRE_DATE "
+#~ "күніне орнату\n"
+#~ "  -f, --inactive INACTIVE       мерзімі аяқталғаннан кейін пароль "
+#~ "сөндірілетін күн\n"
+#~ "                                санын INACTIVE мәніне орнату\n"
+#~ "  -g, --gid ТОП                 жаңа басыңқы топ ретінде ТОПты қолдануды "
+#~ "мәжбүрлету\n"
+#~ "  -G, --groups ТОПТАР           пайдаланушыны қосымша ТОПТАРға қосу\n"
+#~ "  -a, --append                  пайдаланушыны қосымша ТОПТАР ішіне қосу\n"
+#~ "                                -G опциясы сияқты, пайдаланушыны басқа "
+#~ "топтардан\n"
+#~ "                                өшірмейді\n"
+#~ "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
+#~ "  -l, --login NEW_LOGIN         тіркелгі үшін жаңа аты\n"
+#~ "  -L, --lock                    пайдаланушы тіркелгісін оқшаулау\n"
+#~ "  -m, --move-home               үй бумасының құрамасын жаңа жерге "
+#~ "ауыстыру\n"
+#~ "                                (тек -d опциясымен бірге қолданыңыз)\n"
+#~ "  -o, --non-unique              қайталанатын (ерекше емес) UID-тарды "
+#~ "қолдануды рұқсат ету\n"
+#~ "  -p, --password PASSWORD       жаңа пароль ретінде шифрленген парольді "
+#~ "қолдану\n"
+#~ "  -s, --shell SHELL             пайдаланушы тіркелгісі үшін жаңа қоршам\n"
+#~ "  -u, --uid UID                 пайдаланушы тіркелгісі үшін жаңа UID\n"
+#~ "  -U, --unlock                  пайдаланушы тіркелгісін оқшаулаудан "
+#~ "босату\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: жалаушалар көрсетілмеген\n"

Modified: upstream/trunk/po/km.po
===================================================================
--- upstream/trunk/po/km.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/km.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2006-06-28 10:08+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem at khmeros.info>\n"
 "Language-Team: Khmer <support at khmeros.info>\n"
@@ -42,6 +42,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "កំហុស​ការ​កំណត់​រចនាសម្ព័ន្ធ​ - មិន​ស្គាល់​ធាតុ '%s' (ជូន​ដំណឹង​អ្នក​គ្រប់គ្រង​)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "ពាក្យ​សម្ងាត់​ ៖ "
 
@@ -235,6 +243,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "បរាជ័យ​ក្នុងការ​ផ្លាស់ប្ដូរ​ម្ចាស់​ប្រអប់សំបុត្រ"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s ៖ មិនអាចយក​ UID ដែលមានតែមួយ​បានទេ\n"
 
@@ -317,6 +330,33 @@
 msgstr "ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ​សម្រាប់​ %s ។\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s ៖ លេខ​ទូរស័ព្ទនៅផ្ទះ​មិន​ត្រឹមត្រូវ​ ៖ '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s ៖ មិន​​អាច​បង្កើត​ថត​ %s បានឡើយ\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s ៖ មិន​​អាច​បង្កើត​ថត​ %s បានឡើយ\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -344,49 +384,55 @@
 msgid "Unable to determine your tty name."
 msgstr "មិន​អាច​កំណត់​ឈ្មោះ​ tty របស់​អ្នកបានទេ​ ។"
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) បាន​បរាជ័យ​\n"
-
 #, fuzzy
 #| msgid "No\n"
 msgid "No"
 msgstr "ទេ\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "របៀបប្រើ ៖ %s [input]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"ការ​ប្រើប្រាស់​ ៖ ប្តូរ​អ្នកប្រើ​ [options]​\n"
-"ជម្រើស​ ៖\n"
-"  -d, --ថ្ងៃ​មុន​ LAST_DAY\t កំណត់​ការប្ដូរ​ពាក្យ​សម្ងាត់​មុន ​ទៅ​ជា​ LAST_DAY\n"
-"  -E, --កាលបរិច្ឆេទ​ផុត​កំណត់​ EXPIRE_DATE\t កំណត់​កាលបរិច្ឆេទ​ការផុត​កំណត់​​របស់គណនីទៅ​ជា​ "
-"EXPIRE_DATE\n"
-"  -h, --ជំនួយ​\t\t\t បង្ហាញ​សារ​ជំនួយនេះ ហើយ​ ចេញ​\n"
-"  -I, --អសកម្ម​ INACTIVE\t កំណត់​ពាក្យ​សម្ងាត់​ឲ្យ​​អសកម្ម ​បន្ទាប់​ពី​ការផុត​កំណត់​\n"
-"\t\t\t\tទៅជា INACTIVE\n"
-"  -l, --បញ្ជី​\t\t\t បង្ហាញព័ត៌មាន​ចាស់​របស់​​គណនី​\n"
-"  -m, --ចំនួនថ្ងៃ​អប្បរមា MIN_DAYS\t កំណត់​ចំនួន​ថ្ងៃ​អប្បបរមា ​មុន​ពាក្យ​សម្ងាត់​ \n"
-"\t\t\t\tប្តូរទៅ​ជា​ MIN_DAYS\n"
-"  -M, --ចំនួនថ្ងៃ​អតិបរមា MAX_DAYS\t កំណត់​ចំនួន​ថ្ងៃ​អតិបរមា ​មុន​ពាក្យ​សម្ងាត់​\n"
-"\t\t\t\tប្តូរ​ទៅ​ជា​ MAX_DAYS\n"
-"  -W, --ថ្ងៃព្រមាន WARN_DAYS\tកំណត់ការព្រមាន​ថ្ងៃ​ផុត​កំណត់​ទៅជា​ WARN_DAYS\n"
-"\n"
 
 #, fuzzy
 msgid "Enter the new value, or press ENTER for the default"
@@ -462,9 +508,10 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s ៖ មិន​អាចកំណត់​ឈ្មោះ​អ្នកប្រើ​របស់​អ្នក​បាន​ទេ ។\n"
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr "%s ៖ PAM ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវបាន​បរាជ័យ​\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s ៖ %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -489,10 +536,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s ៖ គ្មាន​វត្តមាន​​ឯកសារ​ពាក្យ​សម្ងាត់ស្រមោលទេ​\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
@@ -505,18 +548,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s ៖ កំហុស​ការផ្លាស់ប្តូរ​វាល​\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "របៀបប្រើ ៖ %s [input]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"កា​រប្រើប្រាស់​ ៖ %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
-msgstr "របៀបប្រើ ៖ %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "ឈ្មោះ​ពេញ"
 
@@ -594,25 +651,24 @@
 msgstr "%s ៖ វាល គឺ​វែងវែងពេក​\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "របៀបប្រើ ៖ %s [input]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"របៀបប្រើ ៖ chpasswd [ជម្រើស]\n"
-"\n"
-"ជម្រើស ៖\n"
-"  -e, --encrypted\tពាក្យសម្ងាត់​ដែល​បាន​ផ្ដល់​ត្រូវ​បាន​អ៊ិនគ្រីប\n"
-"  -h, --help\t\tបង្ហាញ​សារ​ជំនួយ​​នេះ និង​ចេញ\n"
-"  -m, --md5\t\tប្រើ​ការ​អ៊ិនគ្រីប MD5 ជំនួស​ឲ្យ DES នៅ​ពេល​ដែល​ពាក្យសម្ងាត់\n"
-"\t\t\tដែល​បាន​ផ្ដល់​មិន​ត្រូវបាន​អ៊ិនគ្រីប​ទេ\n"
-"\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -654,29 +710,6 @@
 msgstr "%s ៖ បានរកឃើញ​កំហុស មិនអើពើនឹងការផ្លាស់ប្ដូរ​\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "របៀបប្រើ ៖ %s [input]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
 
@@ -684,22 +717,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
 
-#, fuzzy
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"របៀបប្រើ ៖ userdel [ជម្រើស] LOGIN\n"
-"\n"
-"ជម្រើស ៖\n"
-"  -f, --force\t\t\tបង្ខំ​ឲ្យ​យក​ឯកសារ​ចេញ ទោះបី​ជា​មិន​បាន​គ្រប់គ្រង​ដោយ​អ្នកប្រើ​ក៏ដោយ\n"
-"  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួយ​នេះ និង​ចេញ\n"
-"  -r, --remove\t\t\tយកថ​ត​ផ្ទះ  និង​ហុង​សំបុត្រ​ចេញ\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "សែលចូល"
@@ -732,9 +751,24 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s ៖ ការព្រមាន ៖​ %s មិនត្រូវបានទទួល​យក​ដោយ %s ឡើយ\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "របៀបប្រើ ៖ ការផុតកំណត់ {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "កំណត់ត្រាចុងក្រោយ ៖ អាគុយម៉ង់​មិន​រំពឹង​ទុក​ ៖ %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -761,9 +795,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s ៖ មិន​​អាច​បង្កើត​ថត​ %s បានឡើយ\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "ចូល       ភាពបរាជ័យ​នៃការចូល​ចុងក្រោយ​ជាអតិបរមា                   លើ\n"
@@ -777,31 +812,30 @@
 msgid " [%lds lock]"
 msgstr " [%lds ជាប់សោ]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s ៖ មិន​​អាច​បង្កើត​ថត​ %s បានឡើយ\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s ៖ មិន​​អាច​បង្កើត​ថត​ %s បានឡើយ\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "មិន​ស្គាល់​អ្នក​ប្រើ ៖ %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "%s ៖ មិនអាច​បើក​ឯកសារ​ %s បានទេ\n"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s ៖ មិនអាចប្ដូរឈ្មោះ​ថត​ %s ទៅ​ជា​ %s បានឡើយ\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -816,6 +850,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -942,8 +979,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-msgid "Usage: groupdel group\n"
-msgstr "របៀបប្រើ​ ៖ ក្រុម​ groupdel \n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s ៖ មិន​អាចកំណត់​ឈ្មោះ​អ្នកប្រើ​របស់​អ្នក​បាន​ទេ ។\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1047,16 +1086,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s ៖ មិន​ស្គាល់​អ្នកប្រើ​ %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "របៀបប្រើ ៖​ %s [-r] [-s] [group [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "របៀបប្រើ ៖ %s [input]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "របៀបប្រើ ៖ %s [-r] [-s] [group]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "របៀបប្រើ ៖ %s [input]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s ៖ -s និង​ -r គឺមិន​ត្រូវ​គ្នាទេ​\n"
 
 #, fuzzy
@@ -1130,16 +1186,6 @@
 msgid "%s: no changes\n"
 msgstr "%s ៖គ្មាន​ការផ្លាស់ប្ដូរ​\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "របៀបប្រើ​ ៖ ក្រុម​ groupdel \n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "របៀបប្រើ​ ៖ ក្រុម​ groupdel \n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1154,30 +1200,17 @@
 msgid " groups="
 msgstr " ក្រុម​="
 
-#, fuzzy
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"របៀបប្រើ ៖ lastlog [ជម្រើស]\n"
-"\n"
-"ជម្រើស ៖\n"
-"  -b, --before DAYS\tបោះពុម្ពកំណត់កំណត់ហេតុចុងក្រោយចាស់ជាង DAYS\n"
-"  -h, --help\t\tបង្ហាញ​សារ​ជំនួយ​នេះ និង​ចេញ\n"
-"  -t, --time DAYS\tបោះពុម្ព​តែ​កំណត់ត្រា​កំណត់​ហេតុ​ចុង​ក្រោយ​ដែល​ថ្មី​ជាង DAYS ប៉ុណ្ណោះ\n"
-"  -u, --user LOGIN\tបោះពុម្ព​កំណត់ត្រា​កំណត់ហេតុ​ចុង​ក្រោយ​សម្រាប់​អ្នក​ប្រើ​ដែល​មាន LOGIN ដែល​បាន​"
-"បញ្ជាក់\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 #, fuzzy
@@ -1192,14 +1225,6 @@
 msgstr "**មិន​ដែល​ចូល​សោះ**"
 
 #, 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"
 
@@ -1275,6 +1300,11 @@
 msgid "Login incorrect"
 msgstr "ចូល​មិន​ត្រឹមត្រូវ​"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s ៖ បន្ទាត់​ %d ៖ មិន​អាច​រក​អ្នកប្រើ​ %s ឃើញឡើយ\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1398,52 +1428,59 @@
 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"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -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\t\t\tរាយការណ៍​ស្ថានភាព​ពាក្យសម្ងាត់​អំពី​គណនី​ទាំងអស់\n"
-"  -d, --delete\t\t\tលុប​ពាក្យសម្ងាត់​សម្រាប់​គណនី​ដែល​មាន​ឈ្មោះ\n"
-"  -e, --expire\t\t\tបង្ហាញ​ឲ្យ​ពាក្យសម្ងាត់​ផុត​កំណត់​សម្រាប់​គណនី​ដែល​មាន​ឈ្មោះ\n"
-"  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួយ​នេះ និង​ចេញ\n"
-"  -k, --keep-tokens\t\tផ្លាស់ប្ដូរ​ពាក្យសម្ងាត់ ក្នុ​ង​ក​រណី​​ដែល​ផុត​កំណត់\n"
-"  -i, --inactive INACTIVE\tកំណត់​ពាក្យសម្ងាត់​ឲ្យ​អសកម្ម​បន្ទាប់​ពី​ផុត​កំណត់\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tចាក់សោ​គណនី​ដែល​មាន​ឈ្មោះ\n"
-"  -n, --mindays MIN_DAYS\tកំណត់ចំនួន​ថ្ងៃ​អប្បបរមា​មុន​ពាក្យសម្ងាត់\n"
-"\t\t\t\tផ្លាស់ប្ដូរទៅ MIN_DAYS\n"
-"  -q, --quiet\t\t\tរបៀប​ស្ងាត់\n"
-"  -r, --repository REPOSITORY\tផ្លាស់ប្ដូរ​ពាក្យសម្ងាត់​នៅ​ក្នុង​ឃ្លាំង REPOSITORY\n"
-"  -S, --status\t\t\tរាយការណ៍​ស្ថានភាព​ពាក្យសម្ងាត់​អំពី​គណនី​ដែល​មាន​ឈ្មោះ\n"
-"  -u, --unlock\t\t\tដោះសោ​គណនី​ដែល​មាន​ឈ្មោះ\n"
-"  -w, --warndays WARN_DAYS\tកំណត់​ថ្ងៃ​ព្រមាន​ផុត​កំណត់​ទៅ​ជា WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tកំណត់​ចំនួនថ្ងៃ​អតិបរមា​មុន​ពាក្យសម្ងាត់\n"
-"\t\t\t\tផ្លាស់ប្ដូរ​ទៅ​ជា MAX_DAYS\n"
-"\n"
 
 msgid "Old password: "
 msgstr "ពាក្យ​សម្ងាត់​ចាស់ ៖ "
@@ -1527,19 +1564,24 @@
 msgstr "ការព្រមាន​ការផុត​កំណត់​នៃ​ពាក្យ​សម្ងាត់​"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "របៀបប្រើ ៖ %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "របៀបប្រើ ៖ %s [input]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "របៀបប្រើ ៖ %s [-q] [-r] [-s] [passwd [shadow]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s ៖ -s និង​ -r គឺមិន​ត្រូវ​គ្នាទេ​\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "របៀបប្រើ ៖ %s [input]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1626,11 +1668,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s ៖ មិនអាច​បើក​ឯកសារ​ %s បានទេ\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "របៀបប្រើ​ ៖ លេខសម្គាល់\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1640,11 +1677,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "របៀបប្រើ​ ៖ លេខសម្គាល់\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "ដំណើរការ​ជា​ su ទៅ​កាន់​គណនី​នោះ​ DENIED ។\n"
 
@@ -1710,32 +1742,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s ៖ ត្រូវ​តែ​រត់​ពី ស្ថានីយមួយ\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(មិន​អើពើ​)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s ៖ pam_start ៖ កំហុស​ %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "មិន​ស្គាល់​លេខ​សម្គាល់​ ៖ %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "អ្នកគ្មាន​ការ​អនុញ្ញាតឲ្យ​ចូល​ទៅ​កាន់​ su ទេ​ %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(បញ្ចូល​ពាក្យ​សម្ងាត់​ផ្ទាល់​ខ្លួនរបស់អ្នក​)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(មិន​អើពើ​)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1746,9 +1766,28 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "អ្នកគ្មាន​ការ​អនុញ្ញាតឲ្យ​ចូល​ទៅ​កាន់​ su ទេ​ %s\n"
 
-msgid "No shell\n"
-msgstr "គ្មានសែល​\n"
+#, fuzzy, c-format
+msgid "No passwd entry for user '%s'\n"
+msgstr "គ្មាន​ធាតុ​ពាក្យ​សម្ងាត់​សម្រាប់ 'root'​ ឡើយ\n"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s ៖ ត្រូវ​តែ​រត់​ពី ស្ថានីយមួយ\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s ៖ pam_start ៖ កំហុស​ %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s ៖ មិនអាចប្ដូរឈ្មោះ​ថត​ %s ទៅ​ជា​ %s បានឡើយ\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "មិន​អាចប្រតិបត្តិ​ %s បានទេ"
+
 #, fuzzy
 msgid "No password file"
 msgstr "គ្មាន​ឯកសារ​ពាក្យ​សម្ងាត់ឡើយ​\n"
@@ -1796,7 +1835,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s ៖​ ប្តូរ​ឈ្មោះ​ ៖ %s"
 
 #, c-format
@@ -1811,6 +1850,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "របៀបប្រើ ៖ %s [input]\n"
@@ -1928,10 +1969,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -1993,32 +2030,35 @@
 "%s ៖ ការព្រមាន​ ៖ មានថតផ្ទះ​រួចហើយ ។\n"
 "មិនចម្លង​​ឯកសារណាមួយ​ពីថត​ skel ចូលក្នុង​វានោះទេ ។\n"
 
-#, fuzzy
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"របៀបប្រើ ៖ userdel [ជម្រើស] LOGIN\n"
-"\n"
-"ជម្រើស ៖\n"
-"  -f, --force\t\t\tបង្ខំ​ឲ្យ​យក​ឯកសារ​ចេញ ទោះបី​ជា​មិន​បាន​គ្រប់គ្រង​ដោយ​អ្នកប្រើ​ក៏ដោយ\n"
-"  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួយ​នេះ និង​ចេញ\n"
-"  -r, --remove\t\t\tយកថ​ត​ផ្ទះ  និង​ហុង​សំបុត្រ​ចេញ\n"
-"\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s ៖ មិនអាចផ្លាស់​​ប្តូរ​អ្នក​ប្រើបានទេ​ '%s' លើ​ម៉ាស៊ីន​ភ្ញៀវ NIS បានទេ ។\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s ៖ ថត​ផ្ទះ​មិន​ត្រឹមត្រូវ​ '%s'\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s  ៖ ការព្រមាន​ ៖ មិន​អាច​យកចេញបានឡើយ "
@@ -2050,10 +2090,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s ៖ អ្នកប្រើ​ %s គឺជា​អ្នក​​ប្រើ​ NIS\n"
 
-#, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s ៖ បច្ចុប្បន្ន ​អ្នក​ប្រើ​ %s បាន​ចូលហើយ​\n"
-
 #, fuzzy, c-format
 #| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2067,56 +2103,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s ៖ មានកំហុស​ក្នុងការយក​ថត​ %s ចេញ\n"
 
-#, fuzzy, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"របៀបប្រើ ៖ usermod [ជម្រើស] LOGIN\n"
-"\n"
-"ជម្រើស ៖\n"
-"  -a, --append GROUP\t\tបន្ថែម​អ្នក​ប្រើ​ទៅ​ខាង​ចុង​ក្រុម​បន្ទាប់បន្សំ\n"
-"  -c, --comment COMMENT\t\tតម្លៃ​ថ្មី​របស់​វាល GECOS\n"
-"  -d, --home HOME_DIR\t\tថតផ្ទះ​ថ្មី​សម្រាប់​គណនី​អ្នកប្រើ​ថ្មី\n"
-"  -e, --expiredate EXPIRE_DATE\tកំណត់​កាលបរិច្ឆេទ​ផុត​កំណត់​ទៅ​ជា EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tកំណត់​ពាក្យសម្ងាត់​ឲ្យ​អសកម្ម​បន្ទាប់​ពី​ផុត​កំណត់\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tបង្ខំ​ឲ្យ​ប្រើ GROUP ជា​ក្រុម​សំខាន់​ថ្មី\n"
-"  -G, --groups GROUPS\t\tបញ្ជី​ថ្មី​របស់​ក្រុម​បន្ទាប់បន្សំ\n"
-"  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួ​យនេះ និង​ចេញ\n"
-"  -l, --login NEW_LOGIN\t\tតម្លៃ​ថ្មី​របស់​ឈ្មោះ​ចូល\n"
-"  -L, --lock\t\t\tចាក់សោ​គណនី​អ្នកប្រើ\n"
-"  -m, --move-home\t\tផ្លាស់ទី​មាតិកា​របស់​ថតផ្ទះ​ទៅ\n"
-"\t\t\t\tទីតាំង​ថ្មី (ប្រើ​តែជា​មួយ -d ប៉ុណ្ណោះ)\n"
-"  -o, --non-unique\t\tអនុញ្ញាត​ឲ្យ​ប្រើ UID (មិនមាន​តែ​មួយគត់) ស្ទួន\n"
-"  -p, --password PASSWORD\tប្រើ​​ពាក្យសម្ងា​ត់​​ដែ​ល​បាន​អ៊ិនគ្រីប​សម្រាប់​​ពាក្យសម្ងា​ត់​ថ្មី\n"
-"  -s, --shell SHELL\t\tសែល​​ចូ​ល​​ថ្មី​​សម្រាប់​​គណនី​អ្នកប្រើ\n"
-"  -u, --uid UID\t\t\t UID ថ្មី​សម្រាប់​គណនី​អ្នកប្រើ\n"
-"  -U, --unlock\t\t\tដោះសោ​គណនី​អ្នកប្រើ\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2133,19 +2172,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s ៖ អ្នក​ប្រើ​ %s មាន​រួច​ហើយ​\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s ៖ មិនអាច​បើក​ឯកសារ​ %s បានទេ\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s ៖ មិន​ផ្តល់​ទង់​ឲ្យឡើយ​\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s ៖ ពាក្យ​សម្ងាត់​ស្រមោល​បានត្រូវការ​​ -e និង -f\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr ""
 
@@ -2211,9 +2251,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2296,8 +2333,310 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s  ៖ ថត​មូលដ្ឋាន​មិន​ត្រឹមត្រូវ​ '%s'\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) បាន​បរាជ័យ​\n"
+
 #, fuzzy
 #~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ការ​ប្រើប្រាស់​ ៖ ប្តូរ​អ្នកប្រើ​ [options]​\n"
+#~ "ជម្រើស​ ៖\n"
+#~ "  -d, --ថ្ងៃ​មុន​ LAST_DAY\t កំណត់​ការប្ដូរ​ពាក្យ​សម្ងាត់​មុន ​ទៅ​ជា​ LAST_DAY\n"
+#~ "  -E, --កាលបរិច្ឆេទ​ផុត​កំណត់​ EXPIRE_DATE\t កំណត់​កាលបរិច្ឆេទ​ការផុត​កំណត់​​របស់គណនីទៅ​ជា​ "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --ជំនួយ​\t\t\t បង្ហាញ​សារ​ជំនួយនេះ ហើយ​ ចេញ​\n"
+#~ "  -I, --អសកម្ម​ INACTIVE\t កំណត់​ពាក្យ​សម្ងាត់​ឲ្យ​​អសកម្ម ​បន្ទាប់​ពី​ការផុត​កំណត់​\n"
+#~ "\t\t\t\tទៅជា INACTIVE\n"
+#~ "  -l, --បញ្ជី​\t\t\t បង្ហាញព័ត៌មាន​ចាស់​របស់​​គណនី​\n"
+#~ "  -m, --ចំនួនថ្ងៃ​អប្បរមា MIN_DAYS\t កំណត់​ចំនួន​ថ្ងៃ​អប្បបរមា ​មុន​ពាក្យ​សម្ងាត់​ \n"
+#~ "\t\t\t\tប្តូរទៅ​ជា​ MIN_DAYS\n"
+#~ "  -M, --ចំនួនថ្ងៃ​អតិបរមា MAX_DAYS\t កំណត់​ចំនួន​ថ្ងៃ​អតិបរមា ​មុន​ពាក្យ​សម្ងាត់​\n"
+#~ "\t\t\t\tប្តូរ​ទៅ​ជា​ MAX_DAYS\n"
+#~ "  -W, --ថ្ងៃព្រមាន WARN_DAYS\tកំណត់ការព្រមាន​ថ្ងៃ​ផុត​កំណត់​ទៅជា​ WARN_DAYS\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s ៖ PAM ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវបាន​បរាជ័យ​\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "កា​រប្រើប្រាស់​ ៖ %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "របៀបប្រើ ៖ %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "របៀបប្រើ ៖ chpasswd [ជម្រើស]\n"
+#~ "\n"
+#~ "ជម្រើស ៖\n"
+#~ "  -e, --encrypted\tពាក្យសម្ងាត់​ដែល​បាន​ផ្ដល់​ត្រូវ​បាន​អ៊ិនគ្រីប\n"
+#~ "  -h, --help\t\tបង្ហាញ​សារ​ជំនួយ​​នេះ និង​ចេញ\n"
+#~ "  -m, --md5\t\tប្រើ​ការ​អ៊ិនគ្រីប MD5 ជំនួស​ឲ្យ DES នៅ​ពេល​ដែល​ពាក្យសម្ងាត់\n"
+#~ "\t\t\tដែល​បាន​ផ្ដល់​មិន​ត្រូវបាន​អ៊ិនគ្រីប​ទេ\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "របៀបប្រើ ៖ userdel [ជម្រើស] LOGIN\n"
+#~ "\n"
+#~ "ជម្រើស ៖\n"
+#~ "  -f, --force\t\t\tបង្ខំ​ឲ្យ​យក​ឯកសារ​ចេញ ទោះបី​ជា​មិន​បាន​គ្រប់គ្រង​ដោយ​អ្នកប្រើ​ក៏ដោយ\n"
+#~ "  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួយ​នេះ និង​ចេញ\n"
+#~ "  -r, --remove\t\t\tយកថ​ត​ផ្ទះ  និង​ហុង​សំបុត្រ​ចេញ\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "របៀបប្រើ ៖ ការផុតកំណត់ {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s ៖ មិនអាច​បើក​ឯកសារ​ %s បានទេ\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "របៀបប្រើ​ ៖ ក្រុម​ groupdel \n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "របៀបប្រើ ៖​ %s [-r] [-s] [group [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "របៀបប្រើ ៖ %s [-r] [-s] [group]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s ៖ -s និង​ -r គឺមិន​ត្រូវ​គ្នាទេ​\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "របៀបប្រើ​ ៖ ក្រុម​ groupdel \n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "របៀបប្រើ​ ៖ ក្រុម​ groupdel \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "របៀបប្រើ ៖ lastlog [ជម្រើស]\n"
+#~ "\n"
+#~ "ជម្រើស ៖\n"
+#~ "  -b, --before DAYS\tបោះពុម្ពកំណត់កំណត់ហេតុចុងក្រោយចាស់ជាង DAYS\n"
+#~ "  -h, --help\t\tបង្ហាញ​សារ​ជំនួយ​នេះ និង​ចេញ\n"
+#~ "  -t, --time DAYS\tបោះពុម្ព​តែ​កំណត់ត្រា​កំណត់​ហេតុ​ចុង​ក្រោយ​ដែល​ថ្មី​ជាង DAYS ប៉ុណ្ណោះ\n"
+#~ "  -u, --user LOGIN\tបោះពុម្ព​កំណត់ត្រា​កំណត់ហេតុ​ចុង​ក្រោយ​សម្រាប់​អ្នក​ប្រើ​ដែល​មាន LOGIN ដែល​បាន​"
+#~ "បញ្ជាក់\n"
+#~ "\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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\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\t\t\tរាយការណ៍​ស្ថានភាព​ពាក្យសម្ងាត់​អំពី​គណនី​ទាំងអស់\n"
+#~ "  -d, --delete\t\t\tលុប​ពាក្យសម្ងាត់​សម្រាប់​គណនី​ដែល​មាន​ឈ្មោះ\n"
+#~ "  -e, --expire\t\t\tបង្ហាញ​ឲ្យ​ពាក្យសម្ងាត់​ផុត​កំណត់​សម្រាប់​គណនី​ដែល​មាន​ឈ្មោះ\n"
+#~ "  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួយ​នេះ និង​ចេញ\n"
+#~ "  -k, --keep-tokens\t\tផ្លាស់ប្ដូរ​ពាក្យសម្ងាត់ ក្នុ​ង​ក​រណី​​ដែល​ផុត​កំណត់\n"
+#~ "  -i, --inactive INACTIVE\tកំណត់​ពាក្យសម្ងាត់​ឲ្យ​អសកម្ម​បន្ទាប់​ពី​ផុត​កំណត់\n"
+#~ "\t\t\t\tto INACTIVE\n"
+#~ "  -l, --lock\t\t\tចាក់សោ​គណនី​ដែល​មាន​ឈ្មោះ\n"
+#~ "  -n, --mindays MIN_DAYS\tកំណត់ចំនួន​ថ្ងៃ​អប្បបរមា​មុន​ពាក្យសម្ងាត់\n"
+#~ "\t\t\t\tផ្លាស់ប្ដូរទៅ MIN_DAYS\n"
+#~ "  -q, --quiet\t\t\tរបៀប​ស្ងាត់\n"
+#~ "  -r, --repository REPOSITORY\tផ្លាស់ប្ដូរ​ពាក្យសម្ងាត់​នៅ​ក្នុង​ឃ្លាំង REPOSITORY\n"
+#~ "  -S, --status\t\t\tរាយការណ៍​ស្ថានភាព​ពាក្យសម្ងាត់​អំពី​គណនី​ដែល​មាន​ឈ្មោះ\n"
+#~ "  -u, --unlock\t\t\tដោះសោ​គណនី​ដែល​មាន​ឈ្មោះ\n"
+#~ "  -w, --warndays WARN_DAYS\tកំណត់​ថ្ងៃ​ព្រមាន​ផុត​កំណត់​ទៅ​ជា WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS\tកំណត់​ចំនួនថ្ងៃ​អតិបរមា​មុន​ពាក្យសម្ងាត់\n"
+#~ "\t\t\t\tផ្លាស់ប្ដូរ​ទៅ​ជា MAX_DAYS\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "របៀបប្រើ ៖ %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "របៀបប្រើ ៖ %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "របៀបប្រើ​ ៖ លេខសម្គាល់\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "របៀបប្រើ​ ៖ លេខសម្គាល់\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "មិន​ស្គាល់​លេខ​សម្គាល់​ ៖ %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "គ្មានសែល​\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "របៀបប្រើ ៖ userdel [ជម្រើស] LOGIN\n"
+#~ "\n"
+#~ "ជម្រើស ៖\n"
+#~ "  -f, --force\t\t\tបង្ខំ​ឲ្យ​យក​ឯកសារ​ចេញ ទោះបី​ជា​មិន​បាន​គ្រប់គ្រង​ដោយ​អ្នកប្រើ​ក៏ដោយ\n"
+#~ "  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួយ​នេះ និង​ចេញ\n"
+#~ "  -r, --remove\t\t\tយកថ​ត​ផ្ទះ  និង​ហុង​សំបុត្រ​ចេញ\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s ៖ បច្ចុប្បន្ន ​អ្នក​ប្រើ​ %s បាន​ចូលហើយ​\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "របៀបប្រើ ៖ usermod [ជម្រើស] LOGIN\n"
+#~ "\n"
+#~ "ជម្រើស ៖\n"
+#~ "  -a, --append GROUP\t\tបន្ថែម​អ្នក​ប្រើ​ទៅ​ខាង​ចុង​ក្រុម​បន្ទាប់បន្សំ\n"
+#~ "  -c, --comment COMMENT\t\tតម្លៃ​ថ្មី​របស់​វាល GECOS\n"
+#~ "  -d, --home HOME_DIR\t\tថតផ្ទះ​ថ្មី​សម្រាប់​គណនី​អ្នកប្រើ​ថ្មី\n"
+#~ "  -e, --expiredate EXPIRE_DATE\tកំណត់​កាលបរិច្ឆេទ​ផុត​កំណត់​ទៅ​ជា EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE\tកំណត់​ពាក្យសម្ងាត់​ឲ្យ​អសកម្ម​បន្ទាប់​ពី​ផុត​កំណត់\n"
+#~ "\t\t\t\tto INACTIVE\n"
+#~ "  -g, --gid GROUP\t\tបង្ខំ​ឲ្យ​ប្រើ GROUP ជា​ក្រុម​សំខាន់​ថ្មី\n"
+#~ "  -G, --groups GROUPS\t\tបញ្ជី​ថ្មី​របស់​ក្រុម​បន្ទាប់បន្សំ\n"
+#~ "  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួ​យនេះ និង​ចេញ\n"
+#~ "  -l, --login NEW_LOGIN\t\tតម្លៃ​ថ្មី​របស់​ឈ្មោះ​ចូល\n"
+#~ "  -L, --lock\t\t\tចាក់សោ​គណនី​អ្នកប្រើ\n"
+#~ "  -m, --move-home\t\tផ្លាស់ទី​មាតិកា​របស់​ថតផ្ទះ​ទៅ\n"
+#~ "\t\t\t\tទីតាំង​ថ្មី (ប្រើ​តែជា​មួយ -d ប៉ុណ្ណោះ)\n"
+#~ "  -o, --non-unique\t\tអនុញ្ញាត​ឲ្យ​ប្រើ UID (មិនមាន​តែ​មួយគត់) ស្ទួន\n"
+#~ "  -p, --password PASSWORD\tប្រើ​​ពាក្យសម្ងា​ត់​​ដែ​ល​បាន​អ៊ិនគ្រីប​សម្រាប់​​ពាក្យសម្ងា​ត់​ថ្មី\n"
+#~ "  -s, --shell SHELL\t\tសែល​​ចូ​ល​​ថ្មី​​សម្រាប់​​គណនី​អ្នកប្រើ\n"
+#~ "  -u, --uid UID\t\t\t UID ថ្មី​សម្រាប់​គណនី​អ្នកប្រើ\n"
+#~ "  -U, --unlock\t\t\tដោះសោ​គណនី​អ្នកប្រើ\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s ៖ មិន​ផ្តល់​ទង់​ឲ្យឡើយ​\n"
+
+#, fuzzy
+#~ msgid ""
 #~ "Usage: vipw [options]\n"
 #~ "\n"
 #~ "Options:\n"
@@ -2778,9 +3117,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/ko.po
===================================================================
--- upstream/trunk/po/ko.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/ko.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2009-04-19 21:32+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu at debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean at lists.debian.org>\n"
@@ -40,6 +40,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "설정 오류 - 알 수 없는 항목 '%s'(관리자에게 알리시기 바랍니다)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "암호: "
 
@@ -224,6 +232,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "메일함 소유자를 바꾸는 데 실패했습니다"
+
+#, fuzzy, c-format
 #| msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: 유일한 UID를 얻을 수 없습니다 (UID가 남아 있지 않습니다)\n"
@@ -307,6 +320,33 @@
 msgstr "'%s'의 암호가 맞지 않습니다.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: 관리자 권한을 버릴 수 없습니다 (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: 잘못된 집 전화번호: '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: 디렉터리 %s을(를) 만들 수 없습니다\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: 디렉터리 %s을(를) 만들 수 없습니다\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -336,70 +376,64 @@
 msgid "Unable to determine your tty name."
 msgstr "TTY 이름을 확인할 수 없습니다."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d)에 실패\n"
-
 msgid "No"
 msgstr "아니오"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"사용법: chage [옵션] [로그인]\n"
-"\n"
-"옵션:\n"
-"  -d, --lastday <최근날짜>       최근 암호를 바꾼 날짜를 <최근날짜>로 합니"
-"다.\n"
-"  -E, --expiredate <만료날짜>    계정 만료날짜를 <만료날짜>로 합니다.\n"
-"  -h, --help                     이 도움말을 표시하고 끝냅니다.\n"
-"  -I, --inactive <비활성화기간>  만료된 후 비활성화 기간을 <비활성화기간>으"
-"로\n"
-"                                 합니다\n"
-"  -l, --list                     계정의 사용기한 정보를 표시합니다.\n"
-"  -m, --mindays <최소날수>       암호를 바꾸기 전의 최소 날짜 수를 <최소날수>"
-"로\n"
-"                                 합니다.\n"
-"  -M, --maxdays <최대날수>       암호를 바꾸기 전의 최대 날짜 수를 <최대날수>"
-"로\n"
-"                                 합니다.\n"
-"  -W, --warndays <경고날수>      만료 경고 기간을 <경고날수>으로 합니다.\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "새로운 값을 넣거나, 기본값을 원하시면 엔터를 치세요"
@@ -472,9 +506,10 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: 사용자 이름을 인식할 수 없습니다.\n"
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr "%s: PAM 인증이 실패했습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -497,10 +532,6 @@
 msgstr "%s: 셰도우 암호 파일이 없습니다\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: 관리자 권한을 버릴 수 없습니다 (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: '%s' 사용자가 %s에 없습니다\n"
 
@@ -514,17 +545,29 @@
 
 #, c-format
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"사용법: %s [-f 이름] [-r 방_번호] [-w 직장_전화번호]\n"
-"\t[-h 집_전화번호] [-o 기타] [사용자]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"사용법: %s [-f 이름] [-r 방_번호] [-w 직장_전화번호] [-h 집_전화번호]\n"
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "이름"
 
@@ -604,22 +647,23 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
-msgstr ""
-"사용법: %s [옵션]\n"
-"\n"
-"옵션:\n"
-"  -c, --crypt-method            암호화 방법 (다음 중 하나: %s)\n"
-"  -e, --encrypted               입력하는 암호가 암호화되어 있습니다\n"
-"  -h, --help                    이 도움말 메시지를 표시하고 끝냅니다\n"
-"  -m, --md5                     일반 텍스트 암호를 MD5 알고리즘을 사용해\n"
-"                                암호화합니다\n"
-"%s\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -658,32 +702,6 @@
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: 오류 발견, 바뀐 내역은 무시합니다\n"
 
-#, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
-
 #, fuzzy, c-format
 #| msgid "%s: line %d: user '%s' does not exist\n"
 msgid "%s: (line %d, user %s) password not changed\n"
@@ -693,20 +711,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: %d번 줄: '%s' 사용자가 없습니다\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"사용법: chsh [옵션] [<로그인>]\n"
-"\n"
-"옵션:\n"
-"  -h, --help                    이 도움말 메시지를 표시하고 끝냅니다\n"
-"  -s, --shelll <쉘>             사용자 계정의 새 로그인 쉘\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "로그인 쉘"
@@ -738,9 +744,28 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: 경고: %s은(는) %s이(가) 소유하고 있지 않습니다\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "사용법: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: %s 옵션 및 %s 충돌\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: 올 수 없는 인자입니다: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -768,9 +793,9 @@
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to get the entry for UID %d\n"
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "faillog: UID %d번의 항목을 읽는데 실패했습니다\n"
+#| msgid "lastlog: Failed to get the entry for UID %d\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog: UID %d번의 항목을 읽는데 실패했습니다\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "로그인       실패     최대값  최근                     사용\n"
@@ -785,32 +810,30 @@
 
 #, fuzzy, c-format
 #| msgid "faillog: Failed to reset fail count for UID %d\n"
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: UID %d의 실패 횟수를 초기화하는데 실패했습니다\n"
 
 #, fuzzy, c-format
 #| msgid "faillog: Failed to set max for UID %d\n"
-msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "faillog: UID %d의 최대값을 설정하는데 실패했습니다\n"
 
 #, fuzzy, c-format
 #| msgid "faillog: Failed to set locktime for UID %d\n"
-msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: UID %d의 잠금시각을 설정하는데 실패했습니다\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog: 알 수 없는 사용자 혹은 범위: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "faillog: %s을(를) 열 수 없습니다: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: %s의 크기를 읽을 수 없습니다: %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: %s의 크기를 얻을 수 없습니다: %s\n"
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -823,6 +846,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -959,8 +985,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: '%lu' GID가 이미 있습니다\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "사용법: groupdel 그룹\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: 사용자 이름을 인식할 수 없습니다.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1063,16 +1091,37 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: 알 수 없는 사용자 %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
 msgstr "사용법: %s [-r] [-s] [그룹 [gshadow]]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [-r] [-s] [group]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
 msgstr "사용법: %s [-r] [-s] [그룹]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s 옵션과 -r 옵션을 동시에 쓸 수 없습니다\n"
 
 msgid "invalid group file entry"
@@ -1140,12 +1189,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: 바뀐 점이 없음\n"
 
-msgid "Usage: grpconv\n"
-msgstr "사용법: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "사용법: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: '%s'을(를) 삭제할 수 없습니다\n"
@@ -1160,30 +1203,18 @@
 msgstr " 그룹 목록="
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr ""
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"사용법: lastlog [옵션]\n"
-"\n"
-"옵션:\n"
-"  -b, --before <날짜>           <날짜>일 이전의 최근 기록을 표시합니다\n"
-"  -h, --help                    이 도움말 메시지를 표시하고 끝냅니다\n"
-"  -t, --time <날짜>             <날짜>일 내의 최근 기록만 표시합니다\n"
-"  -u, --user <로그인>           <로그인> 사용자의 최근 기록만 표시합니다\n"
-"\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %d\n"
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: UID %d번의 항목을 읽는데 실패했습니다\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "사용자이름       포트     어디서           최근정보"
 
@@ -1194,14 +1225,6 @@
 msgstr "**한번도 로그인한 적이 없습니다**"
 
 #, 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 "lastlog: %s의 크기를 읽을 수 없습니다: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "사용법: %s [-p] [이름]\n"
 
@@ -1275,6 +1298,11 @@
 msgid "Login incorrect"
 msgstr "로그인이 맞지 않습니다"
 
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: 사용자 이름을 인식할 수 없습니다.\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1396,50 +1424,70 @@
 msgstr "%s: %d번 줄: 입력값을 업데이트 할 수 없습니다\n"
 
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
-msgstr ""
-"사용법: passwd [옵션] [<로그인>]\n"
-"\n"
-"옵션:\n"
-"  -a, --all                     모든 계정의 암호 상태를 보고합니다\n"
-"  -d, --delete                  지정된 계정의 암호를 지웁니다\n"
-"  -e, --expire                  지정된 계정 암호를 강제로 만료시킵니다\n"
-"  -h, --help                    이 도움말 메시지를 표시하고 끝냅니다\n"
-"  -k, --keep-tokens             암호가 만료했을 때만 바꿉니다\n"
-"  -i, --inactive <비활성화기간> 만료된 후 비활성화 기간을 \n"
-"                                <비활성화기간>으로 합니다\n"
-"  -l, --lock                    지정된 계정의 암호를 잠급니다\n"
-"  -n, --mindays <최소날수>      암호를 다시 바꿀 수 있는 최소 일\n"
-"                                수를 <최소날수>로 합니다\n"
-"  -q, --quiet                   조용한 모드\n"
-"  -r, --repository <저장소>     <저장소> 저장소에 있는 암호를 바꿉니다\n"
-"  -S, --status                  지정된 계정의 암호 상태를 보고합니다\n"
-"  -u, --unlock                  지정된 계정의 암호 잠금을 해제합니다\n"
-"  -w, --warndays <경고날수>     암호 만료 예고를 <경고날수> 이전부터 합니다\n"
-"  -x, --maxdays <최대날수>      암호를 바꾸지 않을 수 있는 최대 일\n"
-"                                수를 <최대날수>로 합니다\n"
-"\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
 
 msgid "Old password: "
 msgstr "예전 암호: "
@@ -1525,17 +1573,22 @@
 
 #, fuzzy, c-format
 #| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
 msgstr "사용법: %s [-q] [-r] [-s] [암호 [shadow]]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
 msgstr "사용법: %s [-q] [-r] [-s] [암호 [shadow]]\n"
 
-#, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s 옵션과 -r 옵션을 동시에 쓸 수 없습니다\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1614,9 +1667,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: %s 안의 항목을 정렬할 수 없습니다\n"
 
-msgid "Usage: pwconv\n"
-msgstr "사용법: pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr ""
@@ -1625,9 +1675,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: %s의 모드를 0600으로 바꾸는데 실패했습니다\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "사용법: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "su를 통해 이 계정으로 접근하는 것이 거부되었습니다.\n"
 
@@ -1692,18 +1739,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: 터미널에서 받드시 실행되어야 합니다\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(무시됨)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: 오류 %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "알 수 없는 아이디: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "su %s을(를) 하도록 인증이 되지 않았습니다\n"
 
@@ -1711,14 +1754,6 @@
 msgstr "(본인의 암호를 입력하십시오)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(무시됨)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: 인증이 실패했습니다\n"
 
@@ -1726,9 +1761,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s: 현재 su 명령을 실행할 권한이 없습니다\n"
 
-msgid "No shell\n"
-msgstr "쉘이 없음\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "'루트'에 대한 암호 파일 입력값이 없음"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: 터미널에서 받드시 실행되어야 합니다\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: 오류 %d\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "lastlog: %s의 크기를 읽을 수 없습니다: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "%s을(를) 실행할 수 없습니다"
+
 msgid "No password file"
 msgstr "암호 파일 없음"
 
@@ -1773,7 +1828,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: 이름 다시 설정: %s"
 
 #, c-format
@@ -1787,6 +1842,8 @@
 #, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1928,10 +1985,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: %s 옵션 및 %s 충돌\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 "%s: UID %lu번의 로그인 실패 기록 항목을 초기화하는데 실패했습니다: %s\n"
@@ -1994,30 +2047,38 @@
 "%s: 경고: 홈디렉터리가 이미 있습니다.\n"
 "skel 디렉터리에서 파일을 복사하지 않습니다.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid "  -r, --remove                  remove home directory and mail spool\n"
 msgstr ""
-"사용법: userdel [옵션] <로그인>\n"
-"\n"
-"옵션:\n"
-"  -f, --force                   파일이 사용자 소유자가 아니더라도 강제로\n"
-"                                지웁니다\n"
-"  -h, --help                    이 도움말 메시지를 표시하고 끝냅니다\n"
-"  -r, --remove                  홈 디렉터리와 메일 저장소을 지웁니다\n"
-"\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: '%s' 사용자의 주요 그룹을 제거할 수 없습니다\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 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: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: 홈 디렉터리 '%s'은(는) 잘못되었습니다\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: 경고: %s을(를) 제거할 수 없습니다: %s"
@@ -2049,10 +2110,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: %s 사용자는 NIS 사용자 입니다\n"
 
-#, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: %s 사용자는 현재 로그인한 상태 입니다\n"
-
 #, fuzzy, c-format
 #| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2068,92 +2125,75 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: 디렉터리 %s을(를) 제거하는 데 오류가 발생했습니다\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: usermod [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --comment COMMENT         new value of the GECOS field\n"
-#| "  -d, --home HOME_DIR           new home directory for the user account\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP as new primary group\n"
-#| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-#| "  -a, --append                  append the user to the supplemental "
-#| "GROUPS\n"
-#| "                                mentioned by the -G option without "
-#| "removing\n"
-#| "                                him/her from other groups\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --login NEW_LOGIN         new value of the login name\n"
-#| "  -L, --lock                    lock the user account\n"
-#| "  -m, --move-home               move contents of the home directory to "
-#| "the\n"
-#| "                                new location (use only with -d)\n"
-#| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new "
-#| "password\n"
-#| "  -s, --shell SHELL             new login shell for the user account\n"
-#| "  -u, --uid UID                 new UID for the user account\n"
-#| "  -U, --unlock                  unlock the user account\n"
-#| "\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"사용법: usermod [옵션] <로그인>\n"
-"\n"
-"옵션:\n"
-"  -c, --comment <설명>          GECOS필드의 값을 새로 설정합니다\n"
-"  -d, --home <홈디렉터리>       지정된 사용자 계정의 새 홈 디렉터리를\n"
-"                                지정합니다\n"
-"  -e, --expiredate <만료날짜>   계정 만료 날짜를 <만료날짜>로 합니다\n"
-"  -f, --inactive <비활성화기간> 만료된 후 비활성화 기간을 <비활성화기간>으"
-"로\n"
-"                                합니다\n"
-"  -g, --gid <그룹>              새 주요 그룹을 <그룹>으로 강제로 지정합니다\n"
-"  -G, --groups <그룹목록>       보조 그룹의 목록을 새로 지정합니다\n"
-"  -a, --append                  사용자를 보조 그룹 <그룹>에 추가합니다\n"
-"                                (그룹 목록은 -G 옵션에 나타나고 다른\n"
-"                                그룹의 추가 삭제 상태는 변하지 않습니다)\n"
-"  -h, --help                    이 도움말을 표시하고 끝냅니다\n"
-"  -l, --login <새로그인>        로그인 이름을 새로 지정합니다\n"
-"  -L, --lock                    지정된 사용자 계정을 잠급니다\n"
-"  -m, --move-home               홈 디렉터리의 내용을 새 홈 디렉터리로 옮깁니"
-"다\n"
-"                                (-d 옵션과 함께 사용해야 합니다)\n"
-"  -o, --non-unique              중복되는 UID도 허용합니다\n"
-"  -p, --password <암호>         새로 사용할 암호를 암호화하여 사용합니다\n"
-"  -s, --shell <쉘>              지정된 사용자 계정의 로그인 쉘을 지정합니다\n"
-"  -u, --uid <UID>               지정된 사용자 계정의 새 <UID> 값을 지정합니"
-"다\n"
-"  -U, --unlock                  사용자 계정의 잠금을 해제합니다\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2171,19 +2211,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: '%s' 사용자가 이미 %s 안에 있습니다\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: %s을(를) 열 수 없습니다\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: 주어진 플래그가 없습니다\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr "%s: -L, -p, -U 옵션은 한 번에 하나만 쓸 수 있습니다\n"
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: -e 옵션과 -f 옵션은 셰도우 암호가 필요합니다\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr "%s: -L, -p, -U 옵션은 한 번에 하나만 쓸 수 있습니다\n"
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr "%s: '%lu' UID가 이미 있습니다\n"
 
@@ -2253,9 +2294,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2333,8 +2371,352 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: 기본 디렉터리 '%s' 잘못되었습니다\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d)에 실패\n"
+
 #, fuzzy
 #~| msgid ""
+#~| "Usage: chage [options] [LOGIN]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+#~| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -l, --list                    show account aging information\n"
+#~| "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~| "password\n"
+#~| "                                change to MIN_DAYS\n"
+#~| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~| "password\n"
+#~| "                                change to MAX_DAYS\n"
+#~| "  -W, --warndays WARN_DAYS      set expiration warning days to "
+#~| "WARN_DAYS\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "사용법: chage [옵션] [로그인]\n"
+#~ "\n"
+#~ "옵션:\n"
+#~ "  -d, --lastday <최근날짜>       최근 암호를 바꾼 날짜를 <최근날짜>로 합니"
+#~ "다.\n"
+#~ "  -E, --expiredate <만료날짜>    계정 만료날짜를 <만료날짜>로 합니다.\n"
+#~ "  -h, --help                     이 도움말을 표시하고 끝냅니다.\n"
+#~ "  -I, --inactive <비활성화기간>  만료된 후 비활성화 기간을 <비활성화기간>"
+#~ "으로\n"
+#~ "                                 합니다\n"
+#~ "  -l, --list                     계정의 사용기한 정보를 표시합니다.\n"
+#~ "  -m, --mindays <최소날수>       암호를 바꾸기 전의 최소 날짜 수를 <최소날"
+#~ "수>로\n"
+#~ "                                 합니다.\n"
+#~ "  -M, --maxdays <최대날수>       암호를 바꾸기 전의 최대 날짜 수를 <최대날"
+#~ "수>로\n"
+#~ "                                 합니다.\n"
+#~ "  -W, --warndays <경고날수>      만료 경고 기간을 <경고날수>으로 합니다.\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM 인증이 실패했습니다\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "사용법: %s [-f 이름] [-r 방_번호] [-w 직장_전화번호]\n"
+#~ "\t[-h 집_전화번호] [-o 기타] [사용자]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "사용법: %s [-f 이름] [-r 방_번호] [-w 직장_전화번호] [-h 집_전화번호]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "사용법: %s [옵션]\n"
+#~ "\n"
+#~ "옵션:\n"
+#~ "  -c, --crypt-method            암호화 방법 (다음 중 하나: %s)\n"
+#~ "  -e, --encrypted               입력하는 암호가 암호화되어 있습니다\n"
+#~ "  -h, --help                    이 도움말 메시지를 표시하고 끝냅니다\n"
+#~ "  -m, --md5                     일반 텍스트 암호를 MD5 알고리즘을 사용해\n"
+#~ "                                암호화합니다\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "사용법: chsh [옵션] [<로그인>]\n"
+#~ "\n"
+#~ "옵션:\n"
+#~ "  -h, --help                    이 도움말 메시지를 표시하고 끝냅니다\n"
+#~ "  -s, --shelll <쉘>             사용자 계정의 새 로그인 쉘\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "사용법: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "faillog: Failed to get the entry for UID %d\n"
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "faillog: UID %d번의 항목을 읽는데 실패했습니다\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "faillog: %s을(를) 열 수 없습니다: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: %s의 크기를 얻을 수 없습니다: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "사용법: groupdel 그룹\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s 옵션과 -r 옵션을 동시에 쓸 수 없습니다\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "사용법: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "사용법: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "사용법: lastlog [옵션]\n"
+#~ "\n"
+#~ "옵션:\n"
+#~ "  -b, --before <날짜>           <날짜>일 이전의 최근 기록을 표시합니다\n"
+#~ "  -h, --help                    이 도움말 메시지를 표시하고 끝냅니다\n"
+#~ "  -t, --time <날짜>             <날짜>일 내의 최근 기록만 표시합니다\n"
+#~ "  -u, --user <로그인>           <로그인> 사용자의 최근 기록만 표시합니다\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\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"
+#~ "  -d, --delete                  지정된 계정의 암호를 지웁니다\n"
+#~ "  -e, --expire                  지정된 계정 암호를 강제로 만료시킵니다\n"
+#~ "  -h, --help                    이 도움말 메시지를 표시하고 끝냅니다\n"
+#~ "  -k, --keep-tokens             암호가 만료했을 때만 바꿉니다\n"
+#~ "  -i, --inactive <비활성화기간> 만료된 후 비활성화 기간을 \n"
+#~ "                                <비활성화기간>으로 합니다\n"
+#~ "  -l, --lock                    지정된 계정의 암호를 잠급니다\n"
+#~ "  -n, --mindays <최소날수>      암호를 다시 바꿀 수 있는 최소 일\n"
+#~ "                                수를 <최소날수>로 합니다\n"
+#~ "  -q, --quiet                   조용한 모드\n"
+#~ "  -r, --repository <저장소>     <저장소> 저장소에 있는 암호를 바꿉니다\n"
+#~ "  -S, --status                  지정된 계정의 암호 상태를 보고합니다\n"
+#~ "  -u, --unlock                  지정된 계정의 암호 잠금을 해제합니다\n"
+#~ "  -w, --warndays <경고날수>     암호 만료 예고를 <경고날수> 이전부터 합니"
+#~ "다\n"
+#~ "  -x, --maxdays <최대날수>      암호를 바꾸지 않을 수 있는 최대 일\n"
+#~ "                                수를 <최대날수>로 합니다\n"
+#~ "\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "사용법: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "사용법: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "알 수 없는 아이디: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "쉘이 없음\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "사용법: userdel [옵션] <로그인>\n"
+#~ "\n"
+#~ "옵션:\n"
+#~ "  -f, --force                   파일이 사용자 소유자가 아니더라도 강제로\n"
+#~ "                                지웁니다\n"
+#~ "  -h, --help                    이 도움말 메시지를 표시하고 끝냅니다\n"
+#~ "  -r, --remove                  홈 디렉터리와 메일 저장소을 지웁니다\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: %s 사용자는 현재 로그인한 상태 입니다\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Usage: usermod [options] LOGIN\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~| "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~| "  -a, --append                  append the user to the supplemental "
+#~| "GROUPS\n"
+#~| "                                mentioned by the -G option without "
+#~| "removing\n"
+#~| "                                him/her from other groups\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~| "  -L, --lock                    lock the user account\n"
+#~| "  -m, --move-home               move contents of the home directory to "
+#~| "the\n"
+#~| "                                new location (use only with -d)\n"
+#~| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~| "  -p, --password PASSWORD       use encrypted password for the new "
+#~| "password\n"
+#~| "  -s, --shell SHELL             new login shell for the user account\n"
+#~| "  -u, --uid UID                 new UID for the user account\n"
+#~| "  -U, --unlock                  unlock the user account\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "사용법: usermod [옵션] <로그인>\n"
+#~ "\n"
+#~ "옵션:\n"
+#~ "  -c, --comment <설명>          GECOS필드의 값을 새로 설정합니다\n"
+#~ "  -d, --home <홈디렉터리>       지정된 사용자 계정의 새 홈 디렉터리를\n"
+#~ "                                지정합니다\n"
+#~ "  -e, --expiredate <만료날짜>   계정 만료 날짜를 <만료날짜>로 합니다\n"
+#~ "  -f, --inactive <비활성화기간> 만료된 후 비활성화 기간을 <비활성화기간>으"
+#~ "로\n"
+#~ "                                합니다\n"
+#~ "  -g, --gid <그룹>              새 주요 그룹을 <그룹>으로 강제로 지정합니"
+#~ "다\n"
+#~ "  -G, --groups <그룹목록>       보조 그룹의 목록을 새로 지정합니다\n"
+#~ "  -a, --append                  사용자를 보조 그룹 <그룹>에 추가합니다\n"
+#~ "                                (그룹 목록은 -G 옵션에 나타나고 다른\n"
+#~ "                                그룹의 추가 삭제 상태는 변하지 않습니다)\n"
+#~ "  -h, --help                    이 도움말을 표시하고 끝냅니다\n"
+#~ "  -l, --login <새로그인>        로그인 이름을 새로 지정합니다\n"
+#~ "  -L, --lock                    지정된 사용자 계정을 잠급니다\n"
+#~ "  -m, --move-home               홈 디렉터리의 내용을 새 홈 디렉터리로 옮깁"
+#~ "니다\n"
+#~ "                                (-d 옵션과 함께 사용해야 합니다)\n"
+#~ "  -o, --non-unique              중복되는 UID도 허용합니다\n"
+#~ "  -p, --password <암호>         새로 사용할 암호를 암호화하여 사용합니다\n"
+#~ "  -s, --shell <쉘>              지정된 사용자 계정의 로그인 쉘을 지정합니"
+#~ "다\n"
+#~ "  -u, --uid <UID>               지정된 사용자 계정의 새 <UID> 값을 지정합"
+#~ "니다\n"
+#~ "  -U, --unlock                  사용자 계정의 잠금을 해제합니다\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: 주어진 플래그가 없습니다\n"
+
+#, fuzzy
+#~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
 #~| "Options:\n"

Modified: upstream/trunk/po/nb.po
===================================================================
--- upstream/trunk/po/nb.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/nb.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -11,7 +11,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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2009-04-12 17:14+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst at skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -44,6 +44,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "feil med oppsettet - ukjent element «%s» (kontakt administrator)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Passord: "
 
@@ -238,6 +246,11 @@
 "(%lu)\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "klarte ikke å endre eier av mailbox"
+
 # , c-format
 #, fuzzy, c-format
 #| msgid "%s: Can't get unique UID (no more available UIDs)\n"
@@ -326,6 +339,33 @@
 msgstr "Feil passord for «%s».\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: klarte ikke minske privilegier (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: ugyldig hjemmetelefon: «%s»\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: kan ikke opprette mappa %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: kan ikke opprette mappa %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -355,69 +395,71 @@
 msgid "Unable to determine your tty name."
 msgstr "Kan ikke finne ut ditt terminalnavn."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) mislyktes\n"
-
 msgid "No"
 msgstr "Nei"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "Bruk: %s [input]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Bruk: chage [valg] [bruker]\n"
-"\n"
-"Valg:\n"
-"  -d, --lastday SISTE_DAG       angi at siste passord-endring skjedde "
-"SISTE_DAG\n"
-"  -E, --expiredate UTLØPSDATO   angi at kontoen utløper UTLØPSDATO\n"
-"  -h, .--help                   vis denne hjelpeteksten og avslutt\n"
-"  -I, --inaktive INAKTIV        angi at passordet settes inaktivt etter "
-"utløp\n"
-"  -l, --list                    vis informasjon om kontoens aldring og "
-"utløp\n"
-"  m, --mindays MIN_DAGER        oppgir at passordet først kan endres etter\n"
-"                                MIN_DAGER\n"
-"  M, --maxdays MAKS_DAGER       oppgir at passordet må endres før det er\n"
-"                                gått MAKS_DAGER\n"
-"  -W, --warndays VARSLDAGER     etter VARSLDAGER varsles bruker om at\n"
-"                                passordet snart utløper\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr ""
@@ -491,9 +533,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 # , c-format
 #, c-format
@@ -519,10 +562,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: skyggepassordfila finnes ikke\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: klarte ikke minske privilegier (%s)\n"
-
 # , c-format
 #, c-format
 msgid "%s: user '%s' does not exist in %s\n"
@@ -536,18 +575,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: feil ved endring i feltene\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "Bruk: %s [input]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Bruk: %s [-f fullt_navn] [-r rom_nr] [-w jobbtlf]\n"
-"\t[-h hjemmetlf] [-o annet] [bruker]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
-msgstr "Bruk: %s [-f fullt_navn] [-r rom_nr] [-w jobbtlf] [-h hjemmetlf]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Fullt navn"
 
@@ -625,37 +678,31 @@
 msgid "%s: fields too long\n"
 msgstr "%s: feltene er for lange\n"
 
-# , c-format
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --crypt-method            the crypt method (one of %s)\n"
-#| "  -e, --encrypted               supplied passwords are encrypted\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
-#| "%s\n"
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "Bruk: %s [input]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Bruk: %s [valg]\n"
-"\n"
-"Valg:\n"
-"  -c, --crypt-method        krypteringsmetode (en av %s)\n"
-"  -e, --encrypted               oppgitte passord er krypterte\n"
-"  h, --help                     vis denne hjelpeteksten og avslutt\n"
-"  -m, --md5                     krypter klartekst-passordene med\n"
-"                                 MD5-algoritmen\n"
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -699,35 +746,6 @@
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: feil funnet, endringer er ikke utført\n"
 
-#, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Bruk: %s [input]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
-"                                kryptoalgoritmene\n"
-
 # , c-format
 #, fuzzy, c-format
 #| msgid "%s: line %d: user '%s' does not exist\n"
@@ -739,20 +757,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: linje %d: bruker «%s» finnes ikke\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Bruk: chsh [valg] LOGIN\n"
-"\n"
-"Valg:\n"
-"  -h, --help        vis denne meldingen og avslutt\n"
-"  -s, --shell SKALL      nytt innloggingsskall for brukerkontoen\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "Innloggingsskall"
@@ -786,9 +792,30 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: advarsel: %s er ikke eid av %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Bruk: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: konflikt mellom valgene %s og %s\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: uventet argument: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -816,9 +843,9 @@
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to get the entry for UID %d\n"
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "faillog: klarte ikke finne oppføring for UID %d\n"
+#| msgid "lastlog: Failed to get the entry for UID %d\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog: Klarte ikke hente innslag for UID %d\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Logginn       Mislykt Maksimum Siste                   På\n"
@@ -834,33 +861,30 @@
 
 #, fuzzy, c-format
 #| msgid "faillog: Failed to reset fail count for UID %d\n"
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: Klarte ikke tilbakestille feiltelling for UID %d\n"
 
 #, fuzzy, c-format
 #| msgid "faillog: Failed to set max for UID %d\n"
-msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "faillog: Klarte ikke sette maksimum for UID %d\n"
 
 #, fuzzy, c-format
 #| msgid "faillog: Failed to set locktime for UID %d\n"
-msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: Klarte ikke sette låsetid for UID %d\n"
 
 # , c-format
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog: Ukjent bruker eller område: %s\n"
 
-# , c-format
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "faillog: Kan ikke åpne %s:%s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: Kan ikke finne størrelse på %s: %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: Kan ikke finne størrelse av %s: %s\n"
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -875,6 +899,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -1022,8 +1049,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s; GID «%lu» finnes fra før.\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Bruk: groupdel gruppe\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Kan ikke avgjøre ditt brukernavn.\n"
 
 # , c-format
 #, c-format
@@ -1136,16 +1165,39 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: ukjent bruker %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Bruk: %s [-r] [-s] [gruppe [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Bruk: %s [input]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Bruk: %s [-r] [-s] [gruppe]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "Bruk: %s [input]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s og -r kan ikke brukes samtidig\n"
 
 msgid "invalid group file entry"
@@ -1215,12 +1267,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: ingen endringer\n"
 
-msgid "Usage: grpconv\n"
-msgstr "Bruk: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "Bruk: grpunconv\n"
-
 # , c-format
 #, c-format
 msgid "%s: cannot delete %s\n"
@@ -1236,30 +1282,18 @@
 msgstr " grupper="
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr ""
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Bruk: lastlog [valg]\n"
-"\n"
-"Valg:\n"
-"  -b, --before DAGER            skriv bare oppføringer eldre enn DAGER\n"
-"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
-"  -t, --time DAGER              skriv bare oppføringer nyere enn DAGER\n"
-"  -u, --user BRUKER             skriv oppføringer for bruker BRUKER\n"
-"\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %d\n"
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Klarte ikke hente innslag for UID %d\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "Brukernavn         Port     Fra             Sist"
 
@@ -1270,14 +1304,6 @@
 msgstr "**Aldri vært innlogget**"
 
 #, 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 "lastlog: Kan ikke finne størrelse på %s: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Bruk: %s [-p] [navn]\n"
 
@@ -1350,6 +1376,11 @@
 msgid "Login incorrect"
 msgstr "Ugyldig innlogging"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: linje %d: kan ikke finne bruker %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1479,50 +1510,76 @@
 msgstr "%s: linje %d: kan ikke oppdatere oppføring\n"
 
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Bruk: passwd [valg] [bruker]\n"
-"\n"
-"Valg:\n"
-"  -a, --all                     rapporter passordstatus for alle kontoer\n"
-"  -d, --delete                  slett passordet for oppgitt konto\n"
-"  -e, --expire                  angi at passordet for konten er utgått\n"
-"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
-"  -k, --keep-tokens             endre passord bare hvis utgått\n"
-"  -i, --inactive INAKTIV        set passord inaktivt etter utløp til "
-"INAKTIV\n"
-"  -l, --lock                    lås oppgitt konto\n"
-"  -n, --mindays MIN_DAGER       angi at passord ikke kan endres før etter\n"
-"                                MIN_DAGER\n"
-"  -q, --quiet                   ordknapp kjøremåte\n"
-"  -r, --repository LAGER        endre passord i lageret LAGER\n"
-"  -S, --status                  rapporter passordstatus på oppgitt konto\n"
-"  -u, .--unlock                 lås opp oppgitt konto\n"
-"  -w, --warndays DAGER          varsle om utgått passord DAGER før utløp\n"
-"  -x, --maxdays MAX_DAGER           passordet må endres før det er gått "
-"MAX_DAGER\n"
-"\n"
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
 
 msgid "Old password: "
 msgstr "Gammelt passord: "
@@ -1610,19 +1667,24 @@
 msgstr "Varsel når passordet snart går ut på dato"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Bruk: %s [-q] [-r] [-s] [passord [shadow]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "Bruk: %s [input]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Bruk: %s [-q] [-r] [-s] [passord [shadow]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s og -r kan ikke brukes samtidig\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Bruk: %s [input]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1705,9 +1767,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: kan ikke sortere oppføringer i %s\n"
 
-msgid "Usage: pwconv\n"
-msgstr "Bruk: pwconv\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1717,9 +1776,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: klarte ikke endre rettigheter på %s til 0600\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "Bruk: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "NEKTET tilgang til su til den kontoen.\n"
 
@@ -1785,32 +1841,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: må kjøres fra en terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ignorert)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: feil %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Ukjent id: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Du har ikke adgang til å su %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(Oppgi ditt eget passord)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ignorert)\n"
-
 # , c-format
 #, c-format
 msgid "%s: Authentication failure\n"
@@ -1821,9 +1865,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s: Du har ikke adgang til å su på den tiden\n"
 
-msgid "No shell\n"
-msgstr "Mangler skall\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Ingen oppføring for «root» i passordfila"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: må kjøres fra en terminal\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: feil %d\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "lastlog: Kan ikke finne størrelse på %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Kan ikke utføre %s"
+
 msgid "No password file"
 msgstr "Ingen passordfil."
 
@@ -1868,7 +1932,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: gi nytt navn: %s"
 
 #, c-format
@@ -1883,6 +1947,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "Bruk: %s [input]\n"
@@ -2036,10 +2102,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: konflikt mellom valgene %s og %s\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr "%s: klarte ikke nullstille faillog-innslaget for UID %lu: %s\n"
 
@@ -2107,31 +2169,42 @@
 "%s: advarsel: hjemmemappa finnes fra før.\n"
 "Kopierer ikke filer dit fra skel-mappa.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Bruk: userdel [valg] LOGIN\n"
-"\n"
-"Valg:\n"
-"  -f, --force                   slett filer, selv om det ikke er\n"
-"                                brukeren som eier dem\n"
-"  -h, --help                    vis denne meldingen og avslutt\n"
-"  -r, --remove                  slett hjemmemappa og postkassa\n"
-"\n"
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 # , c-format
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: kan ikke fjerne hovedgruppa til bruker «%s».\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+# , c-format
+#, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: gruppa %s er en primærgruppe for en annen bruker og blir ikke fjernet.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: ugyldig hjemmemappe «%s»\n"
+
 # , c-format
 #, fuzzy, c-format
 #| msgid "%s: warning: can't remove %s: %s"
@@ -2166,10 +2239,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: bruker %s er en NIS bruker\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: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2184,80 +2253,83 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: feil ved fjerning av mappe %s\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: usermod [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --comment COMMENT         new value of the GECOS field\n"
-#| "  -d, --home HOME_DIR           new home directory for the user account\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP as new primary group\n"
-#| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-#| "  -a, --append                  append the user to the supplemental "
-#| "GROUPS\n"
-#| "                                mentioned by the -G option without "
-#| "removing\n"
-#| "                                him/her from other groups\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --login NEW_LOGIN         new value of the login name\n"
-#| "  -L, --lock                    lock the user account\n"
-#| "  -m, --move-home               move contents of the home directory to "
-#| "the\n"
-#| "                                new location (use only with -d)\n"
-#| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new "
-#| "password\n"
-#| "  -s, --shell SHELL             new login shell for the user account\n"
-#| "  -u, --uid UID                 new UID for the user account\n"
-#| "  -U, --unlock                  unlock the user account\n"
-#| "\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Bruk: usermod [valg] konto\n"
-"\n"
-"Valg:\n"
-"  -a, --append                     legg til bruker i tilleggsgruppene "
-"GRUPPER\n"
-"                                         nevnt i valget -G uten å fjerne ham/"
-"henne fra\n"
-"                                         andre grupper\n"
-"   -c, --comment KOMMENTAR       ny verdi i GECOS-feltet\n"
-"  -d, --home HJEMME             hjemmemappe for den nye kontoen\n"
-"  -e, --expiredate DATO         kontoen utgår på datoen DATE\n"
-"  -f, --inactive INAKTIV        passordet settes inaktivt etter utløp\n"
-"  -g, --gid GRUPPE              bruk GRUPPE som ny primærgruppe\n"
-"  -G, --groups GRUPPER      ny  liste over tilleggsgrupper\n"
-"  -h, --help                         vis denne hjelpeteksten og avslutt\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2276,19 +2348,21 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: bruker «%sx finnes fra før i %s\n"
 
+# , c-format
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: kan ikke åpne %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: ingen flagg oppgitt\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr "%s: valgene -L, -p og -U utelukker hverandre\n"
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: shadow-passord kreves for -e og -f\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr "%s: valgene -L, -p og -U utelukker hverandre\n"
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr "%s: UID «%lu» finnes fra før\n"
 
@@ -2362,9 +2436,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2444,8 +2515,363 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: ugyldig basismappe «%s»\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) mislyktes\n"
+
 #, fuzzy
 #~| msgid ""
+#~| "Usage: chage [options] [LOGIN]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+#~| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -l, --list                    show account aging information\n"
+#~| "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~| "password\n"
+#~| "                                change to MIN_DAYS\n"
+#~| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~| "password\n"
+#~| "                                change to MAX_DAYS\n"
+#~| "  -W, --warndays WARN_DAYS      set expiration warning days to "
+#~| "WARN_DAYS\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Bruk: chage [valg] [bruker]\n"
+#~ "\n"
+#~ "Valg:\n"
+#~ "  -d, --lastday SISTE_DAG       angi at siste passord-endring skjedde "
+#~ "SISTE_DAG\n"
+#~ "  -E, --expiredate UTLØPSDATO   angi at kontoen utløper UTLØPSDATO\n"
+#~ "  -h, .--help                   vis denne hjelpeteksten og avslutt\n"
+#~ "  -I, --inaktive INAKTIV        angi at passordet settes inaktivt etter "
+#~ "utløp\n"
+#~ "  -l, --list                    vis informasjon om kontoens aldring og "
+#~ "utløp\n"
+#~ "  m, --mindays MIN_DAGER        oppgir at passordet først kan endres "
+#~ "etter\n"
+#~ "                                MIN_DAGER\n"
+#~ "  M, --maxdays MAKS_DAGER       oppgir at passordet må endres før det er\n"
+#~ "                                gått MAKS_DAGER\n"
+#~ "  -W, --warndays VARSLDAGER     etter VARSLDAGER varsles bruker om at\n"
+#~ "                                passordet snart utløper\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM autentisering mislyktes\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Bruk: %s [-f fullt_navn] [-r rom_nr] [-w jobbtlf]\n"
+#~ "\t[-h hjemmetlf] [-o annet] [bruker]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr "Bruk: %s [-f fullt_navn] [-r rom_nr] [-w jobbtlf] [-h hjemmetlf]\n"
+
+# , c-format
+#, fuzzy
+#~| msgid ""
+#~| "Usage: %s [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~| "  -e, --encrypted               supplied passwords are encrypted\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -m, --md5                     encrypt the clear text password using\n"
+#~| "                                the MD5 algorithm\n"
+#~| "%s\n"
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Bruk: %s [valg]\n"
+#~ "\n"
+#~ "Valg:\n"
+#~ "  -c, --crypt-method        krypteringsmetode (en av %s)\n"
+#~ "  -e, --encrypted               oppgitte passord er krypterte\n"
+#~ "  h, --help                     vis denne hjelpeteksten og avslutt\n"
+#~ "  -m, --md5                     krypter klartekst-passordene med\n"
+#~ "                                 MD5-algoritmen\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Bruk: chsh [valg] LOGIN\n"
+#~ "\n"
+#~ "Valg:\n"
+#~ "  -h, --help        vis denne meldingen og avslutt\n"
+#~ "  -s, --shell SKALL      nytt innloggingsskall for brukerkontoen\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Bruk: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "faillog: Failed to get the entry for UID %d\n"
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "faillog: klarte ikke finne oppføring for UID %d\n"
+
+# , c-format
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "faillog: Kan ikke åpne %s:%s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: Kan ikke finne størrelse av %s: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Bruk: groupdel gruppe\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Bruk: %s [-r] [-s] [gruppe [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Bruk: %s [-r] [-s] [gruppe]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s og -r kan ikke brukes samtidig\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Bruk: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Bruk: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Bruk: lastlog [valg]\n"
+#~ "\n"
+#~ "Valg:\n"
+#~ "  -b, --before DAGER            skriv bare oppføringer eldre enn DAGER\n"
+#~ "  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+#~ "  -t, --time DAGER              skriv bare oppføringer nyere enn DAGER\n"
+#~ "  -u, --user BRUKER             skriv oppføringer for bruker BRUKER\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Bruk: passwd [valg] [bruker]\n"
+#~ "\n"
+#~ "Valg:\n"
+#~ "  -a, --all                     rapporter passordstatus for alle kontoer\n"
+#~ "  -d, --delete                  slett passordet for oppgitt konto\n"
+#~ "  -e, --expire                  angi at passordet for konten er utgått\n"
+#~ "  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+#~ "  -k, --keep-tokens             endre passord bare hvis utgått\n"
+#~ "  -i, --inactive INAKTIV        set passord inaktivt etter utløp til "
+#~ "INAKTIV\n"
+#~ "  -l, --lock                    lås oppgitt konto\n"
+#~ "  -n, --mindays MIN_DAGER       angi at passord ikke kan endres før "
+#~ "etter\n"
+#~ "                                MIN_DAGER\n"
+#~ "  -q, --quiet                   ordknapp kjøremåte\n"
+#~ "  -r, --repository LAGER        endre passord i lageret LAGER\n"
+#~ "  -S, --status                  rapporter passordstatus på oppgitt konto\n"
+#~ "  -u, .--unlock                 lås opp oppgitt konto\n"
+#~ "  -w, --warndays DAGER          varsle om utgått passord DAGER før utløp\n"
+#~ "  -x, --maxdays MAX_DAGER           passordet må endres før det er gått "
+#~ "MAX_DAGER\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Bruk: %s [-q] [-r] [-s] [passord [shadow]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Bruk: %s [-q] [-r] [-s] [passord [shadow]]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Bruk: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Bruk: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Ukjent id: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Mangler skall\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Bruk: userdel [valg] LOGIN\n"
+#~ "\n"
+#~ "Valg:\n"
+#~ "  -f, --force                   slett filer, selv om det ikke er\n"
+#~ "                                brukeren som eier dem\n"
+#~ "  -h, --help                    vis denne meldingen og avslutt\n"
+#~ "  -r, --remove                  slett hjemmemappa og postkassa\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: brukeren %s er pålogget\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Usage: usermod [options] LOGIN\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~| "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~| "  -a, --append                  append the user to the supplemental "
+#~| "GROUPS\n"
+#~| "                                mentioned by the -G option without "
+#~| "removing\n"
+#~| "                                him/her from other groups\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~| "  -L, --lock                    lock the user account\n"
+#~| "  -m, --move-home               move contents of the home directory to "
+#~| "the\n"
+#~| "                                new location (use only with -d)\n"
+#~| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~| "  -p, --password PASSWORD       use encrypted password for the new "
+#~| "password\n"
+#~| "  -s, --shell SHELL             new login shell for the user account\n"
+#~| "  -u, --uid UID                 new UID for the user account\n"
+#~| "  -U, --unlock                  unlock the user account\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Bruk: usermod [valg] konto\n"
+#~ "\n"
+#~ "Valg:\n"
+#~ "  -a, --append                     legg til bruker i tilleggsgruppene "
+#~ "GRUPPER\n"
+#~ "                                         nevnt i valget -G uten å fjerne "
+#~ "ham/henne fra\n"
+#~ "                                         andre grupper\n"
+#~ "   -c, --comment KOMMENTAR       ny verdi i GECOS-feltet\n"
+#~ "  -d, --home HJEMME             hjemmemappe for den nye kontoen\n"
+#~ "  -e, --expiredate DATO         kontoen utgår på datoen DATE\n"
+#~ "  -f, --inactive INAKTIV        passordet settes inaktivt etter utløp\n"
+#~ "  -g, --gid GRUPPE              bruk GRUPPE som ny primærgruppe\n"
+#~ "  -G, --groups GRUPPER      ny  liste over tilleggsgrupper\n"
+#~ "  -h, --help                         vis denne hjelpeteksten og avslutt\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: ingen flagg oppgitt\n"
+
+#, fuzzy
+#~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
 #~| "Options:\n"
@@ -3061,9 +3487,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/ne.po
===================================================================
--- upstream/trunk/po/ne.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/ne.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2006-06-16 14:30+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva at hotmail.com>\n"
 "Language-Team: Nepali <info at mpp.org.np>\n"
@@ -39,6 +39,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "कन्फिगरेसन त्रुटि - अज्ञात वस्तु '%s' (प्रशासकलाई सूचना गर्नुहोस)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "पासवर्ड: "
 
@@ -228,6 +236,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "मेलबक्स प्रापक परिवर्तन गर्न असफल भयो"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: अद्वितिय UID प्राप्त गर्न सकिएन\n"
 
@@ -311,6 +324,33 @@
 msgstr " %s को लागि गलत पासवर्ड ।\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: अवैध गृह फोन: '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: डाइरेकट्री सिर्जना गर्न सकिएन %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: डाइरेकट्री सिर्जना गर्न सकिएन %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -338,51 +378,55 @@
 msgid "Unable to determine your tty name."
 msgstr "तपाईँको tty नाम निर्धारण गर्न सकिएन।"
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) असफल भयो\n"
-
 #, fuzzy
 #| msgid "No\n"
 msgid "No"
 msgstr "होइन\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "उपयोग: %s [आगत]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"उपयोग:प्रयोगकर्ता [विकल्पहरू] परिवर्तन गर्नुहोस्\n"
-"\n"
-" विकल्पहरू:\n"
-"  -d, --अन्तिम दिन LAST_DAY\t ले LAST_DAY मा परिवर्तन भएको अन्तिम पासवर्ड सेट\n"
-"\t\t\t\tगर्दछ\n"
-"  -E, --समाप्त मिति EXPIRE_DATE\t ले EXPIRE_DATE मा खाता समाप्त मिति सेट गर्दछ\n"
-"  -h, --help\t\t\t ले यो मद्दत संदेशलाई प्रदर्शित र बन्द गर्दछ\n"
-"  -I, --निष्क्रिय INACTIVE\t ले म्याद समाप्त भएपछि निष्क्रिय पासवर्ड सेट गर्दछ\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --सूचि\t\t\t ले खाता अवधि सूचना देखाउँछ\n"
-"  -m, --न्युनतम दिन MIN_DAYS\tपासवर्ड अघि दिनहरुको न्युनतम संख्या सेट गर्दछ\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --अधिकमत दिन MAX_DAYS\tपासवर्ड अघि दिनहरुको न्युनतम संख्या सेट गर्दछ\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --चेतावनी दिन WARN_DAYS\t ले WARN_DAYS मा समाप्त भएको चेतावनी दिनहरू सेट \n"
-"\t\t\t\tगर्दछ\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "नयाँ मान प्रविष्टि गर्नुहोस्, वा पूर्वनिर्धारितको लागि ENTER थिच्नुहोस्"
@@ -455,9 +499,10 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: तपाईँको प्रयोगकर्ता नाम निर्धारण गर्न सकिएन ।\n"
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr "%s: PAM आधिकरण असफल भयो\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -482,10 +527,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: स्याडो पासवर्ड फाइल प्रस्तुत भएको छैन\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
@@ -498,18 +539,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: त्रुटि परिवर्तन फाँट\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "उपयोग: %s [आगत]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"उपयोग: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
-msgstr "उपयोग: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "पुरा नाम"
 
@@ -587,25 +642,24 @@
 msgstr "%s: अति लामो फाँट\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "उपयोग: %s [आगत]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"उपयोग: पासवर्ड परिवर्तन गर्नुहोस् [options]\n"
-"\n"
-"विकल्पहरू:\n"
-"  -e, --गुप्तिकृत\tआपूर्ति भएका पासवर्डहरू गुप्तिकृत छन\n"
-"  -h, --मद्दत\t\tले यो मद्दत संदेशलाई प्रदर्शित र बन्द गर्छ\n"
-"  -m, --md5\t\tले DES को सट्टामा MD5 प्रयोग गर्छ जब आपूर्ति भएको\n"
-"\t\t\tपासवर्डहरू गुप्तिकृत भएको हुदैन\n"
-"\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -647,29 +701,6 @@
 msgstr "%s: त्रुटि पत्ता लाग्यो, परिवर्तनहरू उपेक्षा गरियो\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "उपयोग: %s [आगत]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
 
@@ -677,22 +708,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
 
-#, fuzzy
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"उपयोग: userdel [options] LOGIN\n"
-"\n"
-"विकल्पहरू:\n"
-"  -f, --force\t\t\tप्रयोगकर्ताले प्राप्त नगरेता पनि, फाइलहरुको हटाईमा जोड गर्दछ\n"
-"  -h, --help\t\t\tयो मद्दत संदेशलाई प्रदर्शन गर्छ र बनद गर्दछ\n"
-"  -r, --remove\t\t\tगृह डाइरेक्ट्री र मेल स्पूललाई हटाउँछ \n"
-"\n"
 
 msgid "Login Shell"
 msgstr "शेल लगइन"
@@ -725,9 +742,24 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: चेतावनी: %s चाँहि %s को स्वामित्वमा छैन\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "उपयोग: अवधि {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "अन्तिम लग: अनपेक्षित तर्क: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -754,9 +786,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: डाइरेकट्री सिर्जना गर्न सकिएन %s\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "सबैभन्दा पछि                  असफल भएको                           लगइन\n"
@@ -770,31 +803,30 @@
 msgid " [%lds lock]"
 msgstr " [%lds lock]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: डाइरेकट्री सिर्जना गर्न सकिएन %s\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: डाइरेकट्री सिर्जना गर्न सकिएन %s\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "अज्ञात प्रयोगकर्ता: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "%s: फाइल %s खोल्न सकिएन\n"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: डाइरेक्ट्री %s लाई %s मा पुन:नामकरण गर्न सकिदैन\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -809,6 +841,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -935,8 +970,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-msgid "Usage: groupdel group\n"
-msgstr "उपयोग: groupdel समूह नाम\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: तपाईँको प्रयोगकर्ता नाम निर्धारण गर्न सकिएन ।\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1040,16 +1077,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: अज्ञात प्रयोगकर्ता %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "उपयोग: %s [-r] [-s] [group [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "उपयोग: %s [आगत]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "उपयोग: %s [-r] [-s] [group]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "उपयोग: %s [आगत]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s र -r मिल्दोजुल्दो छैन\n"
 
 msgid "invalid group file entry"
@@ -1119,16 +1173,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: कुनै परिवर्तनहरू छैन\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "उपयोग: groupdel समूह नाम\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "उपयोग: groupdel समूह नाम\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1143,29 +1187,17 @@
 msgid " groups="
 msgstr " समूहहरू="
 
-#, fuzzy
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -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 [options]\n"
-"\n"
-"विकल्पहरू:\n"
-"  -b, --DAYS अगाडि\t DAYS भन्दा पुरानो अन्तिम लग रेकर्ड मुद्रण गर्दछ\n"
-"  -h, --मद्दत\t\tयो मद्दत संदेशलाई प्रदर्शन गर्छ र बन्द गर्दछ\n"
-"  -t, --समय DAYS\t DAYS भन्दा धेरै नविन अन्तिम लग रेकर्डहरू मात्र मुद्रण गर्दछ\n"
-"  -u, --प्रयोगकर्ता LOGIN\t निर्दिष्ट गरिएको LOGIN संगै अन्तिम लग रेकर्डहरू मुद्रण गर्दछ\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1178,14 +1210,6 @@
 msgstr "**Never logged in**"
 
 #, 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"
 
@@ -1260,6 +1284,11 @@
 msgid "Login incorrect"
 msgstr "लगइन गलत छ"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: रेखा %d: प्रयोगकर्ता फेला पार्न सकिएन %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1382,52 +1411,59 @@
 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"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"उपयोग: पासवर्ड [विकल्पहरू] [लगइन]\n"
-"\n"
-"विकल्पहरू:\n"
-"  -a, --सबै\t\t\t सबै खातामा पासवर्ड स्थिति प्रतिवेदन गर्दछ\n"
-"  -d, --मेट्नुहोस्\t\t\t नामकरण गरिएको खाताको लागि पासवर्ड मेट्दछ\n"
-"  -e, --समाप्त हुनु\t\t\t नामकरण गरिएको खाताको लागि पासवर्ड समाप्त गर्न जोड गर्दछ\n"
-"  -h, --मद्दत\t\t\t यो मद्दत संदेशलाई प्रदर्शन गर्दछ र बन्द गर्दछ\n"
-"  -k, --टोकनहरू राख्नुहोस्\t\tयदि समाप्त भएमा मात्र पासवर्ड परिवर्तन गर्नुहोस्\n"
-"  -i, --निस्क्रिय INACTIVE\t समाप्ति पछ निस्क्रियमा निस्क्रिय पासवर्ड सेट गर्नुहोस्\n"
-"  -l, --ताल्चा मार्नुहोस्\t\t\t नामकरण गरिएको खाता ताल्चा मार्नुहोस्\n"
-"  -n, --न्युनतम दिनहरू MIN_DAYS\t ले MIN_DAYS मा पासवर्ड\n"
-"\t\t\t\t परिवर्तन गर्नु अघि दिनहरुको न्युनतम नम्बरलाई सेट गर्दछ\n"
-"  -q, --अन्त्य गर्नुहोस्\t\t\tअन्त्य मोड\n"
-"  -r, --रेपोजिटरी REPOSITORY\t रेपोजिटरीमा पासवर्ड परिवर्तन गर्नुहोस् REPOSITORY \n"
-"  -S, --वस्तुस्थिति\t\t\t नामकरण गरिएको खातामा पासवर्ड वस्तुस्थिति प्रतिवेदन गर्दछ\n"
-"  -u, --अनलग गर्नुहोस्\t\t\t नामकरण गरिएको खाता अनलग गर्नुहोस्\n"
-"  -w, --चेतावनी दिनहरू WARN_DAYS\t WARN_DAYS मा समाप्त भएको चेतावनी दिनहरू सेट\n"
-"\t\t\t\tगर्नुहोस्\n"
-"  -x, --अधिक्तम दिनहरू MAX_DAYS\t ले MAX_DAYS मा\n"
-"\t\t\t\tपासवरड परिवर्तन गर्नु अघि दिनहरुको अधिक्तम नम्बरलाई सेट गर्दछ\n"
-"\n"
 
 msgid "Old password: "
 msgstr "पुरानो पासवर्ड: "
@@ -1511,19 +1547,24 @@
 msgstr "पासवर्ड समाप्ति चेतावनी"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "उपयोग: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "उपयोग: %s [आगत]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "उपयोग: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s र -r मिल्दोजुल्दो छैन\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "उपयोग: %s [आगत]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1606,11 +1647,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: फाइल %s खोल्न सकिएन\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "उपयोग: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1620,11 +1656,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "उपयोग: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "su बाट त्यो खातामा पहुँच गर्न अस्वीकार गरियो ।\n"
 
@@ -1690,32 +1721,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: टर्मिनलबाट चल्नुपर्छ\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(उपेक्षा गरियो)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: त्रुटि %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "अज्ञात id: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "तपाईँ su %s मा प्रमाणिकरण हुनुहुन्न\n"
 
 msgid "(Enter your own password)"
 msgstr "(तपाईँको आफ्नै पासवर्ड प्रविष्ट गर्नुहोस्)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(उपेक्षा गरियो)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1726,9 +1745,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "तपाईँ su %s मा प्रमाणिकरण हुनुहुन्न\n"
 
-msgid "No shell\n"
-msgstr "शेल होइन\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "मूलको लागि पासवर्ड प्रविष्टि छैन'"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: टर्मिनलबाट चल्नुपर्छ\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: त्रुटि %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: डाइरेक्ट्री %s लाई %s मा पुन:नामकरण गर्न सकिदैन\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "%s कार्यान्वयन गर्न सकिएन"
+
 msgid "No password file"
 msgstr "पासवर्ड फाइल होइन"
 
@@ -1773,7 +1812,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: पुन:नामकरण गर्नुहोस्: %s"
 
 #, c-format
@@ -1788,6 +1827,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "उपयोग: %s [आगत]\n"
@@ -1905,10 +1946,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -1972,32 +2009,35 @@
 "%s: चेतावनी: गृह डाइरेक्ट्री पहिल्यै अवस्थित छ ।\n"
 "यसमा स्केल डाइरेक्ट्रीबाट कुनै फाइल प्रतिलिपी भएको छैन ।\n"
 
-#, fuzzy
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"उपयोग: userdel [options] LOGIN\n"
-"\n"
-"विकल्पहरू:\n"
-"  -f, --force\t\t\tप्रयोगकर्ताले प्राप्त नगरेता पनि, फाइलहरुको हटाईमा जोड गर्दछ\n"
-"  -h, --help\t\t\tयो मद्दत संदेशलाई प्रदर्शन गर्छ र बनद गर्दछ\n"
-"  -r, --remove\t\t\tगृह डाइरेक्ट्री र मेल स्पूललाई हटाउँछ \n"
-"\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: NIS ग्राहकमा प्रयोगकर्ता '%s' परिवर्तन गर्न सकिदैन ।\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: अवैध गृह डाइरेक्ट्री '%s'\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: चेतावनी: हट्न सक्दैन "
@@ -2029,10 +2069,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: प्रयोगकर्ता %s NIS प्रयोगकर्ता हो\n"
 
-#, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: प्रयोगकर्ता %s हालै लग गरियो\n"
-
 #, fuzzy, c-format
 #| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2046,57 +2082,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: डाइरेक्ट्री हटाउँदा त्रुटि %s\n"
 
-#, fuzzy, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"उपयोगिता: usermod [options] LOGIN\n"
-"\n"
-"विकल्पहरू:\n"
-"  -a, --append GROUP\t\tबाँकि GROUP मा प्रयोगकर्ता थप गर्नुहोस् \n"
-"  -c, --comment COMMENT\t\t GECOS फाँटको नयाँ मान\n"
-"  -d, --home HOME_DIR\t\tप्रयोगकर्ता खाताका लागि नयाँ गृह डाइरेक्टरी\n"
-"  -e, --expiredate EXPIRE_DATE\tखाता म्याद समाप्ति EXPIRE_DATE मा सेट गर्नुहोस्\n"
-"  -f, --inactive INACTIVE\tम्याद समाप्ति पछि पासवर्ड निस्क्रिय पार्नुहोस्\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\t GROUP लाई नयाँ प्राथमिक समूहको रुपमा प्रयोग गर्न दवाद "
-"दिनुहोस्\n"
-"  -G, --groups GROUPS\t\tबाँकि GROUPS को नयाँ सूची\n"
-"  -h, --help\t\t\tयो मद्दत सन्देश प्रदर्शन गर्नुहोस् र निस्कनुहोस्\n"
-"  -l, --login NEW_LOGIN\t\tलगइन नामको नयाँ मान\n"
-"  -L, --lock\t\t\tप्रयोगकरता खाता ताल्चा मार्नुहोस्\n"
-"  -m, --move-home\t\tगृह डाइरेक्टरिको सामग्रिहरू नयाँ स्थानमा सार्नुहोस् \n"
-"\t\t\t\tlocation ( -d संग मात्रै प्रयोग गर्नुहोस्)\n"
-"  -o, --non-unique\t\tनक्कली प्रयोग गर्न अनुमति दिनुहोस् (अमौलिक) UID\n"
-"  -p, --password PASSWORD\tनयाँ पासवर्डका लागि गुप्तिकृत प्रयोग गर्नुहोस्\n"
-"  -s, --shell SHELL\t\tप्रयोगकर्ता खाताका लागि नयाँ लगइन शेल\n"
-"  -u, --uid UID\t\t\tप्रयोगकर्ता खाताका लागि नयाँ UID\n"
-"  -U, --unlock\t\t\tप्रयोगकर्ता खाताको ताल्चा खोल्नुहोस्\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2113,19 +2151,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: प्रयोगकर्ता %s अवस्थित छ\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: फाइल %s खोल्न सकिएन\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: झण्डाहरू दिएको छैन\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: -e र -f को लागि स्याडो पासवर्डहरुको आवश्यक छ\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr ""
 
@@ -2191,9 +2230,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2276,8 +2312,317 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: अवैध डाइरेक्ट्री '%s'\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) असफल भयो\n"
+
 #, fuzzy
 #~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "उपयोग:प्रयोगकर्ता [विकल्पहरू] परिवर्तन गर्नुहोस्\n"
+#~ "\n"
+#~ " विकल्पहरू:\n"
+#~ "  -d, --अन्तिम दिन LAST_DAY\t ले LAST_DAY मा परिवर्तन भएको अन्तिम पासवर्ड सेट\n"
+#~ "\t\t\t\tगर्दछ\n"
+#~ "  -E, --समाप्त मिति EXPIRE_DATE\t ले EXPIRE_DATE मा खाता समाप्त मिति सेट "
+#~ "गर्दछ\n"
+#~ "  -h, --help\t\t\t ले यो मद्दत संदेशलाई प्रदर्शित र बन्द गर्दछ\n"
+#~ "  -I, --निष्क्रिय INACTIVE\t ले म्याद समाप्त भएपछि निष्क्रिय पासवर्ड सेट गर्दछ\n"
+#~ "\t\t\t\tto INACTIVE\n"
+#~ "  -l, --सूचि\t\t\t ले खाता अवधि सूचना देखाउँछ\n"
+#~ "  -m, --न्युनतम दिन MIN_DAYS\tपासवर्ड अघि दिनहरुको न्युनतम संख्या सेट गर्दछ\n"
+#~ "\t\t\t\tchange to MIN_DAYS\n"
+#~ "  -M, --अधिकमत दिन MAX_DAYS\tपासवर्ड अघि दिनहरुको न्युनतम संख्या सेट गर्दछ\n"
+#~ "\t\t\t\tchange to MAX_DAYS\n"
+#~ "  -W, --चेतावनी दिन WARN_DAYS\t ले WARN_DAYS मा समाप्त भएको चेतावनी दिनहरू "
+#~ "सेट \n"
+#~ "\t\t\t\tगर्दछ\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM आधिकरण असफल भयो\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "उपयोग: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr "उपयोग: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "उपयोग: पासवर्ड परिवर्तन गर्नुहोस् [options]\n"
+#~ "\n"
+#~ "विकल्पहरू:\n"
+#~ "  -e, --गुप्तिकृत\tआपूर्ति भएका पासवर्डहरू गुप्तिकृत छन\n"
+#~ "  -h, --मद्दत\t\tले यो मद्दत संदेशलाई प्रदर्शित र बन्द गर्छ\n"
+#~ "  -m, --md5\t\tले DES को सट्टामा MD5 प्रयोग गर्छ जब आपूर्ति भएको\n"
+#~ "\t\t\tपासवर्डहरू गुप्तिकृत भएको हुदैन\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "उपयोग: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "विकल्पहरू:\n"
+#~ "  -f, --force\t\t\tप्रयोगकर्ताले प्राप्त नगरेता पनि, फाइलहरुको हटाईमा जोड गर्दछ\n"
+#~ "  -h, --help\t\t\tयो मद्दत संदेशलाई प्रदर्शन गर्छ र बनद गर्दछ\n"
+#~ "  -r, --remove\t\t\tगृह डाइरेक्ट्री र मेल स्पूललाई हटाउँछ \n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "उपयोग: अवधि {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: फाइल %s खोल्न सकिएन\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "उपयोग: groupdel समूह नाम\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "उपयोग: %s [-r] [-s] [group [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "उपयोग: %s [-r] [-s] [group]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s र -r मिल्दोजुल्दो छैन\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "उपयोग: groupdel समूह नाम\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "उपयोग: groupdel समूह नाम\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "उपयोग: lastlog [options]\n"
+#~ "\n"
+#~ "विकल्पहरू:\n"
+#~ "  -b, --DAYS अगाडि\t DAYS भन्दा पुरानो अन्तिम लग रेकर्ड मुद्रण गर्दछ\n"
+#~ "  -h, --मद्दत\t\tयो मद्दत संदेशलाई प्रदर्शन गर्छ र बन्द गर्दछ\n"
+#~ "  -t, --समय DAYS\t DAYS भन्दा धेरै नविन अन्तिम लग रेकर्डहरू मात्र मुद्रण गर्दछ\n"
+#~ "  -u, --प्रयोगकर्ता LOGIN\t निर्दिष्ट गरिएको LOGIN संगै अन्तिम लग रेकर्डहरू मुद्रण "
+#~ "गर्दछ\n"
+#~ "\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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "उपयोग: पासवर्ड [विकल्पहरू] [लगइन]\n"
+#~ "\n"
+#~ "विकल्पहरू:\n"
+#~ "  -a, --सबै\t\t\t सबै खातामा पासवर्ड स्थिति प्रतिवेदन गर्दछ\n"
+#~ "  -d, --मेट्नुहोस्\t\t\t नामकरण गरिएको खाताको लागि पासवर्ड मेट्दछ\n"
+#~ "  -e, --समाप्त हुनु\t\t\t नामकरण गरिएको खाताको लागि पासवर्ड समाप्त गर्न जोड "
+#~ "गर्दछ\n"
+#~ "  -h, --मद्दत\t\t\t यो मद्दत संदेशलाई प्रदर्शन गर्दछ र बन्द गर्दछ\n"
+#~ "  -k, --टोकनहरू राख्नुहोस्\t\tयदि समाप्त भएमा मात्र पासवर्ड परिवर्तन गर्नुहोस्\n"
+#~ "  -i, --निस्क्रिय INACTIVE\t समाप्ति पछ निस्क्रियमा निस्क्रिय पासवर्ड सेट गर्नुहोस्\n"
+#~ "  -l, --ताल्चा मार्नुहोस्\t\t\t नामकरण गरिएको खाता ताल्चा मार्नुहोस्\n"
+#~ "  -n, --न्युनतम दिनहरू MIN_DAYS\t ले MIN_DAYS मा पासवर्ड\n"
+#~ "\t\t\t\t परिवर्तन गर्नु अघि दिनहरुको न्युनतम नम्बरलाई सेट गर्दछ\n"
+#~ "  -q, --अन्त्य गर्नुहोस्\t\t\tअन्त्य मोड\n"
+#~ "  -r, --रेपोजिटरी REPOSITORY\t रेपोजिटरीमा पासवर्ड परिवर्तन गर्नुहोस् "
+#~ "REPOSITORY \n"
+#~ "  -S, --वस्तुस्थिति\t\t\t नामकरण गरिएको खातामा पासवर्ड वस्तुस्थिति प्रतिवेदन गर्दछ\n"
+#~ "  -u, --अनलग गर्नुहोस्\t\t\t नामकरण गरिएको खाता अनलग गर्नुहोस्\n"
+#~ "  -w, --चेतावनी दिनहरू WARN_DAYS\t WARN_DAYS मा समाप्त भएको चेतावनी दिनहरू सेट\n"
+#~ "\t\t\t\tगर्नुहोस्\n"
+#~ "  -x, --अधिक्तम दिनहरू MAX_DAYS\t ले MAX_DAYS मा\n"
+#~ "\t\t\t\tपासवरड परिवर्तन गर्नु अघि दिनहरुको अधिक्तम नम्बरलाई सेट गर्दछ\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "उपयोग: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "उपयोग: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "उपयोग: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "उपयोग: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "अज्ञात id: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "शेल होइन\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "उपयोग: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "विकल्पहरू:\n"
+#~ "  -f, --force\t\t\tप्रयोगकर्ताले प्राप्त नगरेता पनि, फाइलहरुको हटाईमा जोड गर्दछ\n"
+#~ "  -h, --help\t\t\tयो मद्दत संदेशलाई प्रदर्शन गर्छ र बनद गर्दछ\n"
+#~ "  -r, --remove\t\t\tगृह डाइरेक्ट्री र मेल स्पूललाई हटाउँछ \n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: प्रयोगकर्ता %s हालै लग गरियो\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "उपयोगिता: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "विकल्पहरू:\n"
+#~ "  -a, --append GROUP\t\tबाँकि GROUP मा प्रयोगकर्ता थप गर्नुहोस् \n"
+#~ "  -c, --comment COMMENT\t\t GECOS फाँटको नयाँ मान\n"
+#~ "  -d, --home HOME_DIR\t\tप्रयोगकर्ता खाताका लागि नयाँ गृह डाइरेक्टरी\n"
+#~ "  -e, --expiredate EXPIRE_DATE\tखाता म्याद समाप्ति EXPIRE_DATE मा सेट "
+#~ "गर्नुहोस्\n"
+#~ "  -f, --inactive INACTIVE\tम्याद समाप्ति पछि पासवर्ड निस्क्रिय पार्नुहोस्\n"
+#~ "\t\t\t\tto INACTIVE\n"
+#~ "  -g, --gid GROUP\t\t GROUP लाई नयाँ प्राथमिक समूहको रुपमा प्रयोग गर्न दवाद "
+#~ "दिनुहोस्\n"
+#~ "  -G, --groups GROUPS\t\tबाँकि GROUPS को नयाँ सूची\n"
+#~ "  -h, --help\t\t\tयो मद्दत सन्देश प्रदर्शन गर्नुहोस् र निस्कनुहोस्\n"
+#~ "  -l, --login NEW_LOGIN\t\tलगइन नामको नयाँ मान\n"
+#~ "  -L, --lock\t\t\tप्रयोगकरता खाता ताल्चा मार्नुहोस्\n"
+#~ "  -m, --move-home\t\tगृह डाइरेक्टरिको सामग्रिहरू नयाँ स्थानमा सार्नुहोस् \n"
+#~ "\t\t\t\tlocation ( -d संग मात्रै प्रयोग गर्नुहोस्)\n"
+#~ "  -o, --non-unique\t\tनक्कली प्रयोग गर्न अनुमति दिनुहोस् (अमौलिक) UID\n"
+#~ "  -p, --password PASSWORD\tनयाँ पासवर्डका लागि गुप्तिकृत प्रयोग गर्नुहोस्\n"
+#~ "  -s, --shell SHELL\t\tप्रयोगकर्ता खाताका लागि नयाँ लगइन शेल\n"
+#~ "  -u, --uid UID\t\t\tप्रयोगकर्ता खाताका लागि नयाँ UID\n"
+#~ "  -U, --unlock\t\t\tप्रयोगकर्ता खाताको ताल्चा खोल्नुहोस्\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: झण्डाहरू दिएको छैन\n"
+
+#, fuzzy
+#~ msgid ""
 #~ "Usage: vipw [options]\n"
 #~ "\n"
 #~ "Options:\n"
@@ -2763,9 +3108,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/nl.po
===================================================================
--- upstream/trunk/po/nl.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/nl.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2007-11-25 21:11+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -38,6 +38,14 @@
 msgstr ""
 "configuratiefout - onbekend item '%s' (waarschuw een systeembeheerder)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Wachtwoord: "
 
@@ -227,6 +235,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "aanpassen van de eigenaar van de e-mailbox is mislukt"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: kan geen unieke UID verkrijgen\n"
 
@@ -310,6 +323,33 @@
 msgstr "Onjuist wachtwoord voor '%s'.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: afgeven van rechten is mislukt (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: '%s' voor 'telefoon thuis' is ongeldig\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: kan map %s niet aanmaken\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: kan map %s niet aanmaken\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -337,70 +377,55 @@
 msgid "Unable to determine your tty name."
 msgstr "Kan de naam van uw tty niet bepalen"
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) is mislukt\n"
-
 #, fuzzy
 #| msgid "No\n"
 msgid "No"
 msgstr "Nee\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "Gebruik: %s [invoer]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Gebruik: chage [opties] [GEBRUIKERSNAAM]\n"
-"\n"
-"Opties:\n"
-"  -d, --lastday LAATSTE_DAG     stel 'laatste wachtwoordaanpassing' in op\n"
-"                                LAATSTE_DAG\n"
-"  -E, --expiredate VERVALDATUM  stel account-vervaldatum in op VERVALDATUM\n"
-"  -h, --help                    geef deze boodschap weer en sluit af\n"
-"  -I, --inactive INACTIEF       stel 'wachtwoord inactief na vervaldatum'\n"
-"                                in op INACTIEF\n"
-"  -l, --list                    geef account-verouderingsinformatie weer\n"
-"  -m, --mindays MIN_DAGEN       stel minimum aantal dagen tussen\n"
-"                                wachtwoordaanpassingen in op MIN_DAGEN\n"
-"  -M, --maxdays MAX_DAGEN       stel maximum aantal dagen tussen\n"
-"                                wachtwoordaanpassingen in op MAX_DAGEN\n"
-"  -W, --warndays WAARSCH_DAGEN  stel aantal dagen met waarschuwing voor\n"
-"                                vervallen account in op WAARSCH_DAGEN\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Voer een nieuwe waarde in of druk op Enter voor de standaardwaarde"
@@ -473,9 +498,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -500,10 +526,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: het schaduwwachtwoordenbestand is afwezig\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: afgeven van rechten is mislukt (%s)\n"
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: gebruiker %s bestaat niet\n"
@@ -516,19 +538,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: fout bij het aanpassen van de velden\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "Gebruik: %s [invoer]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Gebruik: %s [-f volledige_naam] [-r kamer_nr] [-w tel_werk]\n"
-"         [-h tel_thuis] [-o varia] [gebruiker]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
 msgstr ""
-"Gebruik: %s [-f volledige_naam] [-r kamer_nr] [-w tel_werk] [-h tel_thuis]\n"
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Volledige naam"
 
@@ -606,24 +641,24 @@
 msgstr "%s: velden zijn te lang\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "Gebruik: %s [invoer]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Gebruik: chpasswd [opties]\n"
-"\n"
-"Opties:\n"
-"  -e, --encrypted     opgegeven wachtwoorden zijn versleuteld\n"
-"  -h, --help          toon dit bericht en sluit af\n"
-"  -m, --md5           maak gebruik van MD5-versleuteling i.p.v. DES wanneer\n"
-"                      opgegeven wachtwoorden niet versleuteld zijn\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -665,29 +700,6 @@
 msgstr "%s: fouten gedetecteerd, aanpassingen genegeerd\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Gebruik: %s [invoer]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: gebruiker %s bestaat niet\n"
 
@@ -695,20 +707,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: gebruiker %s bestaat niet\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Gebruik: chsh [opties] GEBRUIKERSNAAM\n"
-"\n"
-"Opties:\n"
-"  -h, --help                    toon deze boodschap en sluit af\n"
-"  -r, --shell SHELL             nieuwe aanmeld-shell voor gebruikersaccount\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "Aanmeld-shell"
@@ -741,9 +741,24 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: waarschuwing: %s is niet van %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Gebruik: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: onverwachte parameter: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -770,9 +785,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: kan map %s niet aanmaken\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Gebruiker Missingen Maximum Laatste          Op\n"
@@ -786,31 +802,30 @@
 msgid " [%lds lock]"
 msgstr " [%lds slot]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: kan map %s niet aanmaken\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: afgeven van rechten is mislukt (%s)\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: kan map %s niet aanmaken\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "Onbekende gebruiker %s\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"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: kan map %s niet hernoemen naar %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -825,6 +840,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -952,8 +970,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "Lid bestaat reeds\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Gebruik: groupdel groep\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Kan uw gebruikersnaam niet bepalen.\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1057,16 +1077,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: onbekende gebruiker %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Gebruik: %s [-r] [-s] [groep [gshaduw]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Gebruik: %s [invoer]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Gebruik: %s [-r] [-s] [groep]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "Gebruik: %s [invoer]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s en -r zijn niet compatibel\n"
 
 msgid "invalid group file entry"
@@ -1136,16 +1173,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: geen aanpassingen\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "Gebruik: groupdel groep\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "Gebruik: groupdel groep\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1161,29 +1188,16 @@
 msgstr " groepen="
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -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 ""
-"Gebruik: lastlog [opties]\n"
-"\n"
-"Opties:\n"
-"  -b, --before DAGEN  toon enkel de lastlog-ingangen die ouder zijn dan\n"
-"                      DAGEN\n"
-"  -h, --help          toon dit bericht en sluit af\n"
-"  -t, --time DAGEN    print enkel lastlog-records van de laatste DAGEN "
-"dagen\n"
-"  -u, --user LOGIN    print het lastlog-record van de gebruiker LOGIN\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1196,14 +1210,6 @@
 msgstr "**Heeft zich nog nooit aangemeld**"
 
 #, 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"
 
@@ -1278,6 +1284,11 @@
 msgid "Login incorrect"
 msgstr "Gebruikersnaam is onjuist"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: regel %d: kan gebruiker %s niet vinden\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1401,86 +1412,59 @@
 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"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Gebruik: passwd [opties] [GEBRUIKERSNAAM]\n"
-"\n"
-"Opties:\n"
-"  -a, --all                     geef wachtwoordstatus van alle accounts "
-"weer\n"
-"  -d, --delete                  verwijder het wachtwoord voor de\n"
-"                                genoemde account\n"
-"  -e, --expire                  doe het wachtwoord vervallen voor de\n"
-"                                genoemde account\n"
-"  -h, --help                    toon deze boodschap en sluit af\n"
-"  -k, --keep-tokens             verander wachtwoord indien het vervallen is\n"
-"  -i, --inactive INACTIEF       maak wachtwoord inactief als INACTIEF\n"
-"                                wanneer het vervalt\n"
-"  -l, --lock                    vergrendel de genoemde account\n"
-"  -n, --mindays MIN_DAGEN       stel het minimum aantal dagen voor\n"
-"                                veranderen van het wachtwoord in op "
-"MIN_DAGEN\n"
-"  -q, --quiet                   stille modus\n"
-"  -r, --repository REPOSITORY   verander wachtwoord in REPOSITORY "
-"opslagplaats\n"
-"  -S, --status                  geef de wachtwoordstatus van de genoemde\n"
-"                                account weer\n"
-"  -u, --unlock                  ontgrendel de genoemde account\n"
-"  -w, --warndays WAARSCH_DAGEN  stel het aantal dagen met waarschuwing in\n"
-"                                op WAARSCH_DAGEN\n"
-"  -x, --maxdays MAX_DAGEN       stel het maximum aantal dagen voor\n"
-"                                wachtwoordverandering in op MAX_DAGEN\n"
-"\n"
 
 msgid "Old password: "
 msgstr "Oud wachtwoord: "
@@ -1566,19 +1550,24 @@
 msgstr "Waarschuwing voor wachtwoordverval"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Gebruik: %s [-q] [-r] [-s] [wachtwoord [shaduw]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "Gebruik: %s [invoer]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Gebruik: %s [-q] [-r] [-s] [wachtwoord [shaduw]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s en -r zijn niet compatibel\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Gebruik: %s [invoer]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1661,11 +1650,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: kan bestand %s niet openen\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "Gebruik: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1675,11 +1659,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "Gebruik: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Toegang van 'su' tot die account is GEWEIGERD.\n"
 
@@ -1745,32 +1724,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: dient uitgevoerd te worden vanaf een terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Genegeerd)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: fout %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Onbekend ID: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "U bent niet gerechtigd om 'su %s' uit te voeren\n"
 
 msgid "(Enter your own password)"
 msgstr "(U dient uw eigen wachtwoord in te voeren)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Genegeerd)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1781,9 +1748,29 @@
 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"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Geen wachtwoordingang voor 'root'"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: dient uitgevoerd te worden vanaf een terminal\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: fout %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: kan map %s niet hernoemen naar %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Kan %s niet uitvoeren"
+
 msgid "No password file"
 msgstr "Geen wachtwoordbestand"
 
@@ -1828,7 +1815,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: hernoemen: %s"
 
 #, c-format
@@ -1843,6 +1830,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "Gebruik: %s [invoer]\n"
@@ -1960,10 +1949,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -2030,27 +2015,23 @@
 "Er worden geen bestanden uit de skelet-map overgekopieerd.\n"
 
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Gebruik: userdel [opties] GEBRUIKERSNAAM\n"
-"\n"
-"Opties:\n"
-"  -f, --force                   dwing verwijderen van bestanden af,\n"
-"                                ook wanneer de gebruiker niet de eigenaar "
-"is\n"
-"  -h, --help                    toon deze helbboodschap en sluit af\n"
-"  -r, --remove                  verwijder de thuismap en het mailbox-"
-"bestand\n"
-"\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: kan gebruiker '%s' niet veranderen op NIS-client.\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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"
@@ -2059,6 +2040,11 @@
 "andere gebruiker is.\n"
 
 #, fuzzy, c-format
+#| msgid "%s: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: ongeldige thuismap '%s'\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: waarschuwing: kan niet verwijderen "
@@ -2090,10 +2076,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: gebruiker %s is een NIS-gebruiker\n"
 
-#, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: gebruiker %s is momenteel aangemeld\n"
-
 #, fuzzy, c-format
 #| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2109,61 +2091,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: fout tijdens verwijderen van map %s\n"
 
-#, fuzzy, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Gebruik: usermod [opties] GEBRUIKERSNAAM\n"
-"\n"
-"Opties:\n"
-"  -a, --append GROEP            voeg gebruiker toe aan de extra groep GROEP\n"
-"  -c, --comment OPMERKING       de nieuwe waarde voor het GECOS-veld\n"
-"  -d, --home-dir THUIS_MAP      nieuwe thuismap voor de gebruikersaccount\n"
-"  -e, --expiredate VERVALDATUM  stel de vervaldatum in op VERVALDATUM\n"
-"  -f, --inactive INACTIEF       stel het 'wachtwoord inactief na verval'\n"
-"                                in op INACTIEF\n"
-"  -g, --gid GROEP               dwing gebruik van GROEP af als de nieuwe\n"
-"                                aanmeldgroep\n"
-"  -G, --groups GROEPEN          lijst met aanvullende groepen\n"
-"  -h, --help                    geef deze boodschap weer en sluit af\n"
-"  -l, --login GEBRUIKERSNAAM    nieuwe gebruikersnaam\n"
-"  -L, --lock                    vergrendel de gebruikersaccount\n"
-"  -m, --move-home               verplaats de thuismap naar een nieuwe "
-"locatie\n"
-"                                (enkel gebruiken in combinatie met optie -"
-"d)\n"
-"  -o, --non-unique              laat dubbele (niet-unieke) UID toe\n"
-"  -p, --password WACHTWOORD     gebruik versleuteld wachtwoord als het\n"
-"                                nieuwe wachtwoord\n"
-"  -s, --shell SHELL             gebruik gegeven shell als aanmeld-shell\n"
-"                                voor de gebruikersaccount\n"
-"  -u, --uid UID                 nieuwe UID voor de gebruikersaccount\n"
-"  -U, --unlock                  ontgrendel de gebruikersaccount\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2180,18 +2160,19 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: gebruiker %s bestaat al\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: kan bestand %s niet openen\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: geen opties gegeven\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: schaduwwachtwoorden zijn vereist voor opties -e en -f\n"
 
-#, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
@@ -2260,9 +2241,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2346,8 +2324,382 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: ongeldige basismap '%s'\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) is mislukt\n"
+
 #, fuzzy
 #~| msgid ""
+#~| "Usage: chage [options] [LOGIN]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+#~| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -l, --list                    show account aging information\n"
+#~| "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~| "password\n"
+#~| "                                change to MIN_DAYS\n"
+#~| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~| "password\n"
+#~| "                                change to MAX_DAYS\n"
+#~| "  -W, --warndays WARN_DAYS      set expiration warning days to "
+#~| "WARN_DAYS\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Gebruik: chage [opties] [GEBRUIKERSNAAM]\n"
+#~ "\n"
+#~ "Opties:\n"
+#~ "  -d, --lastday LAATSTE_DAG     stel 'laatste wachtwoordaanpassing' in "
+#~ "op\n"
+#~ "                                LAATSTE_DAG\n"
+#~ "  -E, --expiredate VERVALDATUM  stel account-vervaldatum in op "
+#~ "VERVALDATUM\n"
+#~ "  -h, --help                    geef deze boodschap weer en sluit af\n"
+#~ "  -I, --inactive INACTIEF       stel 'wachtwoord inactief na "
+#~ "vervaldatum'\n"
+#~ "                                in op INACTIEF\n"
+#~ "  -l, --list                    geef account-verouderingsinformatie weer\n"
+#~ "  -m, --mindays MIN_DAGEN       stel minimum aantal dagen tussen\n"
+#~ "                                wachtwoordaanpassingen in op MIN_DAGEN\n"
+#~ "  -M, --maxdays MAX_DAGEN       stel maximum aantal dagen tussen\n"
+#~ "                                wachtwoordaanpassingen in op MAX_DAGEN\n"
+#~ "  -W, --warndays WAARSCH_DAGEN  stel aantal dagen met waarschuwing voor\n"
+#~ "                                vervallen account in op WAARSCH_DAGEN\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM-authentificatie is mislukt\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Gebruik: %s [-f volledige_naam] [-r kamer_nr] [-w tel_werk]\n"
+#~ "         [-h tel_thuis] [-o varia] [gebruiker]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Gebruik: %s [-f volledige_naam] [-r kamer_nr] [-w tel_werk] [-h "
+#~ "tel_thuis]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Gebruik: chpasswd [opties]\n"
+#~ "\n"
+#~ "Opties:\n"
+#~ "  -e, --encrypted     opgegeven wachtwoorden zijn versleuteld\n"
+#~ "  -h, --help          toon dit bericht en sluit af\n"
+#~ "  -m, --md5           maak gebruik van MD5-versleuteling i.p.v. DES "
+#~ "wanneer\n"
+#~ "                      opgegeven wachtwoorden niet versleuteld zijn\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Gebruik: chsh [opties] GEBRUIKERSNAAM\n"
+#~ "\n"
+#~ "Opties:\n"
+#~ "  -h, --help                    toon deze boodschap en sluit af\n"
+#~ "  -r, --shell SHELL             nieuwe aanmeld-shell voor "
+#~ "gebruikersaccount\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Gebruik: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: kan bestand %s niet openen\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Gebruik: groupdel groep\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Gebruik: %s [-r] [-s] [groep [gshaduw]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Gebruik: %s [-r] [-s] [groep]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s en -r zijn niet compatibel\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Gebruik: groupdel groep\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Gebruik: groupdel groep\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Gebruik: lastlog [opties]\n"
+#~ "\n"
+#~ "Opties:\n"
+#~ "  -b, --before DAGEN  toon enkel de lastlog-ingangen die ouder zijn dan\n"
+#~ "                      DAGEN\n"
+#~ "  -h, --help          toon dit bericht en sluit af\n"
+#~ "  -t, --time DAGEN    print enkel lastlog-records van de laatste DAGEN "
+#~ "dagen\n"
+#~ "  -u, --user LOGIN    print het lastlog-record van de gebruiker LOGIN\n"
+#~ "\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Gebruik: passwd [opties] [GEBRUIKERSNAAM]\n"
+#~ "\n"
+#~ "Opties:\n"
+#~ "  -a, --all                     geef wachtwoordstatus van alle accounts "
+#~ "weer\n"
+#~ "  -d, --delete                  verwijder het wachtwoord voor de\n"
+#~ "                                genoemde account\n"
+#~ "  -e, --expire                  doe het wachtwoord vervallen voor de\n"
+#~ "                                genoemde account\n"
+#~ "  -h, --help                    toon deze boodschap en sluit af\n"
+#~ "  -k, --keep-tokens             verander wachtwoord indien het vervallen "
+#~ "is\n"
+#~ "  -i, --inactive INACTIEF       maak wachtwoord inactief als INACTIEF\n"
+#~ "                                wanneer het vervalt\n"
+#~ "  -l, --lock                    vergrendel de genoemde account\n"
+#~ "  -n, --mindays MIN_DAGEN       stel het minimum aantal dagen voor\n"
+#~ "                                veranderen van het wachtwoord in op "
+#~ "MIN_DAGEN\n"
+#~ "  -q, --quiet                   stille modus\n"
+#~ "  -r, --repository REPOSITORY   verander wachtwoord in REPOSITORY "
+#~ "opslagplaats\n"
+#~ "  -S, --status                  geef de wachtwoordstatus van de genoemde\n"
+#~ "                                account weer\n"
+#~ "  -u, --unlock                  ontgrendel de genoemde account\n"
+#~ "  -w, --warndays WAARSCH_DAGEN  stel het aantal dagen met waarschuwing "
+#~ "in\n"
+#~ "                                op WAARSCH_DAGEN\n"
+#~ "  -x, --maxdays MAX_DAGEN       stel het maximum aantal dagen voor\n"
+#~ "                                wachtwoordverandering in op MAX_DAGEN\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Gebruik: %s [-q] [-r] [-s] [wachtwoord [shaduw]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Gebruik: %s [-q] [-r] [-s] [wachtwoord [shaduw]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Gebruik: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Gebruik: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Onbekend ID: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Geen shell\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Gebruik: userdel [opties] GEBRUIKERSNAAM\n"
+#~ "\n"
+#~ "Opties:\n"
+#~ "  -f, --force                   dwing verwijderen van bestanden af,\n"
+#~ "                                ook wanneer de gebruiker niet de eigenaar "
+#~ "is\n"
+#~ "  -h, --help                    toon deze helbboodschap en sluit af\n"
+#~ "  -r, --remove                  verwijder de thuismap en het mailbox-"
+#~ "bestand\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: gebruiker %s is momenteel aangemeld\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Gebruik: usermod [opties] GEBRUIKERSNAAM\n"
+#~ "\n"
+#~ "Opties:\n"
+#~ "  -a, --append GROEP            voeg gebruiker toe aan de extra groep "
+#~ "GROEP\n"
+#~ "  -c, --comment OPMERKING       de nieuwe waarde voor het GECOS-veld\n"
+#~ "  -d, --home-dir THUIS_MAP      nieuwe thuismap voor de "
+#~ "gebruikersaccount\n"
+#~ "  -e, --expiredate VERVALDATUM  stel de vervaldatum in op VERVALDATUM\n"
+#~ "  -f, --inactive INACTIEF       stel het 'wachtwoord inactief na verval'\n"
+#~ "                                in op INACTIEF\n"
+#~ "  -g, --gid GROEP               dwing gebruik van GROEP af als de nieuwe\n"
+#~ "                                aanmeldgroep\n"
+#~ "  -G, --groups GROEPEN          lijst met aanvullende groepen\n"
+#~ "  -h, --help                    geef deze boodschap weer en sluit af\n"
+#~ "  -l, --login GEBRUIKERSNAAM    nieuwe gebruikersnaam\n"
+#~ "  -L, --lock                    vergrendel de gebruikersaccount\n"
+#~ "  -m, --move-home               verplaats de thuismap naar een nieuwe "
+#~ "locatie\n"
+#~ "                                (enkel gebruiken in combinatie met optie -"
+#~ "d)\n"
+#~ "  -o, --non-unique              laat dubbele (niet-unieke) UID toe\n"
+#~ "  -p, --password WACHTWOORD     gebruik versleuteld wachtwoord als het\n"
+#~ "                                nieuwe wachtwoord\n"
+#~ "  -s, --shell SHELL             gebruik gegeven shell als aanmeld-shell\n"
+#~ "                                voor de gebruikersaccount\n"
+#~ "  -u, --uid UID                 nieuwe UID voor de gebruikersaccount\n"
+#~ "  -U, --unlock                  ontgrendel de gebruikersaccount\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: geen opties gegeven\n"
+
+#, fuzzy
+#~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
 #~| "Options:\n"
@@ -2884,9 +3236,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/nn.po
===================================================================
--- upstream/trunk/po/nn.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/nn.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2004-06-03 21:41+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll at skulelinux.no>\n"
 "Language-Team: Norwegian (Nynorsk) <i18n-nn at lister.ping.uio.no>\n"
@@ -37,6 +37,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "oppsettsfeil - ukjent element «%s» (gje melding til administrator)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Passord: "
 
@@ -220,6 +228,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "klarte ikke å endra eigar av mailbox"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: klarer ikkje få unikt gid\n"
 
@@ -304,6 +317,32 @@
 msgstr "Feil passord for «%s»\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: ugyldig telefonnummer, heime: «%s»\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: kan ikkje oppretta mappa %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: kan ikkje oppretta mappa %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -332,31 +371,53 @@
 msgid "Unable to determine your tty name."
 msgstr "%s: Klarer ikkje avgjere brukarnamnet ditt.\n"
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) feila\n"
-
 #, fuzzy
 msgid "No"
 msgstr "Nei"
 
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "Bruk: %s [inndata]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
 
 msgid "Enter the new value, or press ENTER for the default"
@@ -435,9 +496,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: PAM: %s\n"
+msgstr "passwd: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -461,10 +522,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: klarer ikkje opna skuggepassordfila\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: brukar %s finst ikkje\n"
@@ -477,18 +534,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: feil ved endring av felt\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "Bruk: %s [inndata]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Bruk: %s [-f fullt_namn] [-r romnr] [-w tlf_arb]\n"
-"\t[-h tlf_heime] [-o anna] [brukar]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
-msgstr "Bruk: %s [-f fullt_namn] [-r romnr] [-w tlf_arb] [-h tlf_heime]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Fullt namn"
 
@@ -563,17 +634,24 @@
 msgid "%s: fields too long\n"
 msgstr "%s: felta er for lange\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "Bruk: %s [inndata]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 
 msgid ""
@@ -617,29 +695,6 @@
 msgstr "%s: feil funne, endringar er ikkje utført\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Bruk: %s [inndata]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: brukar %s finst ikkje\n"
 
@@ -647,13 +702,7 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: brukar %s finst ikkje\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
 
 msgid "Login Shell"
@@ -687,9 +736,23 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: åtvaring: %s er ikkje eigd av %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Bruk: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: unexpected argument: %s\n"
+msgstr "%s: ugyldig nummerisk argument «%s»\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -716,9 +779,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: kan ikkje oppretta mappa %s\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr ""
@@ -732,31 +796,29 @@
 msgid " [%lds lock]"
 msgstr " [%lds lås]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: kan ikkje oppretta mappa %s\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: ugyldig telefonnummer, arbeid: «%s»\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: kan ikkje oppretta mappa %s\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "Ukjent brukar: %s\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"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: klarte ikkje endra namn på mappa %s til %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -771,6 +833,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -897,8 +962,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-msgid "Usage: groupdel group\n"
-msgstr "Bruk: goupdel gruppe\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Klarer ikkje avgjere brukarnamnet ditt.\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1001,16 +1068,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: ukjend brukar %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Bruk: %s [-r] [-s] [gruppe [gskugge]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Bruk: %s [inndata]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Bruk: %s [-r] [-s] [gruppe]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "Bruk: %s [inndata]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s og -r er inkompatible\n"
 
 msgid "invalid group file entry"
@@ -1078,16 +1162,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: ingen endringar\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "Bruk: goupdel gruppe\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "Bruk: goupdel gruppe\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1103,19 +1177,16 @@
 msgstr " grupper="
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1128,14 +1199,6 @@
 msgstr "**Aldri vore innlogga**"
 
 #, 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"
 
@@ -1212,6 +1275,11 @@
 msgid "Login incorrect"
 msgstr "Feil innlogging"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: linje %d: klarer ikkje finne brukar %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1333,28 +1401,57 @@
 msgstr "%s: linje %d: kan ikkje oppdatere oppføring\n"
 
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
 
 msgid "Old password: "
@@ -1438,19 +1535,24 @@
 msgstr "Åtvaring for utgått passord"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Bruk: %s [-q] [-r] [-s] [passord [skugge]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "Bruk: %s [inndata]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Bruk: %s [-q] [-r] [-s] [passord [skugge]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s og -r er inkompatible\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Bruk: %s [inndata]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1533,11 +1635,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: klarer ikkje opna fila %s\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "Bruk: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1547,11 +1644,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "Bruk: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Tilgang til su for den kontoen er AVVIST.\n"
 
@@ -1605,32 +1697,20 @@
 msgstr ""
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: må køyrast frå ein terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ignorert)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: feil %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Ukjent id: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Du er ikkje autorisert til su %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(Skriv inn ditt eige passord)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ignorert)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1641,9 +1721,29 @@
 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"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Inga passordoppføring for «root»"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: må køyrast frå ein terminal\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: feil %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: klarte ikkje endra namn på mappa %s til %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Klarer ikkje køyra %s"
+
 msgid "No password file"
 msgstr "Inga passordfil"
 
@@ -1688,7 +1788,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: gje nytt namn: %s"
 
 #, fuzzy, c-format
@@ -1703,6 +1803,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "Bruk: %s [inndata]\n"
@@ -1820,10 +1922,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -1885,21 +1983,31 @@
 msgstr ""
 
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: klarer ikkje endra brukar «%s» på NIS-klient.\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, fuzzy, c-format
 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: %s mail spool (%s) not found\n"
+msgstr "%s: ugyldig heimemappe «%s»\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: åtvaring: kan ikkje fjerna "
@@ -1931,10 +2039,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: brukar %s er ikkje ein NIS brukar\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: %s home directory (%s) not found\n"
 msgstr "%s: ugyldig heimemappe «%s»\n"
@@ -1948,34 +2052,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: feil ved fjerning av mappe %s\n"
 
-#, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -1992,19 +2121,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: brukar %s finst\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: klarer ikkje opna fila %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: ingen flagg oppgjeve\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: skuggepassord krevst for -e og -f\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr ""
 
@@ -2070,9 +2200,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2150,7 +2277,83 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: ugyldig startmappe «%s»\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) feila\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM-autentisering feila\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Bruk: %s [-f fullt_namn] [-r romnr] [-w tlf_arb]\n"
+#~ "\t[-h tlf_heime] [-o anna] [brukar]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr "Bruk: %s [-f fullt_namn] [-r romnr] [-w tlf_arb] [-h tlf_heime]\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Bruk: expiry {-f|-c}\n"
+
 #, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: klarer ikkje opna fila %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Bruk: goupdel gruppe\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Bruk: %s [-r] [-s] [gruppe [gskugge]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Bruk: %s [-r] [-s] [gruppe]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s og -r er inkompatible\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Bruk: goupdel gruppe\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Bruk: goupdel gruppe\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Bruk: %s [-q] [-r] [-s] [passord [skugge]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Bruk: %s [-q] [-r] [-s] [passord [skugge]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Bruk: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Bruk: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Ukjent id: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Ingen skal\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: brukaren %s er pålogga\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: ingen flagg oppgjeve\n"
+
+#, fuzzy
 #~| msgid "Usage: %s [input]\n"
 #~ msgid ""
 #~ "Usage: useradd [options] LOGIN\n"
@@ -2458,9 +2661,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/pl.po
===================================================================
--- upstream/trunk/po/pl.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/pl.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2007-11-25 20:53+0100\n"
 "Last-Translator: Tomasz Kłoczko <kloczek at pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -40,6 +40,14 @@
 msgstr ""
 "błąd w konfiguracji - nieznana pozycja '%s' (powiadom administratora)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Hasło: "
 
@@ -232,6 +240,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "zmiana właściciela skrzynki pocztowej nie powiodła się"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: nie można uzyskać niepowtarzalnego UID\n"
 
@@ -315,6 +328,33 @@
 msgstr "Nieprawidłowe hasło %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: nieprawidłowy numer telefonu domowego: '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: nie można utworzyć katalogu %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: nie można utworzyć katalogu %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -342,73 +382,55 @@
 msgid "Unable to determine your tty name."
 msgstr "Nie można ustalić nazwy twojego terminala."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) nie powiodło się\n"
-
 #, fuzzy
 #| msgid "No\n"
 msgid "No"
 msgstr "Nie\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "Użycie: %s [wejście]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Użycie: chage [opcje] [LOGIN]\n"
-"\n"
-"Opcje:\n"
-"  -d, --lastday OSTATNI         ustawia date ostatniej zmiany hasła na "
-"OSTATNI\n"
-"  -E, --expiredate DATA_WAŻN    ustawia datę ważności konta na DATA_WAŻN\n"
-"  -h, --help                    wyświetlenie tego opisu i zakończenie "
-"działania\n"
-"  -I, --inactive NIEAKTYWNE     ustwia liczbę dni nieaktywności konta po\n"
-"                                których konta jest blokowane na NIEAKTYWNE\n"
-"  -l, --list                    wyświetlenie informacji o terminach "
-"ważności\n"
-"                                konta i hasła\n"
-"  -m, --mindays MIN_DNI         ustawia minimalną liczbę dni pomiędzy\n"
-"                                zmianami hasła na wartość MIN_DNI\n"
-"  -M, --maxdays MAX_DNI         ustawia maksymalną liczbę dni, przez jakie\n"
-"                                hasło jest ważne na wartość MAX_DNI\n"
-"  -W, --warndays DNI_OSTRZ      ustawia na DNI_OSTRZ liczbę dni przed\n"
-"                                upływem ważności hasła\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Wpisz nową wartość lub wciśnij ENTER by przyjąć wartość domyślną"
@@ -481,9 +503,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -508,10 +531,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: brak pliku z ukrytymi hasłami\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: użytkownik %s nie istnieje\n"
@@ -524,19 +543,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: błąd podczas zmieniania pól\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "Użycie: %s [wejście]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Użycie: %s [-f imię_nazwisko] [-r nr_pokoju] [-w tel_praca]\n"
-"\t[-h tel_dom] [-o inne] [użytkownik]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
 msgstr ""
-"Użycie: %s [-f imię_nazwisko] [-r nr_pokoju] [-w tel_praca] [-h tel_dom]\n"
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Imię i nazwisko"
 
@@ -614,25 +646,24 @@
 msgstr "%s: pola zbyt długie\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "Użycie: %s [wejście]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Użycie: chpasswd [opcje]\n"
-"\n"
-"Opcje:\n"
-"  -e, --encrypted       przekazywane hasła są w postaci zakodowane\n"
-"  -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
-"  -m, --md5             użyj kodowania MD5 zamiast DES w przypadku kiedy\n"
-"                        przekazywane hasła nie są zakodowane\n"
-"\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -674,29 +705,6 @@
 msgstr "%s: wykryto błąd, zignorowano modyfikacje\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Użycie: %s [wejście]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: użytkownik %s nie istnieje\n"
 
@@ -704,20 +712,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: użytkownik %s nie istnieje\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Użycie: chsh [opcje] [LOGIN]\n"
-"\n"
-"Opcje:\n"
-"  -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
-"  -s, --shell SHELL     nowy SHELL dla użytkownika LOGIN\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "Powłoka logowania"
@@ -750,9 +746,24 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: ostrzeżenie: właścicielem %s nie jest %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Użycie: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: nieoczekiwany argument: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -779,9 +790,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: nie można utworzyć katalogu %s\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Nieudane Maks.   Ostanio                  Na\n"
@@ -795,31 +807,30 @@
 msgid " [%lds lock]"
 msgstr " [blokada %lds]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: nie można utworzyć katalogu %s\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: nie można utworzyć katalogu %s\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "Nieznany użytkownik: %s\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"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: nie można zmienić nazwy katalogu z %s na %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -834,6 +845,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -961,8 +975,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Nie można ustalić twojej nazwy użytkownika.\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1066,16 +1082,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: nieznany użytkownik %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Użycie: %s [-r] [-s] [grupa [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Użycie: %s [wejście]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Użycie: %s [-r] [-s] [grupa]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "Użycie: %s [wejście]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s i -r są niekompatybilne\n"
 
 msgid "invalid group file entry"
@@ -1147,16 +1180,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: bez zmian\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "Użycie: groupdel grupa\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "Użycie: groupdel grupa\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1172,28 +1195,16 @@
 msgstr " grupy="
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -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 ""
-"Użycie: lastlog [opcje]\n"
-"\n"
-"Opcje:\n"
-"  -b, --before DNI      wyświetl tylko rekordy lastlog starsze niż DNI\n"
-"  -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
-"  -t, --time DNI        wyświetl tylko rekordy lastlog nie starsze niż DNI\n"
-"  -u, --user LOGIN      wyświetl rekord lastlog tylko dla użytkownika\n"
-"                        o loginie LOGIN\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1206,14 +1217,6 @@
 msgstr "**Nigdy nie zalogowany**"
 
 #, 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"
 
@@ -1287,6 +1290,11 @@
 msgid "Login incorrect"
 msgstr "Nieprawidłowe logowanie"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: linia %d: nie można znaleźć użytkownika %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1409,84 +1417,59 @@
 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"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Użycie: passwd [opcje] [LOGIN]\n"
-"\n"
-"Opcje:\n"
-"  -a, --all                     raportuj status hasła dla wszystkich kont\n"
-"  -d, --delete                  kasuje hasło użytkowanika\n"
-"  -e, --expire                  wymuś przeterminowanie hasła\n"
-"  -h, --help                    wyświetlenie tego opisu i zakończenie "
-"działania\n"
-"  -k, --keep-tokens             zmiana hasła tylko w przypadku kiedy\n"
-"                                jest przeterminowane\n"
-"  -i, --inactive NIEAKTYWNE     konto przeterminowane po upływie NIEAKTYWNE\n"
-"                                dni po wygaśnięciu hasła\n"
-"  -l, --lock                    zablokuj konto\n"
-"  -n, --mindays MIN_DNI         ustaw minimalną ilość dni prezed kolejną\n"
-"                                zmianą hasła na MIN_DNI\n"
-"  -n, --mindays MIN_DNI         ustawia minimalną liczbę dni pomiędzy\n"
-"                                zmianami hasła na MIN_DNI\n"
-"  -q, --quiet                   cichy tryb pracy\n"
-"  -r, --repository REPOZYTORIUM zmień hasło w repozytorium REPOZYTORIUM\n"
-"  -S, --status                  raportuj status hasła\n"
-"  -u, --unlock                  odblokuj konto\n"
-"  -w, --warndays DNI_OSTRZ      ustawia na DNI_OSTRZ liczbę dni przed\n"
-"                                upływem ważności hasła\n"
-"  -x, --maxdays MAX_DNI         ustawia maksymalną liczbę dni, przez jakie\n"
-"                                hasło jest ważne na wartość MAX_DNI\n"
-"\n"
 
 msgid "Old password: "
 msgstr "Stare hasło: "
@@ -1569,19 +1552,24 @@
 msgstr "Ostrzeżenie o utracie ważności hasła"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Użycie: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "Użycie: %s [wejście]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Użycie: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s i -r są niekompatybilne\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Użycie: %s [wejście]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1664,11 +1652,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: nie można otworzyć pliku %s\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "Użycie: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1678,11 +1661,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "Użycie: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Dostęp do polecenia su z tego konta ZABRONIONY.\n"
 
@@ -1746,32 +1724,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: musisz uruchamiać z terminala\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Zignorowano)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: błąd %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Nieznany id: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Nie masz autoryzacji by używać su %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(Wpisz swoje własne hasło)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Zignorowano)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1782,9 +1748,29 @@
 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"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Brak wpisu do bazy haseł dla 'root'"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: musisz uruchamiać z terminala\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: błąd %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: nie można zmienić nazwy katalogu z %s na %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Nie można uruchomić %s"
+
 msgid "No password file"
 msgstr "Brak pliku z hasłami"
 
@@ -1829,7 +1815,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: zmiana nazwy: %s"
 
 #, c-format
@@ -1844,6 +1830,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "Użycie: %s [wejście]\n"
@@ -1961,10 +1949,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -2030,25 +2014,23 @@
 "Pliki z katalogu skel nie są kopiowane.\n"
 
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Użycie: userdel [opcje] LOGIN\n"
-"\n"
-"Opcje:\n"
-"  -f, --force               wymuś usunięcie plików nawet jeżeli nie należą\n"
-"                            do usuwanego użytkownika\n"
-"  -h, --help                wyświetlenie tego opisu i zakończenie działania\n"
-"  -r, --remove              usuń katalog domowy i spool pocztowy\n"
-"\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: nie można zmienić użytkownika '%s' na kliencie NIS.\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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"
@@ -2057,6 +2039,11 @@
 "dla innego użytkownika.\n"
 
 #, fuzzy, c-format
+#| msgid "%s: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: nieprawidłowy katalog domowy '%s'\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: ostrzeżenie: nie można usunąć "
@@ -2088,10 +2075,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: użytkownik %s jest użytkownikiem NIS\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: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2106,58 +2089,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: błąd podczas usuwania katalogu %s\n"
 
-#, fuzzy, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Użycie: usermod [opcje] LOGIN\n"
-"\n"
-"Opcje:\n"
-"  -a, --append GRUPA          dołącz użytkownika do do dodatkowej grupy "
-"GRUPA\n"
-"  -c, --comment KOMENTARZ     ustaw pole komentarza (GECOS) dla konta\n"
-"  -d, --home-dir KAT_DOMOWY   nowy katalog domowy użytkownika\n"
-"  -e, --expiredate DATA_WAŻN  ustawia datę wazności dla konta na DATA_WAŻN\n"
-"  -f, --inactive NIEAKTYWNE   ustwia liczbę dni po których konto jest\n"
-"                              blokowane na NIEAKTYWNE\n"
-"  -g, --gid GRUPA             wymuś użycie grupy GRUPA jako grupy\n"
-"                              podstawowej użytkownika\n"
-"  -G, --groups GRUPY          lista dodatkowych grup uzytkownika\n"
-"  -h, --help                  wyświetlenie tego opisu i zakończenie "
-"działania\n"
-"  -l, --login NOWY_LOGIN      nowa nawana logina użytkownika\n"
-"  -L, --lock                  blokuj konto użytkowqnika\n"
-"  -m, --move-home             przenieś zawartość katalogu domowego\n"
-"                              użytkownika (może być użyte tylko z opcją -d)\n"
-"  -o, --non-unique            pozwól na użycie nieunikalnego UID dla konta\n"
-"  -p, --password HASŁO        użyj nowe zakodowane HASŁO dla użytkonta\n"
-"  -s, --shell SHELL           nowy SHELL dla użytkownika LOGIN\n"
-"  -U, --unlock                odblokuj konto użytkownika\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2174,18 +2158,19 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: użytkownik %s istnieje\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: nie można otworzyć pliku %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: nie podano flag\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: ukryte hasła wymagane dla -e i -f\n"
 
-#, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
@@ -2254,9 +2239,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2340,8 +2322,379 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: nieprawidłowy katalog bazowy '%s'\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) nie powiodło się\n"
+
 #, fuzzy
 #~| msgid ""
+#~| "Usage: chage [options] [LOGIN]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+#~| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -l, --list                    show account aging information\n"
+#~| "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~| "password\n"
+#~| "                                change to MIN_DAYS\n"
+#~| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~| "password\n"
+#~| "                                change to MAX_DAYS\n"
+#~| "  -W, --warndays WARN_DAYS      set expiration warning days to "
+#~| "WARN_DAYS\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Użycie: chage [opcje] [LOGIN]\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ "  -d, --lastday OSTATNI         ustawia date ostatniej zmiany hasła na "
+#~ "OSTATNI\n"
+#~ "  -E, --expiredate DATA_WAŻN    ustawia datę ważności konta na DATA_WAŻN\n"
+#~ "  -h, --help                    wyświetlenie tego opisu i zakończenie "
+#~ "działania\n"
+#~ "  -I, --inactive NIEAKTYWNE     ustwia liczbę dni nieaktywności konta po\n"
+#~ "                                których konta jest blokowane na "
+#~ "NIEAKTYWNE\n"
+#~ "  -l, --list                    wyświetlenie informacji o terminach "
+#~ "ważności\n"
+#~ "                                konta i hasła\n"
+#~ "  -m, --mindays MIN_DNI         ustawia minimalną liczbę dni pomiędzy\n"
+#~ "                                zmianami hasła na wartość MIN_DNI\n"
+#~ "  -M, --maxdays MAX_DNI         ustawia maksymalną liczbę dni, przez "
+#~ "jakie\n"
+#~ "                                hasło jest ważne na wartość MAX_DNI\n"
+#~ "  -W, --warndays DNI_OSTRZ      ustawia na DNI_OSTRZ liczbę dni przed\n"
+#~ "                                upływem ważności hasła\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: błąd podczas uwierzytelniania przez PAM\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Użycie: %s [-f imię_nazwisko] [-r nr_pokoju] [-w tel_praca]\n"
+#~ "\t[-h tel_dom] [-o inne] [użytkownik]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Użycie: %s [-f imię_nazwisko] [-r nr_pokoju] [-w tel_praca] [-h tel_dom]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Użycie: chpasswd [opcje]\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ "  -e, --encrypted       przekazywane hasła są w postaci zakodowane\n"
+#~ "  -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
+#~ "  -m, --md5             użyj kodowania MD5 zamiast DES w przypadku kiedy\n"
+#~ "                        przekazywane hasła nie są zakodowane\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Użycie: chsh [opcje] [LOGIN]\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ "  -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
+#~ "  -s, --shell SHELL     nowy SHELL dla użytkownika LOGIN\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Użycie: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: nie można otworzyć pliku %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Użycie: groupdel grupa\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Użycie: %s [-r] [-s] [grupa [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Użycie: %s [-r] [-s] [grupa]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s i -r są niekompatybilne\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Użycie: groupdel grupa\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Użycie: groupdel grupa\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Użycie: lastlog [opcje]\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ "  -b, --before DNI      wyświetl tylko rekordy lastlog starsze niż DNI\n"
+#~ "  -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
+#~ "  -t, --time DNI        wyświetl tylko rekordy lastlog nie starsze niż "
+#~ "DNI\n"
+#~ "  -u, --user LOGIN      wyświetl rekord lastlog tylko dla użytkownika\n"
+#~ "                        o loginie LOGIN\n"
+#~ "\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Użycie: passwd [opcje] [LOGIN]\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ "  -a, --all                     raportuj status hasła dla wszystkich "
+#~ "kont\n"
+#~ "  -d, --delete                  kasuje hasło użytkowanika\n"
+#~ "  -e, --expire                  wymuś przeterminowanie hasła\n"
+#~ "  -h, --help                    wyświetlenie tego opisu i zakończenie "
+#~ "działania\n"
+#~ "  -k, --keep-tokens             zmiana hasła tylko w przypadku kiedy\n"
+#~ "                                jest przeterminowane\n"
+#~ "  -i, --inactive NIEAKTYWNE     konto przeterminowane po upływie "
+#~ "NIEAKTYWNE\n"
+#~ "                                dni po wygaśnięciu hasła\n"
+#~ "  -l, --lock                    zablokuj konto\n"
+#~ "  -n, --mindays MIN_DNI         ustaw minimalną ilość dni prezed kolejną\n"
+#~ "                                zmianą hasła na MIN_DNI\n"
+#~ "  -n, --mindays MIN_DNI         ustawia minimalną liczbę dni pomiędzy\n"
+#~ "                                zmianami hasła na MIN_DNI\n"
+#~ "  -q, --quiet                   cichy tryb pracy\n"
+#~ "  -r, --repository REPOZYTORIUM zmień hasło w repozytorium REPOZYTORIUM\n"
+#~ "  -S, --status                  raportuj status hasła\n"
+#~ "  -u, --unlock                  odblokuj konto\n"
+#~ "  -w, --warndays DNI_OSTRZ      ustawia na DNI_OSTRZ liczbę dni przed\n"
+#~ "                                upływem ważności hasła\n"
+#~ "  -x, --maxdays MAX_DNI         ustawia maksymalną liczbę dni, przez "
+#~ "jakie\n"
+#~ "                                hasło jest ważne na wartość MAX_DNI\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Użycie: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Użycie: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Użycie: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Użycie: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Nieznany id: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Brak powłoki\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Użycie: userdel [opcje] LOGIN\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ "  -f, --force               wymuś usunięcie plików nawet jeżeli nie "
+#~ "należą\n"
+#~ "                            do usuwanego użytkownika\n"
+#~ "  -h, --help                wyświetlenie tego opisu i zakończenie "
+#~ "działania\n"
+#~ "  -r, --remove              usuń katalog domowy i spool pocztowy\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: użytkownik %s jest aktualnie zalogowany\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Użycie: usermod [opcje] LOGIN\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ "  -a, --append GRUPA          dołącz użytkownika do do dodatkowej grupy "
+#~ "GRUPA\n"
+#~ "  -c, --comment KOMENTARZ     ustaw pole komentarza (GECOS) dla konta\n"
+#~ "  -d, --home-dir KAT_DOMOWY   nowy katalog domowy użytkownika\n"
+#~ "  -e, --expiredate DATA_WAŻN  ustawia datę wazności dla konta na "
+#~ "DATA_WAŻN\n"
+#~ "  -f, --inactive NIEAKTYWNE   ustwia liczbę dni po których konto jest\n"
+#~ "                              blokowane na NIEAKTYWNE\n"
+#~ "  -g, --gid GRUPA             wymuś użycie grupy GRUPA jako grupy\n"
+#~ "                              podstawowej użytkownika\n"
+#~ "  -G, --groups GRUPY          lista dodatkowych grup uzytkownika\n"
+#~ "  -h, --help                  wyświetlenie tego opisu i zakończenie "
+#~ "działania\n"
+#~ "  -l, --login NOWY_LOGIN      nowa nawana logina użytkownika\n"
+#~ "  -L, --lock                  blokuj konto użytkowqnika\n"
+#~ "  -m, --move-home             przenieś zawartość katalogu domowego\n"
+#~ "                              użytkownika (może być użyte tylko z opcją -"
+#~ "d)\n"
+#~ "  -o, --non-unique            pozwól na użycie nieunikalnego UID dla "
+#~ "konta\n"
+#~ "  -p, --password HASŁO        użyj nowe zakodowane HASŁO dla użytkonta\n"
+#~ "  -s, --shell SHELL           nowy SHELL dla użytkownika LOGIN\n"
+#~ "  -U, --unlock                odblokuj konto użytkownika\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: nie podano flag\n"
+
+#, fuzzy
+#~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
 #~| "Options:\n"
@@ -2881,9 +3234,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/pt.po
===================================================================
--- upstream/trunk/po/pt.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/pt.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2011-04-22 14:43+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -41,6 +41,14 @@
 msgstr ""
 "erro de configuração - item '%s' desconhecido (notifique o administrador)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Palavra-passe: "
 
@@ -215,6 +223,11 @@
 "%s: Configuração inválida: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
 "(%lu)\n"
 
+#, fuzzy, c-format
+#| msgid "failed to allocate memory"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "falhou alocar memória"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr ""
@@ -305,6 +318,33 @@
 msgstr "Palavra-passe incorrecta para %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: falhou baixar privilégios (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: telefone de casa inválido: '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot create directory %s: %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: não é possível criar o directório %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Failed to create tcb directory for %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: Falhou a criação do directório tcb para %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -334,50 +374,81 @@
 msgid "Unable to determine your tty name."
 msgstr "Não é possível determinar o nome do seu tty."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "O malloc(%d) falhou\n"
-
 msgid "No"
 msgstr "Não"
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"Utilização: %s [opções] LOGIN\n"
+"\n"
+"Opções:\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "  -e, --expiredate DATA_EXPIRA  data de expiração para a nova conta\n"
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr "  -h, --help\t\tmostrar esta mensagem de ajuda e sair\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -p, --password PALAVRAPASSE\t mudar a palavra-passe para esta "
+"PALAVRAPASSE\n"
+"\t\t\t\t (encriptada)\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr "  -r, --reset\t\tapagar o contador de logins falhados\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
+"                                de encriptação SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
+"                                de encriptação SHA*\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir HOME_DIR\tdirectório home para a nova conta\n"
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Utilização: chage [opções] [LOGIN]\n"
-"\n"
-"Opções:\n"
-"  -d, --lastday ÚLTIMO_DIA      definir data da última alteração da\n"
-"\t\t\t\t palavra-passe para ÚLTIMO_DIA\n"
-"  -E, --expiredate DATA_EXPIRA  definir a data em que a conta caduca\n"
-"\t\t\t\t para DATA_EXPIRA  -h, --help                    mostrar esta "
-"mensagem de ajuda e sair\n"
-"  -I, --inactive INACTIVO       definir a palavra-passe como inactiva após\n"
-"\t\t\t\t expirar em INACTIVO\n"
-"  -l, --list                    mostrar informação de envelhecimento da \n"
-"                                conta\n"
-"  -m, --mindays MIN_DIAS        definir para MIN_DIAS o número mínimo de\n"
-"                                dias para alterar a palavra-passe\n"
-"  -M, --maxdays MAX_DIAS        definir para MAX_DIAS o número máximo de\n"
-"                                dias para alterar a palavra-passe\n"
-"  -W, --warndays DIAS_AVISO     definir para DIAS_AVISO o número de dias\n"
-"                                para aviso de caducar\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Introduza o novo valor, ou carregue em ENTER para o valor pré-definido"
@@ -450,9 +521,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -475,10 +547,6 @@
 msgstr "%s: o ficheiro de palavras-passe shadow não está presente\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: falhou baixar privilégios (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: o utilizador `%s' não existe em %s\n"
 
@@ -490,20 +558,40 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: erro na alteração de campos\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Utilização: %s [-f nome_completo] [-r num_sala] [-w telefone_trabalho]\n"
-"\t[-h telefone_casa] [-o outra_info] [utilizador]\n"
+"Utilização: %s [opções] LOGIN\n"
+"\n"
+"Opções:\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Utilização: %s [-f nome_completo] [-r num_sala] [-w telefone_trabalho] [-h "
-"telefone_casa]\n"
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr "  -h, --help\t\tmostrar esta mensagem de ajuda e sair\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Nome Completo"
 
@@ -583,25 +671,26 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 "Utilização: %s [opções]\n"
 "\n"
 "Opções:\n"
-"  -c, --crypt-method            o método de encriptação (um de %s)\n"
-"  -e, --encrypted               as palavras-passe fornecidas são "
-"encriptadas\n"
-"  -h, --help                    mostrar esta mensagem de ajuda e terminar\n"
-"  -m, --md5                     encriptar a palavra-passe de texto com o\n"
-"\t\t\t\t algoritmo MD5\n"
-"%s\n"
 
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr "  -c, --crypt-method <MÉTODO>\to método crypt (um de %s)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr "  -e, --encrypted\t\tas palavras-passe fornecidas são encriptadas\n"
+
 msgid ""
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
+msgstr ""
+"  -m, --md5\t\t\t encriptar a palavra-passe de texto\n"
+"\t\t\t utilizando o algoritmo MD5\n"
+
+msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
 "                                crypt algorithms\n"
 msgstr ""
@@ -641,33 +730,6 @@
 msgstr "%s: foi detectado um erro, as alterações foram ignoradas\n"
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Utilização: %s [opções]\n"
-"\n"
-"Opções:\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method <MÉTODO>\to método crypt (um de %s)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr "  -e, --encrypted\t\tas palavras-passe fornecidas são encriptadas\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr "  -h, --help\t\tmostrar esta mensagem de ajuda e sair\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -m, --md5\t\t\t encriptar a palavra-passe de texto\n"
-"\t\t\t utilizando o algoritmo MD5\n"
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: (linha %d, utilizador %s) palavra passe não mudou\n"
 
@@ -675,21 +737,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: linha %d: o utilizador '%s' não existe\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
-msgstr ""
-"Utilização: chsh [opções] [LOGIN]\n"
-"\n"
-"Opções:\n"
-"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
-"  -s, --shell SHELL             nova shell de login para a conta do\n"
-"                                utilizador\n"
-"\n"
+#, fuzzy
+#| msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
+msgstr "  -s, --shell SHELL\t\tshell de login para a nova conta\n"
 
 msgid "Login Shell"
 msgstr "Shell de Login"
@@ -718,9 +769,33 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Aviso: %s não é executável\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Utilização: expiry {-f|-c}\n"
+#, fuzzy
+#| msgid ""
+#| "  -u, --user                    which user's tcb shadow file to edit\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr "  -u, --user\t\tqual o ficheiro shadow tcb do utilizador a editar\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -m, --md5\t\t\t encriptar a palavra-passe de texto\n"
+"\t\t\t utilizando o algoritmo MD5\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: conflito entre as opções %s e %s\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: argumento inesperado: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 "  -a, --all\t\t\tmostrar registos do faillog para todos os utilizadores\n"
@@ -756,9 +831,10 @@
 "\t\t\tde falhas e limites (se utilizado com -r, -m\n"
 "\t\t\tou -l) apenas para LOGIN(s) especificado(s)\n"
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "faillog: Falhou obter a entrada para UID %lu\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog: Falhou obter a entrada para UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Falhas   Máximo  Última                   Em\n"
@@ -771,31 +847,32 @@
 msgid " [%lds lock]"
 msgstr " [%lds bloqueio]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: Falhou reiniciar a contagem de falhas para o UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "faillog: Falhou definir o máximo para UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: Falhou definir a hora de bloqueio para UID %lu\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog: Utilizador ou gama desconhecida: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "faillog: Não é possível abrir %s: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: Não conseguiu obter o tamanho de %s: %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: Não foi possível obter o tamanho de %s: %s\n"
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -811,6 +888,11 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete UTILIZADOR\tremover UTILIZADOR do GRUPO\n"
 
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir HOME_DIR\tdirectório home para a nova conta\n"
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password\tremover a palavra-passe do GRUPO\n"
 
@@ -941,8 +1023,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: o GID '%lu' já existe\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Utilização: groupdel grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Não é possível determinar o seu nome de utilizador.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1053,16 +1137,52 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: utilizador desconhecido %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Utilização: %s [-r] [-s] [grupo [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Utilização: %s [opções] [acção}\n"
+"\n"
+"Opções:\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Utilização: %s [-r] [-s] [grupo]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Utilização: %s [opções] [acção}\n"
+"\n"
+"Opções:\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
+"                                de encriptação SHA*\n"
+
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -l, --list\t\tlistar os membros do grupo\n"
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s e -r são incompatíveis\n"
 
 msgid "invalid group file entry"
@@ -1132,12 +1252,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: sem alterações\n"
 
-msgid "Usage: grpconv\n"
-msgstr "Utilização: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "Utilização: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: não é possível apagar %s\n"
@@ -1151,33 +1265,31 @@
 msgid " groups="
 msgstr " grupos="
 
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -t, --time DIAS\t\t mostrar os registos do faillog mais recentes do que "
+"DIAS\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr ""
+"  -t, --time DIAS\t\t mostrar os registos do faillog mais recentes do que "
+"DIAS\n"
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Utilização: lastlog [opções]\n"
-"\n"
-"Opções:\n"
-"  -b, --before DIAS             escrever apenas registos de lastlog mais\n"
-"                                antigos que DIAS\n"
-"  -h, --help                    mostrar esta mensagem e sai\n"
-"  -t, --time DIAS               escrever apenas registos de lastlog mais\n"
-"                                recentes que DIAS\n"
-"  -u, --user LOGIN              mostra o registo de lastlog para o\n"
-"                                utilizador LOGIN\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Falhou obter a entrada para UID %lu\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "Utilizador       Porto    De               Último"
 
@@ -1188,14 +1300,6 @@
 msgstr "**Nunca entrou no sistema**"
 
 #, 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 "lastlog: Não conseguiu obter o tamanho de %s: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Utilização: %s [-p] [nome]\n"
 
@@ -1266,6 +1370,11 @@
 msgid "Login incorrect"
 msgstr "Login incorrecto"
 
+#, fuzzy, c-format
+#| msgid "%s: Cannot fork user shell\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: Não é possível fazer fork à shell de utilizador.\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1384,59 +1493,94 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: linha %d: não é possível actualizar o registo\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+"  -a, --all\t\t\tmostrar registos do faillog para todos os utilizadores\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system\t\tcriar uma conta de sistema\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system\t\tcriar uma conta de sistema\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr "  -e, --encrypted\t\tas palavras-passe fornecidas são encriptadas\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -p, --password PALAVRAPASSE\t mudar a palavra-passe para esta "
+"PALAVRAPASSE\n"
+"\t\t\t\t (encriptada)\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr "  -u, --uid UID\t\tID do utilizador para a nova conta\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
+"                                de encriptação SHA*\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr "  -q, --quiet\t\tmodo silencioso\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system\t\tcriar uma conta de sistema\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr "  -u, --uid UID\t\tID do utilizador para a nova conta\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Utilização: passwd [opções] [LOGIN]\n"
-"\n"
-"Opções:\n"
-"  -a, --all                     reportar o estado das palavras-passe de\n"
-"                                todas as contas\n"
-"  -d, --delete                  apagar a palavra-passe para a conta "
-"indicada\n"
-"  -e, --expire                  forçar que a palavra-passe caduque para a\n"
-"\t\t\t\t conta indicada\n"
-"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
-"  -k, --keep-tokens             apenas mudar a palavra-passe se tiver\n"
-"\t\t\t\t caducado\n"
-"  -i, --inactive INACTIVA       definir a palavra-passe como inactiva após\n"
-"\t\t\t\t caducar para INACTIVA\n"
-"  -l, --lock                    bloquear a palavra-passe da conta indicada\n"
-"  -n, --mindays MIN_DIAS        definir para MIN_DIAS o número de dias\n"
-"                                antes de alterar a palavra-passe\n"
-"  -q, --quiet                   modo discreto\n"
-"  -r, --repository REPOSITÓRIO  mudar a palavra-passe no repositório\n"
-"\t\t\t\t REPOSITÓRIO\n"
-"  -S, --status                  reportar estado da palavra-passe na conta\n"
-"                                indicada\n"
-"  -u, --unlock                  desbloquear a palavra-passe da conta\n"
-"\t\t\t\t indicada\n"
-"  -w, --warndays AVISAR_DIAS    definir para AVISAR_DIAS o número de dias\n"
-"                                para alerta de caducar\n"
-"  -x, --maxdays MAX_DIAS        definir para MAX_DIAS o número de dias\n"
-"                                máximo antes de alterar a palavra-passe\n"
-"\n"
+"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
+"                                de encriptação SHA*\n"
 
 msgid "Old password: "
 msgstr "Palavra-passe antiga: "
@@ -1521,17 +1665,38 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: informação de caducidade da palavra-passe alterada.\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Utilização: %s [-q] [-r] [passwd]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Utilização: %s [opções] [acção}\n"
+"\n"
+"Opções:\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Utilização: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Utilização: %s [opções] [acção}\n"
+"\n"
+"Opções:\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s e -r são incompatíveis\n"
+#, fuzzy
+#| msgid "  -q, --quiet                   quiet mode\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr "  -q, --quiet\t\tmodo silencioso\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1610,9 +1775,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: não é possível ordenar registos em %s\n"
 
-msgid "Usage: pwconv\n"
-msgstr "Utilização: pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: não pode trabalhar com tcb habilitado\n"
@@ -1621,9 +1783,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: falhou mudar o modo de %s para 0600\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "Utilização: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Acesso a su para essa conta foi NEGADO.\n"
 
@@ -1687,18 +1846,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: deve ser executado a partir de um terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ignorado)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: erro %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Id desconhecido: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Não está autorizado a fazer su %s\n"
 
@@ -1706,14 +1861,6 @@
 msgstr "(Introduza a sua palavra-passe)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ignorado)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: A autenticação falhou\n"
 
@@ -1721,9 +1868,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s: Não está autorizado a fazer su nessa altura\n"
 
-msgid "No shell\n"
-msgstr "Sem shell\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Não está definida nenhuma palavra-passe para 'root'"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: deve ser executado a partir de um terminal\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: erro %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot remove the content of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: Não pode remover o conteúdo de %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Não foi possível executar %s"
+
 msgid "No password file"
 msgstr "Ficheiro de palavras-passe não existe"
 
@@ -1767,8 +1934,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: linha demasiado longa em %s: %s..."
 
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: renomear: %s: %s"
 
 #, c-format
@@ -1779,9 +1947,15 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: estão especificados demasiados grupos (max %d).\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1919,10 +2093,6 @@
 msgstr "%s: -Z necessita de um kernel com SELinux activo\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: conflito entre as opções %s e %s\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr "%s: falhou apagar o registo faillog para o UID %lu: %s\n"
 
@@ -1987,30 +2157,44 @@
 "%s: aviso: o directório home já existe.\n"
 "Não irá copiar quaisquer ficheiros o directório skel para lá.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -f, --force                   exit successfully if the group already "
+#| "exists,\n"
+#| "                                and cancel -g if the GID is already used\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Utilização: userdel [opções] LOGIN\n"
-"\n"
-"Opções:\n"
-"  -f, --force                   forçar a remoção de ficheiros,\n"
-"                                mesmo que não pertençam ao utilizador\n"
-"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
-"  -r, --remove                  remover o directório home e o spool de mail\n"
-"\n"
+"  -f, --force\t\tsair com sucesso se o grupo já existir,\n"
+"\t\t\te cancelar -g se o GID já for utilizado\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr "  -r, --reset\t\tapagar o contador de logins falhados\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: não é possível remover o grupo primário do utilizador '%s'\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: o grupo %s é o grupo primário de outro utilizador e não é removido.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: o directório home %s (%s) não foi encontrado\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: aviso: não é possível remover %s: %s\n"
@@ -2041,10 +2225,6 @@
 msgstr "%s: o utilizador %s é um utilizador NIS\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: o utilizador %s está actualmente no sistema\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: o directório home %s (%s) não foi encontrado\n"
 
@@ -2058,65 +2238,100 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: erro ao remover o directório %s\n"
 
-#, c-format
+#, fuzzy
+#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr "  -c, --comment COMENTÁRIO\tcampo GECOS da nova conta\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr "  -d, --home-dir HOME_DIR\tdirectório home para a nova conta\n"
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr "  -e, --expiredate DATA_EXPIRA  data de expiração para a nova conta\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -p, --password PALAVRAPASSE\t mudar a palavra-passe para esta "
+"PALAVRAPASSE\n"
+"\t\t\t\t (encriptada)\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr "  -g, --gid GID\t\tutilizar GID para o novo grupo\n"
+
+#, fuzzy
+#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr "  -M, --members UTILIZADOR,...\tdefinir a lista de membros do GRUPO\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr "  -u, --uid UID\t\tID do utilizador para a nova conta\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
+#| "the\n"
+#| "                                new account\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -b, --base-dir BASE_DIR\t directório base para o directório home da \t\t\t"
+"\t nova conta\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
+#| "GID\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -o, ..non-unique\t\t permitir utilizar um GID duplicado (não-único)\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       use this encrypted password for the new "
+#| "group\n"
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Utilização: usermod [opções] LOGIN\n"
-"\n"
-"Opções:\n"
-"  -c, --comment COMENTÁRIO      novo valor do campo GECOS\n"
-"  -d, --home HOME_DIR           novo directório home para a conta do\n"
-"                                utilizador\n"
-"  -e, --expiredate DATA_EXPIRAR definir a data em que a conta caduca\n"
-"                                para DATA_EXPIRAR\n"
-"  -f, --inactive INACTIVA       definir para INACTIVA o número de dias após\n"
-"                                os quais uma palavra-passe caducada passa\n"
-"                                a inactiva\n"
-"  -g, --gid GRUPO               forçar a utilização do GRUPO como novo\n"
-"                                grupo primário\n"
-"  -G, --groups GRUPOS           nova lista de grupos adicionais\n"
-"  -a, --append                  juntar o utilizador aos GRUPOS\n"
-"\t\t\t\t suplementares mencionados pela opção -G\n"
-"\t\t\t\t sem o/a remover dos outros grupos\n"
-"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
-"  -l, --login NEW_LOGIN         novo valor para o nome de login\n"
-"  -L, --lock                    bloquear a conta do utilizador\n"
-"  -m, --move-home               mover o conteúdo do directório home para\n"
-"                                o novo local (usar apenas com -d)\n"
-"  -o, --non-unique              permitir utilizar UID duplicado\n"
-"\t\t\t\t (não único)\n"
-"  -p, --password PALAVRA-PASSE  utilizar PALAVRA-PASSE encriptada para a\n"
-"                                nova palavra-passe\n"
-"  -s, --shell SHELL             nova shell de login para a conta do\n"
-"\t\t\t\t utilizador\n"
-"  -u, --uid UID                 novo UID para a conta do utilizador\n"
-"  -U, --unlock                  desbloquear a conta do utilizador\n"
-"%s\n"
+"  -p, --password PALAVRA-PASSE\t utilizar a palavra-passe encriptada para o "
+"novo grupo\n"
 
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr "  -u, --uid UID\t\tID do utilizador para a nova conta\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr "  -u, --uid UID\t\tID do utilizador para a nova conta\n"
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2138,19 +2353,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: o utilizador %s já existe em %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: não é possível abrir %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: não foram especificadas flags\n"
+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: shadow passwords required for -e and -f\n"
 msgstr "%s: são necessárias palavras-passe shadow para -e e -f\n"
 
 #, c-format
-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' already exists\n"
 msgstr "%s: O UID '%lu' já existe\n"
 
@@ -2226,9 +2442,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -p, --passwd\t\teditar a base de dados passwd\n"
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -q, --quiet\t\tmodo silencioso\n"
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr "  -s, --shadow\t\teditar a base de dados shadow ou gshadow\n"
 
@@ -2287,6 +2500,332 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: falhou encontrar o directório tcb para %s\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "O malloc(%d) falhou\n"
+
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Utilização: chage [opções] [LOGIN]\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -d, --lastday ÚLTIMO_DIA      definir data da última alteração da\n"
+#~ "\t\t\t\t palavra-passe para ÚLTIMO_DIA\n"
+#~ "  -E, --expiredate DATA_EXPIRA  definir a data em que a conta caduca\n"
+#~ "\t\t\t\t para DATA_EXPIRA  -h, --help                    mostrar esta "
+#~ "mensagem de ajuda e sair\n"
+#~ "  -I, --inactive INACTIVO       definir a palavra-passe como inactiva "
+#~ "após\n"
+#~ "\t\t\t\t expirar em INACTIVO\n"
+#~ "  -l, --list                    mostrar informação de envelhecimento da \n"
+#~ "                                conta\n"
+#~ "  -m, --mindays MIN_DIAS        definir para MIN_DIAS o número mínimo de\n"
+#~ "                                dias para alterar a palavra-passe\n"
+#~ "  -M, --maxdays MAX_DIAS        definir para MAX_DIAS o número máximo de\n"
+#~ "                                dias para alterar a palavra-passe\n"
+#~ "  -W, --warndays DIAS_AVISO     definir para DIAS_AVISO o número de dias\n"
+#~ "                                para aviso de caducar\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: A autenticação PAM falhou\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Utilização: %s [-f nome_completo] [-r num_sala] [-w telefone_trabalho]\n"
+#~ "\t[-h telefone_casa] [-o outra_info] [utilizador]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Utilização: %s [-f nome_completo] [-r num_sala] [-w telefone_trabalho] [-"
+#~ "h telefone_casa]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Utilização: %s [opções]\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -c, --crypt-method            o método de encriptação (um de %s)\n"
+#~ "  -e, --encrypted               as palavras-passe fornecidas são "
+#~ "encriptadas\n"
+#~ "  -h, --help                    mostrar esta mensagem de ajuda e "
+#~ "terminar\n"
+#~ "  -m, --md5                     encriptar a palavra-passe de texto com o\n"
+#~ "\t\t\t\t algoritmo MD5\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Utilização: chsh [opções] [LOGIN]\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+#~ "  -s, --shell SHELL             nova shell de login para a conta do\n"
+#~ "                                utilizador\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Utilização: expiry {-f|-c}\n"
+
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "faillog: Falhou obter a entrada para UID %lu\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "faillog: Não é possível abrir %s: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: Não foi possível obter o tamanho de %s: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Utilização: groupdel grupo\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Utilização: %s [-r] [-s] [grupo [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Utilização: %s [-r] [-s] [grupo]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s e -r são incompatíveis\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Utilização: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Utilização: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Utilização: lastlog [opções]\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -b, --before DIAS             escrever apenas registos de lastlog mais\n"
+#~ "                                antigos que DIAS\n"
+#~ "  -h, --help                    mostrar esta mensagem e sai\n"
+#~ "  -t, --time DIAS               escrever apenas registos de lastlog mais\n"
+#~ "                                recentes que DIAS\n"
+#~ "  -u, --user LOGIN              mostra o registo de lastlog para o\n"
+#~ "                                utilizador LOGIN\n"
+#~ "\n"
+
+#~ 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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Utilização: passwd [opções] [LOGIN]\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -a, --all                     reportar o estado das palavras-passe de\n"
+#~ "                                todas as contas\n"
+#~ "  -d, --delete                  apagar a palavra-passe para a conta "
+#~ "indicada\n"
+#~ "  -e, --expire                  forçar que a palavra-passe caduque para "
+#~ "a\n"
+#~ "\t\t\t\t conta indicada\n"
+#~ "  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+#~ "  -k, --keep-tokens             apenas mudar a palavra-passe se tiver\n"
+#~ "\t\t\t\t caducado\n"
+#~ "  -i, --inactive INACTIVA       definir a palavra-passe como inactiva "
+#~ "após\n"
+#~ "\t\t\t\t caducar para INACTIVA\n"
+#~ "  -l, --lock                    bloquear a palavra-passe da conta "
+#~ "indicada\n"
+#~ "  -n, --mindays MIN_DIAS        definir para MIN_DIAS o número de dias\n"
+#~ "                                antes de alterar a palavra-passe\n"
+#~ "  -q, --quiet                   modo discreto\n"
+#~ "  -r, --repository REPOSITÓRIO  mudar a palavra-passe no repositório\n"
+#~ "\t\t\t\t REPOSITÓRIO\n"
+#~ "  -S, --status                  reportar estado da palavra-passe na "
+#~ "conta\n"
+#~ "                                indicada\n"
+#~ "  -u, --unlock                  desbloquear a palavra-passe da conta\n"
+#~ "\t\t\t\t indicada\n"
+#~ "  -w, --warndays AVISAR_DIAS    definir para AVISAR_DIAS o número de "
+#~ "dias\n"
+#~ "                                para alerta de caducar\n"
+#~ "  -x, --maxdays MAX_DIAS        definir para MAX_DIAS o número de dias\n"
+#~ "                                máximo antes de alterar a palavra-passe\n"
+#~ "\n"
+
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Utilização: %s [-q] [-r] [passwd]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Utilização: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Utilização: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Utilização: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Id desconhecido: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Sem shell\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Utilização: userdel [opções] LOGIN\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -f, --force                   forçar a remoção de ficheiros,\n"
+#~ "                                mesmo que não pertençam ao utilizador\n"
+#~ "  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+#~ "  -r, --remove                  remover o directório home e o spool de "
+#~ "mail\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: o utilizador %s está actualmente no sistema\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Utilização: usermod [opções] LOGIN\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -c, --comment COMENTÁRIO      novo valor do campo GECOS\n"
+#~ "  -d, --home HOME_DIR           novo directório home para a conta do\n"
+#~ "                                utilizador\n"
+#~ "  -e, --expiredate DATA_EXPIRAR definir a data em que a conta caduca\n"
+#~ "                                para DATA_EXPIRAR\n"
+#~ "  -f, --inactive INACTIVA       definir para INACTIVA o número de dias "
+#~ "após\n"
+#~ "                                os quais uma palavra-passe caducada "
+#~ "passa\n"
+#~ "                                a inactiva\n"
+#~ "  -g, --gid GRUPO               forçar a utilização do GRUPO como novo\n"
+#~ "                                grupo primário\n"
+#~ "  -G, --groups GRUPOS           nova lista de grupos adicionais\n"
+#~ "  -a, --append                  juntar o utilizador aos GRUPOS\n"
+#~ "\t\t\t\t suplementares mencionados pela opção -G\n"
+#~ "\t\t\t\t sem o/a remover dos outros grupos\n"
+#~ "  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+#~ "  -l, --login NEW_LOGIN         novo valor para o nome de login\n"
+#~ "  -L, --lock                    bloquear a conta do utilizador\n"
+#~ "  -m, --move-home               mover o conteúdo do directório home para\n"
+#~ "                                o novo local (usar apenas com -d)\n"
+#~ "  -o, --non-unique              permitir utilizar UID duplicado\n"
+#~ "\t\t\t\t (não único)\n"
+#~ "  -p, --password PALAVRA-PASSE  utilizar PALAVRA-PASSE encriptada para a\n"
+#~ "                                nova palavra-passe\n"
+#~ "  -s, --shell SHELL             nova shell de login para a conta do\n"
+#~ "\t\t\t\t utilizador\n"
+#~ "  -u, --uid UID                 novo UID para a conta do utilizador\n"
+#~ "  -U, --unlock                  desbloquear a conta do utilizador\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: não foram especificadas flags\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"

Modified: upstream/trunk/po/pt_BR.po
===================================================================
--- upstream/trunk/po/pt_BR.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/pt_BR.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2011-04-12 00:16-0300\n"
 "Last-Translator: Fred Ulisses Maranhão <fred.maranhao at gmail.com>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -39,6 +39,14 @@
 msgstr ""
 "erro de configuração - item '%s' desconhecido (notifique o administrador)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Senha : "
 
@@ -212,6 +220,11 @@
 "%s: Configuração inválida: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
 "(%lu)\n"
 
+#, fuzzy, c-format
+#| msgid "failed to allocate memory"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "falha ao alocar memória"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr ""
@@ -300,6 +313,33 @@
 msgstr "Senha incorreta para %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: falha ao abandonar privilégios (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: telefone residencial inválido: '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot create directory %s: %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: não foi possível criar o diretório %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Failed to create tcb directory for %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: Falha ao criar diretório tcb para %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -329,49 +369,83 @@
 msgid "Unable to determine your tty name."
 msgstr "Não foi possível determinar o nome de seu tty."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) falhou\n"
-
 msgid "No"
 msgstr "Não"
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"Uso: %s [opções] LOGIN\n"
+"\n"
+"Opções:\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -e, --expiredate DATA_DE_EXPIRAÇÃO  data de expiração da nova conta\n"
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -p, --password SENHA          muda a senha para esta SENHA "
+"(criptografada)\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+"  -r, --reset                   zera os contadores de falhas de login\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"-s, --sha-rounds                Números de SHA rodadas para a SHA *\n"
+"                                algoritmos criptografados\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"-s, --sha-rounds                Números de SHA rodadas para a SHA *\n"
+"                                algoritmos criptografados\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir DIR_PESSOAL    diretório pessoal da nova conta\n"
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Uso: chage [opções] [LOGIN]\n"
-"\n"
-"Opções:\n"
-"  -d, --lastday ULTIMO_DIA         define última mudança de senha para "
-"ULTIMO_DIA\n"
-"  -E, --expiredate DATA_EXPIRAÇÃO  define data de expiração de conta para\n"
-"                                   DATA_EXPIRAÇÃO\n"
-"  -h, --help                       exibe esta mensagem de ajuda e sai\n"
-"  -I, --inactive INATIVO           define senha inativa após expiração\n"
-"                                   para INATIVO\n"
-"  -l, --list                       exibe informação sobre idade da conta\n"
-"  -m, --mindays MIN_DIAS           define número mínimo de dias antes da\n"
-"                                   troca de senha para MIN_DIAS\n"
-"  -M, --maxdays MAX_DIAS           define número máximo de dias antes da\n"
-"                                   troca de senha para MAX_DIAS\n"
-"  -W, --warndays AVISO_DIAS        define dias para aviso de expiração para\n"
-"                                   AVISO_DIAS\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Informe o novo valor ou pressione ENTER para aceitar o padrão"
@@ -444,9 +518,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -469,10 +544,6 @@
 msgstr "%s : o arquivo de senhas shadow não está presente\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: falha ao abandonar privilégios (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: usuário '%s' não existe em %s\n"
 
@@ -484,20 +555,41 @@
 msgid "%s: error changing fields\n"
 msgstr "%s : erro modificando campos\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Uso : %s [-f nome_completo] [-r número_sala] [-w fone_trabalho]\n"
-"\t[-h fone_residencial] [-o outro] [usuário]\n"
+"Uso: %s [opções] LOGIN\n"
+"\n"
+"Opções:\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Uso : %s [-f nome_completo] [-r número_sala] [-w fone_rabalho] [-h "
-"fone_residencial]\n"
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Nome Completo"
 
@@ -577,24 +669,26 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 "Uso: %s [opções]\n"
 "\n"
 "Opções:\n"
-"  -c, --crypt-method            o método de criptografia (dentre %s)\n"
-"  -e, --encrypted               senhas fornecidas estão criptografadas\n"
-"  -h, --help                    exibir esta mensagem de ajuda e finalizar\n"
-"  -m, --md5                     criptografar a senha em texto plano usando\n"
-"                                o algoritmo MD5\n"
-"%s\n"
 
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr "  -c, --crypt-method <MÉTODO>   método de criptografia (dentre %s)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr "  -e, --encrypted               senhas fornecidas são criptografadas\n"
+
 msgid ""
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
+msgstr ""
+"  -m, --md5                     criptografa a senha em texto plano usando o\n"
+"                                algoritmo MD5\n"
+
+msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
 "                                crypt algorithms\n"
 msgstr ""
@@ -634,34 +728,6 @@
 msgstr "%s : erro detectado, mudanças ignoradas\n"
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Uso: %s [opções]\n"
-"\n"
-"Opções:\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method <MÉTODO>   método de criptografia (dentre %s)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr "  -e, --encrypted               senhas fornecidas são criptografadas\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -m, --md5                     criptografa a senha em texto plano usando o\n"
-"                                algoritmo MD5\n"
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: (linha %d, usuário %s) senha inalterada\n"
 
@@ -669,20 +735,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: linha %d: usuário '%s' não existe\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
-msgstr ""
-"Use: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    exibir a mensagem de ajuda e sair\n"
-"  -s, --shell SHELL             novo login shell para conta de usuario\n"
-"\n"
+#, fuzzy
+#| msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
+msgstr "  -s, --shell SHELL             shell de login da nova conta\n"
 
 msgid "Login Shell"
 msgstr "Shell de Login"
@@ -711,9 +767,34 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Atenção: %s não é executável\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Uso : expiry {-f|-c}\n"
+#, fuzzy
+#| msgid ""
+#| "  -u, --user                    which user's tcb shadow file to edit\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
+"  -u, --user                    que arquivo shadow tcb de usuário editar\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -m, --md5                     criptografa a senha em texto plano usando o\n"
+"                                algoritmo MD5\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: opções %s e %s em conflito\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: argumento inesperado: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 "  -a, --all                     mostrar registros de faillog de todos os "
@@ -754,9 +835,10 @@
 "                                -r, -m ou -l) apenas para os LOGIN(s)\n"
 "                                especificados\n"
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "faillog: Falha em conseguir a entrada para o UID %lu\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog: Falha ao obter a entrada para o UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Falhas   Máximo  Último                   Em\n"
@@ -769,31 +851,32 @@
 msgid " [%lds lock]"
 msgstr " [%lds lock]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: Falha em zerar o contador de falhas para o UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "faillog: Falha ao ajustar o max para o UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: Falha ao ajustar o tempo de trava para o UID %lu\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog: Usuário ou intervalo desconhecidos: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "faillog: não foi possível abrir %s: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: Não foi possível obter o tamanho de %s: %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: Não foi possível obter o tamanho de %s: %s\n"
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -809,6 +892,11 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete USUÁRIO          remove USUÁRIO do GRUPO\n"
 
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir DIR_PESSOAL    diretório pessoal da nova conta\n"
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         remove a senha do GRUPO\n"
 
@@ -940,8 +1028,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: GID '%lu' já existe\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Uso: groupdel grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s : Não foi possível determinar seu nome de usuário.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1050,17 +1140,53 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s : usuário %s desconhecido\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Uso : %s [-r] [-s] [grupo [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Uso: %s [opções] [ação]\n"
+"\n"
+"Opções:\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Uso : %s [-r] [-s] [grupo]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Uso: %s [opções] [ação]\n"
+"\n"
+"Opções:\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"-s, --sha-rounds                Números de SHA rodadas para a SHA *\n"
+"                                algoritmos criptografados\n"
+
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -l, --list                    lista os membros do grupo\n"
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
-msgstr "%s : -s e -r são incompatíveis\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s e -r são incompatíveis\n"
 
 msgid "invalid group file entry"
 msgstr "entrada inválida no arquivo de grupo"
@@ -1129,12 +1255,6 @@
 msgid "%s: no changes\n"
 msgstr "%s : nenhuma mudança\n"
 
-msgid "Usage: grpconv\n"
-msgstr "Uso: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "Uso: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: não é possível apagar %s\n"
@@ -1148,33 +1268,31 @@
 msgid " groups="
 msgstr " grupos="
 
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -t, --time DIAS               mostra os registros do faillog mais recentes "
+"que DIAS dias\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr ""
+"  -t, --time DIAS               mostra os registros do faillog mais recentes "
+"que DIAS dias\n"
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Uso: lastlog [opções]\n"
-"\n"
-"Opções:\n"
-"  -b, --before DIAS             imprime somente registros lastlog mais\n"
-"                                antigos que DIAS\n"
-"  -h, --help                    exibe esta mensagem de ajuda e finaliza\n"
-"  -t, --time DIAS               imprime somente registros lastlog mais\n"
-"                                recentes que DIAS\n"
-"  -u, --user LOGIN              imprime registro lastlog para usuário com\n"
-"                                LOGIN especificado\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Falha ao obter a entrada para o UID %lu\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "Nome de Usuário         Porta     De             Último"
 
@@ -1185,14 +1303,6 @@
 msgstr "**Nunca logou**"
 
 #, 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 "lastlog: Não foi possível obter o tamanho de %s: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Uso : %s [-p] [nome]\n"
 
@@ -1263,6 +1373,11 @@
 msgid "Login incorrect"
 msgstr "Login incorreto"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s : linha %d : não foi possível encontrar usuário %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1381,54 +1496,94 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s : linha %d : não foi possível atualizar entrada\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+"  -a, --all                     mostrar registros de faillog de todos os "
+"usuários\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system                  cria uma conta de sistema\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system                  cria uma conta de sistema\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr "  -e, --encrypted               senhas fornecidas são criptografadas\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -p, --password SENHA          muda a senha para esta SENHA "
+"(criptografada)\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr "  -u, --uid UID                 ID de usuário da nova conta\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"-s, --sha-rounds                Números de SHA rodadas para a SHA *\n"
+"                                algoritmos criptografados\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr "  -q, --quiet                   modo silencioso\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system                  cria uma conta de sistema\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr "  -u, --uid UID                 ID de usuário da nova conta\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Uso: passwd [opções] [LOGIN]\n"
-"\n"
-"Opções:\n"
-"  -a, --all                     reportar estado de senhas em toda as contas\n"
-"  -d, --delete                  remover a senha para a conta indicada\n"
-"  -e, --expire                  forçar expiração da senha para a conta "
-"indicada\n"
-"  -h, --help                    exibir esta mensagem de ajuda e sai\n"
-"  -k, --keep-tokens             mudar senha somente caso expirada\n"
-"  -i, --inactive INATIVO        definir senha inativa após expiração para\n"
-"                                INATIVO\n"
-"  -l, --lock                    trava a conta indicada\n"
-"  -n, --mindays MIN_DIAS        define número mínimo de dias antes da troca\n"
-"                                de senhas para MIN_DIAS\n"
-"  -q, --quiet                   modo silencioso\n"
-"  -r, --repository REPOSITÓRIO  mudar senha no repositório REPOSITÓRIO\n"
-"  -S, --status                  reportar estado de senha para a conta "
-"indicada\n"
-"  -u, --unlock                  destravar a conta indicada\n"
-"  -w, --warndays DIAS_AVISO     define dias de aviso de expiração para\n"
-"                                DIAS_AVISO\n"
-"  -x, --maxdays MAX_DIAS        define número máximo de dias antes da troca\n"
-"                                de senhas para MAX_DIAS\n"
-"\n"
+"-s, --sha-rounds                Números de SHA rodadas para a SHA *\n"
+"                                algoritmos criptografados\n"
 
 msgid "Old password: "
 msgstr "Senha antiga : "
@@ -1513,17 +1668,38 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: informação de expiração de senha alterada.\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Uso: %s [-q] [-r] [passwd]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Uso: %s [opções] [ação]\n"
+"\n"
+"Opções:\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Uso : %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Uso: %s [opções] [ação]\n"
+"\n"
+"Opções:\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s e -r são incompatíveis\n"
+#, fuzzy
+#| msgid "  -q, --quiet                   quiet mode\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr "  -q, --quiet                   modo silencioso\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1602,9 +1778,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: não é possível ordenar entradas em %s\n"
 
-msgid "Usage: pwconv\n"
-msgstr "Uso: pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: não é possível funcionar com tcb habilitado\n"
@@ -1613,9 +1786,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: falha ao mudar o modo de %s para 0600\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "Uso: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Acesso ao su para esta conta NEGADO.\n"
 
@@ -1679,18 +1849,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s : deve ser executado a partir de um terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s : %s\n"
+"(Ignorado)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s : pam_start : erro %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Id desconhecido : %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Você não está autorizado a usar o su para %s\n"
 
@@ -1698,14 +1864,6 @@
 msgstr "{Informe sua própria senha)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s : %s\n"
-"(Ignorado)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: Falha de autenticação\n"
 
@@ -1713,9 +1871,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s: Você não está autorizado a usar o su agora\n"
 
-msgid "No shell\n"
-msgstr "Sem shell\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Nenhuma entrada de senha para 'root'"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s : deve ser executado a partir de um terminal\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s : pam_start : erro %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot remove the content of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: Não é possível remover o conteúdo de %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Não foi possível executar %s"
+
 msgid "No password file"
 msgstr "Sem arquivo de senhas"
 
@@ -1757,8 +1935,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: linha muito longa em %s: %s..."
 
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: renomear: %s: %s"
 
 #, c-format
@@ -1769,9 +1948,15 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: muitos grupos especificados (máximo %d).\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1916,10 +2101,6 @@
 msgstr "%s: -Z precisa de um núcleo com o SELinux habilitado\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: opções %s e %s em conflito\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr "%s: falha ao zerar a entrada do faillog de UID %lu: %s\n"
 
@@ -1984,30 +2165,45 @@
 "%s: aviso: o diretório pessoal já existe.\n"
 "Não copiando nenhum arquivo do diretótio skel.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -f, --force                   exit successfully if the group already "
+#| "exists,\n"
+#| "                                and cancel -g if the GID is already used\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Uso: userdel [options] LOGIN\n"
-"\n"
-"Opções:\n"
-"  -f, --force                   força remoção dos arquivos,\n"
-"                                mesmo se não forem do usuário\n"
-"  -h, --help                    exibe esta mensagem de ajuda e sai\n"
-"  -r, --remove                  remove o diretório pessoal e spool de "
-"mensagens\n"
+"  -f, --force                   sai com sucesso se o grupo já existe,\n"
+"                                e cancela -g se o GID já está em uso\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+"  -r, --reset                   zera os contadores de falhas de login\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: não é possível remover o grupo primário do usuário '%s'\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: grupo %s é o grupo primário de outro usuário e não será removido.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: diretório pessoal %s (%s) não encontrado\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: atenção: não é possível remover %s: %s\n"
@@ -2038,10 +2234,6 @@
 msgstr "%s : usuário %s é um usuário NIS\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s : o usuário %s está logado no momento\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: diretório pessoal %s (%s) não encontrado\n"
 
@@ -2053,62 +2245,99 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s : erro removendo diretório %s\n"
 
-#, c-format
+#, fuzzy
+#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr "  -c, --comment COMENTÁRIO      campo GECOS da nova conta\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr "  -d, --home-dir DIR_PESSOAL    diretório pessoal da nova conta\n"
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+"  -e, --expiredate DATA_DE_EXPIRAÇÃO  data de expiração da nova conta\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -p, --password SENHA          muda a senha para esta SENHA "
+"(criptografada)\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr "  -g, --gid GID                 usa GID para o novo grupo\n"
+
+#, fuzzy
+#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr "  -M, --members USUÁRIO,...     ajusta a lista de membros do GRUPO\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr "  -u, --uid UID                 ID de usuário da nova conta\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
+#| "the\n"
+#| "                                new account\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -b, --base-dir BASE_DIR       diretório base para o diretório pessoal da\n"
+"                                nova conta\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
+#| "GID\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -o, --non-unique              permite usar um GID (não-único) duplicado\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       use this encrypted password for the new "
+#| "group\n"
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Uso: usermod [opções] LOGIN\n"
-"\n"
-"Opções:\n"
-"  -c, --comment COMENTÁRIO      novo valor do campo GECOS\n"
-"  -d, --home DIR_PESSOAL        novo diretório de login para a nova conta "
-"de\n"
-"                                usuário\n"
-"  -e, --expiredate DATA_EXPIRA  define data de expiração de conta para\n"
-"                                DATA_EXPIRA\n"
-"  -f, --inactive INATIVO        define inatividade de senha após expiração\n"
-"                                para INATIVO\n"
-"  -g, --gid GRUPO               forçar usar GRUPO como novo grupo primário\n"
-"  -G, --groups GRUPOS           nova lista de GRUPOS suplementares\n"
-"  -a, --append                  anexa o usuário para os GRUPOS "
-"suplementares\n"
-"                                mencionados pela opção -G sem remove-lo de\n"
-"                                outros grupos\n"
-"  -h, --help                    exibe esta mensagem de ajuda e sai\n"
-"  -l, --login LOGIN             novo valor do nome de login\n"
-"  -L, --lock                    trava a conta de usuário\n"
-"  -m, --move-home               move o conteúdo do diretório pessoal para\n"
-"                                a novo localização (use somente com -d)\n"
-"  -o, --non-unique              permitir usar UID duplicados (não-únicos)\n"
-"  -p, --password SENHA          usar senha criptografada para a nova senha\n"
-"  -s, --shell SHELL             novo shell de login para a conta de usuário\n"
-"  -u, --uid UID                 novo UID para a conta de usuário\n"
-"  -U, --unlock                  destravar a conta de usuário\n"
-"%s\n"
+"  -p, --password SENHA          usa a senha criptografada para o novo grupo\n"
 
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr "  -u, --uid UID                 ID de usuário da nova conta\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr "  -u, --uid UID                 ID de usuário da nova conta\n"
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2129,19 +2358,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: usuário '%s' já existe em %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: não consegui abrir %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s : nenhuma flag informada\n"
+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: shadow passwords required for -e and -f\n"
 msgstr "%s : senhas shadow necessárias para -e e -f\n"
 
 #, c-format
-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' already exists\n"
 msgstr "%s: UID '%lu' já existe\n"
 
@@ -2213,9 +2443,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -p, --passwd                  edita banco de dados passwd\n"
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -q, --quiet                   modo silencioso\n"
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -s, --shadow                  editar o banco de dados shadow ou gshadow\n"
@@ -2276,6 +2503,327 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: falha ao procurar o diretório tcb para %s\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) falhou\n"
+
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: chage [opções] [LOGIN]\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -d, --lastday ULTIMO_DIA         define última mudança de senha para "
+#~ "ULTIMO_DIA\n"
+#~ "  -E, --expiredate DATA_EXPIRAÇÃO  define data de expiração de conta "
+#~ "para\n"
+#~ "                                   DATA_EXPIRAÇÃO\n"
+#~ "  -h, --help                       exibe esta mensagem de ajuda e sai\n"
+#~ "  -I, --inactive INATIVO           define senha inativa após expiração\n"
+#~ "                                   para INATIVO\n"
+#~ "  -l, --list                       exibe informação sobre idade da conta\n"
+#~ "  -m, --mindays MIN_DIAS           define número mínimo de dias antes da\n"
+#~ "                                   troca de senha para MIN_DIAS\n"
+#~ "  -M, --maxdays MAX_DIAS           define número máximo de dias antes da\n"
+#~ "                                   troca de senha para MAX_DIAS\n"
+#~ "  -W, --warndays AVISO_DIAS        define dias para aviso de expiração "
+#~ "para\n"
+#~ "                                   AVISO_DIAS\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s : autenticação PAM falhou\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Uso : %s [-f nome_completo] [-r número_sala] [-w fone_trabalho]\n"
+#~ "\t[-h fone_residencial] [-o outro] [usuário]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Uso : %s [-f nome_completo] [-r número_sala] [-w fone_rabalho] [-h "
+#~ "fone_residencial]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Uso: %s [opções]\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -c, --crypt-method            o método de criptografia (dentre %s)\n"
+#~ "  -e, --encrypted               senhas fornecidas estão criptografadas\n"
+#~ "  -h, --help                    exibir esta mensagem de ajuda e "
+#~ "finalizar\n"
+#~ "  -m, --md5                     criptografar a senha em texto plano "
+#~ "usando\n"
+#~ "                                o algoritmo MD5\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Use: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    exibir a mensagem de ajuda e sair\n"
+#~ "  -s, --shell SHELL             novo login shell para conta de usuario\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Uso : expiry {-f|-c}\n"
+
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "faillog: Falha em conseguir a entrada para o UID %lu\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "faillog: não foi possível abrir %s: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: Não foi possível obter o tamanho de %s: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Uso: groupdel grupo\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Uso : %s [-r] [-s] [grupo [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Uso : %s [-r] [-s] [grupo]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s : -s e -r são incompatíveis\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Uso: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Uso: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: lastlog [opções]\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -b, --before DIAS             imprime somente registros lastlog mais\n"
+#~ "                                antigos que DIAS\n"
+#~ "  -h, --help                    exibe esta mensagem de ajuda e finaliza\n"
+#~ "  -t, --time DIAS               imprime somente registros lastlog mais\n"
+#~ "                                recentes que DIAS\n"
+#~ "  -u, --user LOGIN              imprime registro lastlog para usuário "
+#~ "com\n"
+#~ "                                LOGIN especificado\n"
+#~ "\n"
+
+#~ 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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: passwd [opções] [LOGIN]\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -a, --all                     reportar estado de senhas em toda as "
+#~ "contas\n"
+#~ "  -d, --delete                  remover a senha para a conta indicada\n"
+#~ "  -e, --expire                  forçar expiração da senha para a conta "
+#~ "indicada\n"
+#~ "  -h, --help                    exibir esta mensagem de ajuda e sai\n"
+#~ "  -k, --keep-tokens             mudar senha somente caso expirada\n"
+#~ "  -i, --inactive INATIVO        definir senha inativa após expiração "
+#~ "para\n"
+#~ "                                INATIVO\n"
+#~ "  -l, --lock                    trava a conta indicada\n"
+#~ "  -n, --mindays MIN_DIAS        define número mínimo de dias antes da "
+#~ "troca\n"
+#~ "                                de senhas para MIN_DIAS\n"
+#~ "  -q, --quiet                   modo silencioso\n"
+#~ "  -r, --repository REPOSITÓRIO  mudar senha no repositório REPOSITÓRIO\n"
+#~ "  -S, --status                  reportar estado de senha para a conta "
+#~ "indicada\n"
+#~ "  -u, --unlock                  destravar a conta indicada\n"
+#~ "  -w, --warndays DIAS_AVISO     define dias de aviso de expiração para\n"
+#~ "                                DIAS_AVISO\n"
+#~ "  -x, --maxdays MAX_DIAS        define número máximo de dias antes da "
+#~ "troca\n"
+#~ "                                de senhas para MAX_DIAS\n"
+#~ "\n"
+
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Uso: %s [-q] [-r] [passwd]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Uso : %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Uso: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Uso: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Id desconhecido : %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Sem shell\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -f, --force                   força remoção dos arquivos,\n"
+#~ "                                mesmo se não forem do usuário\n"
+#~ "  -h, --help                    exibe esta mensagem de ajuda e sai\n"
+#~ "  -r, --remove                  remove o diretório pessoal e spool de "
+#~ "mensagens\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s : o usuário %s está logado no momento\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Uso: usermod [opções] LOGIN\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -c, --comment COMENTÁRIO      novo valor do campo GECOS\n"
+#~ "  -d, --home DIR_PESSOAL        novo diretório de login para a nova conta "
+#~ "de\n"
+#~ "                                usuário\n"
+#~ "  -e, --expiredate DATA_EXPIRA  define data de expiração de conta para\n"
+#~ "                                DATA_EXPIRA\n"
+#~ "  -f, --inactive INATIVO        define inatividade de senha após "
+#~ "expiração\n"
+#~ "                                para INATIVO\n"
+#~ "  -g, --gid GRUPO               forçar usar GRUPO como novo grupo "
+#~ "primário\n"
+#~ "  -G, --groups GRUPOS           nova lista de GRUPOS suplementares\n"
+#~ "  -a, --append                  anexa o usuário para os GRUPOS "
+#~ "suplementares\n"
+#~ "                                mencionados pela opção -G sem remove-lo "
+#~ "de\n"
+#~ "                                outros grupos\n"
+#~ "  -h, --help                    exibe esta mensagem de ajuda e sai\n"
+#~ "  -l, --login LOGIN             novo valor do nome de login\n"
+#~ "  -L, --lock                    trava a conta de usuário\n"
+#~ "  -m, --move-home               move o conteúdo do diretório pessoal "
+#~ "para\n"
+#~ "                                a novo localização (use somente com -d)\n"
+#~ "  -o, --non-unique              permitir usar UID duplicados (não-"
+#~ "únicos)\n"
+#~ "  -p, --password SENHA          usar senha criptografada para a nova "
+#~ "senha\n"
+#~ "  -s, --shell SHELL             novo shell de login para a conta de "
+#~ "usuário\n"
+#~ "  -u, --uid UID                 novo UID para a conta de usuário\n"
+#~ "  -U, --unlock                  destravar a conta de usuário\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s : nenhuma flag informada\n"
+
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
@@ -2846,9 +3394,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/ro.po
===================================================================
--- upstream/trunk/po/ro.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/ro.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2007-11-26 18:18+0100\n"
 "Last-Translator: Sorin Batariuc <sorin at bonbon.net>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -39,6 +39,14 @@
 msgstr ""
 "eroare de configurare - element necunoscut '%s' (anunţaţi administratorul)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Parola: "
 
@@ -228,6 +236,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "eşuare în schimbarea proprietarului căsuţei poştale"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: nu pot prelua UID\n"
 
@@ -311,6 +324,33 @@
 msgstr "Parolă incorectă pentru %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: număr telefon acasă nevalid: '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: nu pot crea directorul %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: nu pot crea directorul %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -338,53 +378,55 @@
 msgid "Unable to determine your tty name."
 msgstr "Nu vă pot determina numele tty."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) a eşuat\n"
-
 #, fuzzy
 #| msgid "No\n"
 msgid "No"
 msgstr "Nu\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "Utilizare: %s [input]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Folosire: chage [opţiuni] utilizator\n"
-"\n"
-"Opţiuni:\n"
-"  -d, --lastday ULTIMA_ZI        setează ultima schimbare de parolă\n"
-"                                 la ULTIMA_ZI\n"
-"  -E, --expiredate DATA_EXPIRARE setează data expirării contului la\n"
-"                                 DATA_EXPIRARE\n"
-"  -h, --help                     afişează acest mesaj de ajutor şi ieşi\n"
-"  -I, --inactive INACTIVĂ        setează parolă inactivă după expirare\n"
-"                                 la INACTIVĂ\n"
-"  -l, --list                     arată informaţiile de temporalitate ale\n"
-"                                 contului\n"
-"  -m, --mindays MIN_ZILE         setează numărul minim de zile înainde de\n"
-"                                 schimbarea parolei to MIN_ZILE\n"
-"  -M, --maxdays MAX_ZILE         setează numărul maxim de zile înainte de\n"
-"                                 schimbarea parolei la MAX_ZILE\n"
-"  -W, --warndays AVERTIZ_ZILE    setează zilele de avertisment pentru\n"
-"                                 expirare la AVERTIZ_ZILE\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Introduceţi noua valoare, sau apăsaţi ENTER pentru cea implicită"
@@ -457,9 +499,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -484,10 +527,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: fişierul shadow nu este prezent\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: utilizatorul %s nu există\n"
@@ -500,20 +539,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: eroare la modificarea câmpurilor\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "Utilizare: %s [input]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Utilizare: %s [-f nume_complet] [-r nr_cameră] [-w cale_lucru]\n"
-"\t[-h cale_acasă] [-o altele] [utilizator]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
 msgstr ""
-"Utilizare: %s [-f nume_complet] [-r nr_cameră] [-w cale_lucru] [-h "
-"cale_acasă]\n"
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Nume complet"
 
@@ -591,26 +642,24 @@
 msgstr "%s: câmpuri prea lungi\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "Utilizare: %s [input]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Folosire: chpasswd [opţiuni]\n"
-"\n"
-"Opţiuni:\n"
-"  -e, --encrypted               parolele oferite sunt criptate\n"
-"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
-"  -m, --md5                     foloseşte criptarea MD5 în loc de DES "
-"atunci\n"
-"                                când parolele oferite nu sunt criptate\n"
-"%s\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -652,29 +701,6 @@
 msgstr "%s: a fost detectată o eroare, schimbările sunt ignorate\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Utilizare: %s [input]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: utilizatorul %s nu există\n"
 
@@ -682,24 +708,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: utilizatorul %s nu există\n"
 
-#, fuzzy
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Folosire: userdel [opţiuni] NUME\n"
-"\n"
-"Opţiuni:\n"
-"  -f, --force                   forţează ştergerea fişierelor, chiar\n"
-"                                dacă nu sunt proprietatea utilizatorului\n"
-"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
-"  -r, --remove                  şterge directorul personal şi cel pentru "
-"mesaje\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "Autentificare consolă"
@@ -732,9 +742,24 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: avertisment: %s nu este deţinut de către %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Utilizare: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: argument neaşteptat: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -761,9 +786,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: nu pot crea directorul %s\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Autentificare       Eşuări Maximum Ultima dată                   La\n"
@@ -777,31 +803,30 @@
 msgid " [%lds lock]"
 msgstr " [%lds rămase]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: nu pot crea directorul %s\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: nu pot crea directorul %s\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "Utilizator necunoscut: %s\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"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: nu pot redenumi directorul %s în %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -816,6 +841,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -942,8 +970,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-msgid "Usage: groupdel group\n"
-msgstr "Utilizare: groupdel grup\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Nu vă pot determina numele de utilizator.\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1047,16 +1077,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: utilizator necunoscut %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Utilizare: %s [-r] [-s] [grup [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Utilizare: %s [input]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Utilizare: %s [-r] [-s] [grup]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "Utilizare: %s [input]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s şi -r sunt incompatibile\n"
 
 msgid "invalid group file entry"
@@ -1126,16 +1173,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: nici o schimbare\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "Utilizare: groupdel grup\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "Utilizare: groupdel grup\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1151,31 +1188,16 @@
 msgstr " grupuri="
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Utilizaree: lastlog [opţiuni]\n"
-"\n"
-"Opţiuni:\n"
-"  -b, --before ZILE             afişează doar înregistrările ultimului\n"
-"                                jurnal mai vechi de ZILE\n"
-"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
-"  -t, --time ZILE               afişează doar înregistrările ultimului\n"
-"                                jurnal mai recente de ZILE\n"
-"  -u, --user LOGIN              afişează înregistrarea ultimului jurnal "
-"pentru\n"
-"                                utilizatorul cu autentificarea specificată\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1188,14 +1210,6 @@
 msgstr "**Niciodată autentificat**"
 
 #, 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"
 
@@ -1270,6 +1284,11 @@
 msgid "Login incorrect"
 msgstr "Autentificare incorectă"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: linia %d: nu pot găsi utilizatorul %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1392,56 +1411,59 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: linia %d: nu pot actualiza intrarea\n"
 
-#, fuzzy
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Utilizare: passwd [opţiuni] [nume_cont]\n"
-"\n"
-"Opţiuni:\n"
-"  -a, --all                     afişează starea parolelor din toate "
-"conturile\n"
-"  -d, --delete                  şterge parola respectivului cont\n"
-"  -e, --expire                  forţează expirarea parolei pentru\n"
-"                                respectivul cont\n"
-"  -h, --help                    afisează acest mesaj de ajutor şi ieşi\n"
-"  -k, --keep-tokens             schimbă parola doar dacă este expirată\n"
-"  -i, --inactive INACTIV        fixează durata de inactivitate a parolei la\n"
-"                                INACTIV după expirarea sa\n"
-"  -l, --lock                    blochează respectivul cont\n"
-"  -n, --mindays ZILE_MIN        fixează numărul minim de zile la ZILE_MIN\n"
-"                                înainte de schimbarea parolei\n"
-"  -q, --quiet                   modul silenţios\n"
-"  -r, --repository DEPOZIT      schimbă parola în depozitul DEPOZIT\n"
-"  -S, --status                  raportează starea parolei respectivului "
-"cont\n"
-"  -u, --unlock                  deblochează respectivul cont\n"
-"  -w, --warndays ZILE_AVERT     fixează numărul de zile de avertisment de\n"
-"                                expirare la ZILE_AVERT\n"
-"  -x, --maxdays ZILE__MAX       fixează numărul maxim de zile înainde de\n"
-"                                schimbarea parolei la ZILE_MAX\n"
-"\n"
 
 msgid "Old password: "
 msgstr "Parola veche: "
@@ -1525,19 +1547,24 @@
 msgstr "Avertisment de expirare a parolei"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Folosire: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "Utilizare: %s [input]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Folosire: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s şi -r sunt incompatibile\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Utilizare: %s [input]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1620,11 +1647,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: nu pot deschide fişierul %s\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "Utilizare: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1634,11 +1656,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "Utilizare: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Acces INTERZIS către su spre acest cont.\n"
 
@@ -1705,32 +1722,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: trebuie pornit de la un terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ignorat)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: eroare %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Identificator necunoscut: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Nu sunteţi autorizat pentru su %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(Introduceţi propria parolă)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ignorat)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1741,9 +1746,29 @@
 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"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Fără intrare în passwd pentru 'root'"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: trebuie pornit de la un terminal\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: eroare %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: nu pot redenumi directorul %s în %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Nu pot executa %s"
+
 msgid "No password file"
 msgstr "Fără fişier passwd"
 
@@ -1788,7 +1813,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: redenumire: %s"
 
 #, c-format
@@ -1803,6 +1828,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "Utilizare: %s [input]\n"
@@ -1920,10 +1947,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -1990,26 +2013,23 @@
 "Nu se copiază nici un fişier în el din directorul schelet.\n"
 
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Folosire: userdel [opţiuni] NUME\n"
-"\n"
-"Opţiuni:\n"
-"  -f, --force                   forţează ştergerea fişierelor, chiar dacă\n"
-"                                nu sunt proprietatea utilizatorului\n"
-"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
-"  -r, --remove                  şterge directorul personal şi cel pentru "
-"mesaje\n"
-"\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: nu pot schimba utilizatorul '%s' pe un client NIS.\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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"
@@ -2017,6 +2037,11 @@
 "%s: Nu pot şterge grupul %s care este un grup primar pentru alt utilizator.\n"
 
 #, fuzzy, c-format
+#| msgid "%s: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: director personal nevalid '%s'\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: avertisment: nu pot şterge "
@@ -2048,10 +2073,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: utilizatorul %s este un utilizator NIS\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: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2067,61 +2088,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: eroare la ştergerea directorului %s\n"
 
-#, fuzzy, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Folosire: usermod [opţiuni] NUME\n"
-"\n"
-"Opţiuni:\n"
-"  -a, --append GRUP               tadaugă utilizatorul în GRUPUL "
-"suplimentar\n"
-"  -c, --comment COMENTARIU        valoarea nouă a câmpului GECOS\n"
-"  -d, --home DIR_ACASA            noul director personal pentru noul cont\n"
-"  -e, --expiredate DATA_EXPIRĂRII setează data expirării contului la\n"
-"                                  DATA_EXPIRĂRII\n"
-"  -f, --inactive INACTIVĂ         setează parola inactivă după expirare\n"
-"                                  la INACTIVĂ\n"
-"  -g, --gid GRUP                  forţează folosirea GRUPULUI ca nou\n"
-"                                  iniţial grup\n"
-"  -G, --groups GRUPURI            afişează grupurile suplimentare GRUPURI\n"
-"  -h, --help                      afişează acest mesaj de ajutor şi ieşi\n"
-"  -l, --login NUME_NOU            noua valoare a numelui de autentificare\n"
-"  -L, --lock                      blochează contul\n"
-"  -m, --move-home                 mută conţinutul directorului personal în\n"
-"                                  noua locaţie (foloseşte doar cu -d)\n"
-"  -o, --non-unique                permite folosirea UID-urilor duplicate\n"
-"                                  (non-unice)\n"
-"  -p, --password PAROLA           foloseşte criptarea pentru noua parolă\n"
-"  -s, --shell SHELL               noul mediu de autentificare pentru\n"
-"                                  contul utilizator\n"
-"  -u, --uid UID                   noul UID pentru contul utilizator\n"
-"  -U, --unlock                    deblochează contul utilizator\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2138,19 +2157,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: utilizatorul %s există\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: nu pot deschide fişierul %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: nu s-au atribuit semnalizatoare\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: sunt necesare parole criptate pentru -e şi -f\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr ""
 
@@ -2217,9 +2237,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2302,7 +2319,340 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: director de bază nevalid '%s'\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) a eşuat\n"
+
 #, fuzzy
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Folosire: chage [opţiuni] utilizator\n"
+#~ "\n"
+#~ "Opţiuni:\n"
+#~ "  -d, --lastday ULTIMA_ZI        setează ultima schimbare de parolă\n"
+#~ "                                 la ULTIMA_ZI\n"
+#~ "  -E, --expiredate DATA_EXPIRARE setează data expirării contului la\n"
+#~ "                                 DATA_EXPIRARE\n"
+#~ "  -h, --help                     afişează acest mesaj de ajutor şi ieşi\n"
+#~ "  -I, --inactive INACTIVĂ        setează parolă inactivă după expirare\n"
+#~ "                                 la INACTIVĂ\n"
+#~ "  -l, --list                     arată informaţiile de temporalitate ale\n"
+#~ "                                 contului\n"
+#~ "  -m, --mindays MIN_ZILE         setează numărul minim de zile înainde "
+#~ "de\n"
+#~ "                                 schimbarea parolei to MIN_ZILE\n"
+#~ "  -M, --maxdays MAX_ZILE         setează numărul maxim de zile înainte "
+#~ "de\n"
+#~ "                                 schimbarea parolei la MAX_ZILE\n"
+#~ "  -W, --warndays AVERTIZ_ZILE    setează zilele de avertisment pentru\n"
+#~ "                                 expirare la AVERTIZ_ZILE\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: autentificare PAM eşuată\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Utilizare: %s [-f nume_complet] [-r nr_cameră] [-w cale_lucru]\n"
+#~ "\t[-h cale_acasă] [-o altele] [utilizator]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Utilizare: %s [-f nume_complet] [-r nr_cameră] [-w cale_lucru] [-h "
+#~ "cale_acasă]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Folosire: chpasswd [opţiuni]\n"
+#~ "\n"
+#~ "Opţiuni:\n"
+#~ "  -e, --encrypted               parolele oferite sunt criptate\n"
+#~ "  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+#~ "  -m, --md5                     foloseşte criptarea MD5 în loc de DES "
+#~ "atunci\n"
+#~ "                                când parolele oferite nu sunt criptate\n"
+#~ "%s\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Folosire: userdel [opţiuni] NUME\n"
+#~ "\n"
+#~ "Opţiuni:\n"
+#~ "  -f, --force                   forţează ştergerea fişierelor, chiar\n"
+#~ "                                dacă nu sunt proprietatea utilizatorului\n"
+#~ "  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+#~ "  -r, --remove                  şterge directorul personal şi cel pentru "
+#~ "mesaje\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Utilizare: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: nu pot deschide fişierul %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Utilizare: groupdel grup\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Utilizare: %s [-r] [-s] [grup [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Utilizare: %s [-r] [-s] [grup]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s şi -r sunt incompatibile\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Utilizare: groupdel grup\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Utilizare: groupdel grup\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Utilizaree: lastlog [opţiuni]\n"
+#~ "\n"
+#~ "Opţiuni:\n"
+#~ "  -b, --before ZILE             afişează doar înregistrările ultimului\n"
+#~ "                                jurnal mai vechi de ZILE\n"
+#~ "  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+#~ "  -t, --time ZILE               afişează doar înregistrările ultimului\n"
+#~ "                                jurnal mai recente de ZILE\n"
+#~ "  -u, --user LOGIN              afişează înregistrarea ultimului jurnal "
+#~ "pentru\n"
+#~ "                                utilizatorul cu autentificarea "
+#~ "specificată\n"
+#~ "\n"
+
+#, 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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Utilizare: passwd [opţiuni] [nume_cont]\n"
+#~ "\n"
+#~ "Opţiuni:\n"
+#~ "  -a, --all                     afişează starea parolelor din toate "
+#~ "conturile\n"
+#~ "  -d, --delete                  şterge parola respectivului cont\n"
+#~ "  -e, --expire                  forţează expirarea parolei pentru\n"
+#~ "                                respectivul cont\n"
+#~ "  -h, --help                    afisează acest mesaj de ajutor şi ieşi\n"
+#~ "  -k, --keep-tokens             schimbă parola doar dacă este expirată\n"
+#~ "  -i, --inactive INACTIV        fixează durata de inactivitate a parolei "
+#~ "la\n"
+#~ "                                INACTIV după expirarea sa\n"
+#~ "  -l, --lock                    blochează respectivul cont\n"
+#~ "  -n, --mindays ZILE_MIN        fixează numărul minim de zile la "
+#~ "ZILE_MIN\n"
+#~ "                                înainte de schimbarea parolei\n"
+#~ "  -q, --quiet                   modul silenţios\n"
+#~ "  -r, --repository DEPOZIT      schimbă parola în depozitul DEPOZIT\n"
+#~ "  -S, --status                  raportează starea parolei respectivului "
+#~ "cont\n"
+#~ "  -u, --unlock                  deblochează respectivul cont\n"
+#~ "  -w, --warndays ZILE_AVERT     fixează numărul de zile de avertisment "
+#~ "de\n"
+#~ "                                expirare la ZILE_AVERT\n"
+#~ "  -x, --maxdays ZILE__MAX       fixează numărul maxim de zile înainde de\n"
+#~ "                                schimbarea parolei la ZILE_MAX\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Folosire: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Folosire: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Utilizare: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Utilizare: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Identificator necunoscut: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Fără consolă\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Folosire: userdel [opţiuni] NUME\n"
+#~ "\n"
+#~ "Opţiuni:\n"
+#~ "  -f, --force                   forţează ştergerea fişierelor, chiar "
+#~ "dacă\n"
+#~ "                                nu sunt proprietatea utilizatorului\n"
+#~ "  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+#~ "  -r, --remove                  şterge directorul personal şi cel pentru "
+#~ "mesaje\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: utilizatorul %s este autentificat în acest moment\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Folosire: usermod [opţiuni] NUME\n"
+#~ "\n"
+#~ "Opţiuni:\n"
+#~ "  -a, --append GRUP               tadaugă utilizatorul în GRUPUL "
+#~ "suplimentar\n"
+#~ "  -c, --comment COMENTARIU        valoarea nouă a câmpului GECOS\n"
+#~ "  -d, --home DIR_ACASA            noul director personal pentru noul "
+#~ "cont\n"
+#~ "  -e, --expiredate DATA_EXPIRĂRII setează data expirării contului la\n"
+#~ "                                  DATA_EXPIRĂRII\n"
+#~ "  -f, --inactive INACTIVĂ         setează parola inactivă după expirare\n"
+#~ "                                  la INACTIVĂ\n"
+#~ "  -g, --gid GRUP                  forţează folosirea GRUPULUI ca nou\n"
+#~ "                                  iniţial grup\n"
+#~ "  -G, --groups GRUPURI            afişează grupurile suplimentare "
+#~ "GRUPURI\n"
+#~ "  -h, --help                      afişează acest mesaj de ajutor şi ieşi\n"
+#~ "  -l, --login NUME_NOU            noua valoare a numelui de "
+#~ "autentificare\n"
+#~ "  -L, --lock                      blochează contul\n"
+#~ "  -m, --move-home                 mută conţinutul directorului personal "
+#~ "în\n"
+#~ "                                  noua locaţie (foloseşte doar cu -d)\n"
+#~ "  -o, --non-unique                permite folosirea UID-urilor duplicate\n"
+#~ "                                  (non-unice)\n"
+#~ "  -p, --password PAROLA           foloseşte criptarea pentru noua parolă\n"
+#~ "  -s, --shell SHELL               noul mediu de autentificare pentru\n"
+#~ "                                  contul utilizator\n"
+#~ "  -u, --uid UID                   noul UID pentru contul utilizator\n"
+#~ "  -U, --unlock                    deblochează contul utilizator\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: nu s-au atribuit semnalizatoare\n"
+
+#, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
@@ -2834,9 +3184,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/ru.po
===================================================================
--- upstream/trunk/po/ru.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/ru.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: shadow request\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2011-04-10 13:45+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -44,6 +44,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "ошибка настройки: неизвестный элемент «%s» (сообщите администратору)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Пароль: "
 
@@ -222,6 +230,11 @@
 msgstr ""
 "%s: неверная настройка: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%lu)\n"
 
+#, fuzzy, c-format
+#| msgid "failed to allocate memory"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "не удалось выделить память"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr ""
@@ -310,6 +323,33 @@
 msgstr "Неверный пароль для %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: не удалось снизить уровень привилегий (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: некорректное значение номера домашнего телефона «%s»\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot create directory %s: %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: не удалось создать каталог %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Failed to create tcb directory for %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: не удалось создать tcb-каталог для %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -340,50 +380,85 @@
 msgid "Unable to determine your tty name."
 msgstr "Не удалось определить название вашего tty."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "не удалось выполнить malloc(%d)\n"
-
 msgid "No"
 msgstr "Нет"
 
-#
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"Использование: %s [параметры] ПОЛЬЗОВАТЕЛЬ\n"
+"\n"
+"Параметры:\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -e, --expiredate ДАТА_УСТ     дата устаревания новой учётной записи\n"
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    показать данное сообщение и закончить "
+"работу\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -p, --password ПАРОЛЬ         изменить пароль на заданный (шифрованный)\n"
+"                                ПАРОЛЬ\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+"  -r, --reset                   сбросить счётчик неудачных попыток входа\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
+"                        шифрования SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
+"                        шифрования SHA*\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+"  -d, --home-dir ДОМ_КАТ        домашний каталог новой учётной записи\n"
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Использование: chage [параметры] [ПОЛЬЗОВАТЕЛЬ]\n"
-"\n"
-"Параметры:\n"
-"  -d, --lastday LAST_DAY        установить последний день смены пароля\n"
-"                                в LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE  установить дату окончания действия\n"
-"                                учётной записи в EXPIRE_DATE\n"
-"  -h, --help                    показать это сообщение и закончить работу\n"
-"  -I, --inactive INACTIVE       установить неактивность пароля после\n"
-"                                устаревания в значение INACTIVE\n"
-"  -l, --list                    показать «возраст» учётной записи\n"
-"  -m, --mindays MIN_DAYS        установить минимальное число дней перед\n"
-"                                сменой пароля в MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS        установить максимальное число дней перед\n"
-"                                сменой пароля в MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS      установить количество дней с выдачей\n"
-"                                предупреждения в WARN_DAYS\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr ""
@@ -457,9 +532,10 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: не удалось определить имя пользователя.\n"
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr "%s: проверка подлинности PAM завершилась неудачно\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -482,10 +558,6 @@
 msgstr "%s: отсутствует файл паролей shadow\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: не удалось снизить уровень привилегий (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: пользователь «%s» не существует в %s\n"
 
@@ -497,20 +569,42 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: ошибка при изменении полей\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Использование: %s [-f полное имя] [-r номер комнаты] [-w рабочий телефон]\n"
-"\t[-h домашний телефон] [-o другое] [пользователь]\n"
+"Использование: %s [параметры] ПОЛЬЗОВАТЕЛЬ\n"
+"\n"
+"Параметры:\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Использование: %s [-f полное имя] [-r номер комнаты] [-w рабочий телефон] [-"
-"h домашний телефон]\n"
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    показать данное сообщение и закончить "
+"работу\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Полное имя"
 
@@ -590,24 +684,26 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 "Использование: %s [параметры]\n"
 "\n"
 "Параметры:\n"
-"  -c, --crypt-method    алгоритм шифрования (один из %s)\n"
-"  -e, --encrypted       вводится уже шифрованный пароль\n"
-"  -h, --help            показать это сообщение и завершить работу программы\n"
-"  -m, --md5             использовать шифрование MD5 вместо DES, если пароль\n"
-"                        вводится не шифрованным\n"
-"%s\n"
 
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr "  -c, --crypt-method <АЛГОРИТМ> алгоритм шифрования (один из: %s)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr "  -e, --encrypted               пароли передаются зашифрованными\n"
+
 msgid ""
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
+msgstr ""
+"  -m, --md5                     шифровать видимые пароли с помощью \n"
+"                                алгоритма MD5\n"
+
+msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
 "                                crypt algorithms\n"
 msgstr ""
@@ -647,35 +743,6 @@
 msgstr "%s: обнаружена ошибка, изменения не были сохранены\n"
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Использование: %s [параметры]\n"
-"\n"
-"Параметры:\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method <АЛГОРИТМ> алгоритм шифрования (один из: %s)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr "  -e, --encrypted               пароли передаются зашифрованными\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-"  -h, --help                    показать данное сообщение и закончить "
-"работу\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -m, --md5                     шифровать видимые пароли с помощью \n"
-"                                алгоритма MD5\n"
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: (строка %d, пользователь %s) пароль не изменён\n"
 
@@ -683,20 +750,12 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: строка %d: пользователь «%s» не существует\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+#, fuzzy
+#| msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Использование: chsh [параметры] [ПОЛЬЗОВАТЕЛЬ]\n"
-"\n"
-"Параметры:\n"
-"  -h, --help            показать данное сообщение и закончить работу\n"
-"  -s, --shell SHELL     новая регистрационная оболочка для учётной записи\n"
-"\n"
+"  -s, --shell ОБОЛОЧКА          регистрационная оболочка новой\n"
+"                                учётной записи\n"
 
 msgid "Login Shell"
 msgstr "Командная оболочка"
@@ -725,9 +784,35 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: предупреждение: %s не является исполняемым\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Использование: expiry {-f|-c}\n"
+#, fuzzy
+#| msgid ""
+#| "  -u, --user                    which user's tcb shadow file to edit\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
+"  -u, --user                    редактировать пользовательский файл\n"
+"                                shadow структуры tcb\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -m, --md5                     шифровать видимые пароли с помощью \n"
+"                                алгоритма MD5\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: конфликт параметров %s и %s\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: неожиданный параметр: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 "  -a, --all                     показать записи faillog для всех "
@@ -770,9 +855,10 @@
 "                                с -r, -m или -l) только для указанного\n"
 "                                ПОЛЬЗОВАТЕЛЯ(ЕЙ)\n"
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "faillog: не удалось получить запись для UID %lu\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog: не удалось получить запись для UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Уч.запись      Неуд. попыток  Максимум  Последний раз\n"
@@ -785,32 +871,33 @@
 msgid " [%lds lock]"
 msgstr " [%ld блокировок]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: не удалось сбросить счётчик неудачных попыток для UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr ""
 "faillog: не удалось установить максимальное число попыток для UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: не удалось установить время блокировки для UID %lu\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog: неизвестный пользователь или диапазон: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "faillog: не удалось открыть %s: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: не удалось получить размер %s: %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: не удалось получить размер %s: %s\n"
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -826,6 +913,12 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete ПОЛЬЗ            удалить ПОЛЬЗОВАТЕЛЯ из ГРУППЫ\n"
 
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+"  -d, --home-dir ДОМ_КАТ        домашний каталог новой учётной записи\n"
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         удалить пароль ГРУППЫ\n"
 
@@ -963,8 +1056,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: GID «%lu» уже существует\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Использование: groupdel группа\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: не удалось определить имя пользователя.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1072,16 +1167,52 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: неизвестный пользователь %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Использование: %s [-r] [-s] [файл_group [файл_gshadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Использование: %s [параметры] [действие]\n"
+"\n"
+"Параметры:\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Использование: %s [-r] [-s] [файл_group]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Использование: %s [параметры] [действие]\n"
+"\n"
+"Параметры:\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
+"                        шифрования SHA*\n"
+
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -l, --list                    перечислить всех членов группы\n"
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s и -r не могут использоваться одновременно\n"
 
 msgid "invalid group file entry"
@@ -1149,14 +1280,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: изменения не внесены\n"
 
-#
-msgid "Usage: grpconv\n"
-msgstr "Использование: grpconv\n"
-
-#
-msgid "Usage: grpunconv\n"
-msgstr "Использование: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: не удалось удалить %s\n"
@@ -1170,30 +1293,31 @@
 msgid " groups="
 msgstr " группы="
 
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -t, --time ДНЕЙ               показать записи faillog за последнее\n"
+"                                количество ДНЕЙ\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr ""
+"  -t, --time ДНЕЙ               показать записи faillog за последнее\n"
+"                                количество ДНЕЙ\n"
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Использование: lastlog [параметры]\n"
-"\n"
-"Параметры:\n"
-"  -b, --before ДНЕЙ     показать записи lastlog за последние ДНЕЙ дней\n"
-"  -h, --help            показать это сообщение и завершить работу программы\n"
-"  -t, --time ДНЕЙ       показать записи lastlog за последние ДНЕЙ дней\n"
-"  -u, --user ИМЯ        показать запись lastlog для учётной записи ИМЯ\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: не удалось получить запись для UID %lu\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "Пользователь     Порт     С                Последний раз"
 
@@ -1204,14 +1328,6 @@
 msgstr "**Никогда не входил в систему**"
 
 #, 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 "lastlog: не удалось получить размер %s: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Использование: %s [-p] [имя пользователя]\n"
 
@@ -1281,6 +1397,11 @@
 msgid "Login incorrect"
 msgstr "Неверное имя пользователя"
 
+#, fuzzy, c-format
+#| msgid "%s: Cannot fork user shell\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: невозможно выполнить fork пользовательской оболочки\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1401,57 +1522,97 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: строка %d: не удалось обновить запись\n"
 
-#
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+"  -a, --all                     показать записи faillog для всех "
+"пользователей\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system                  создать системную учётную запись\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system                  создать системную учётную запись\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr "  -e, --encrypted               пароли передаются зашифрованными\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -p, --password ПАРОЛЬ         изменить пароль на заданный (шифрованный)\n"
+"                                ПАРОЛЬ\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+"  -u, --uid UID                 пользовательский ID новой учётной записи\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
+"                        шифрования SHA*\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -q, --quiet                   сократить количество выводимых сообщений\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system                  создать системную учётную запись\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+"  -u, --uid UID                 пользовательский ID новой учётной записи\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Использование: passwd [параметры] [ПОЛЬЗОВАТЕЛЬ]\n"
-"\n"
-"Параметры:\n"
-"  -a, --all                     показать состояние паролей всех учётных\n"
-"                                записей\n"
-"  -d, --delete                  удалить пароль заданной учётной записи\n"
-"  -e, --expire                  просрочить пароль заданной учётной записи\n"
-"  -h, --help                    показать это сообщение и завершить работу\n"
-"                                программы\n"
-"  -k, --keep-tokens             изменять пароль только с истёкшим сроком\n"
-"                                действия\n"
-"  -i, --inactive INACTIVE       установить неактивность пароля после\n"
-"                                истечения срока в значение INACTIVE\n"
-"  -l, --lock                    заблокировать заданную учётную запись\n"
-"  -n, --mindays MIN_DAYS        установить минимальное число дней перед\n"
-"                                сменой пароля в MIN_DAYS\n"
-"  -q, --quiet                   не показывать сообщений\n"
-"  -r, --repository REPOSITORY   изменить пароль в репозитории REPOSITORY\n"
-"  -S, --status                  показать состояние пароля заданной учётной\n"
-"                                записи\n"
-"  -u, --unlock                  разблокировать заданную учётную запись\n"
-"  -w, --warndays WARN_DAYS      установить количество дней с\n"
-"                                выдачей предупреждения в WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        установить максимальное число дней перед\n"
-"                                сменой пароля в MAX_DAYS\n"
-"\n"
+"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
+"                        шифрования SHA*\n"
 
 msgid "Old password: "
 msgstr "Старый пароль: "
@@ -1535,17 +1696,39 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: информация об истечении срока действия пароля изменена.\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Использование: %s [-q] [-r] [passwd]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Использование: %s [параметры] [действие]\n"
+"\n"
+"Параметры:\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Использование: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Использование: %s [параметры] [действие]\n"
+"\n"
+"Параметры:\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s и -r не могут использоваться одновременно\n"
+#, fuzzy
+#| msgid "  -q, --quiet                   quiet mode\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+"  -q, --quiet                   сократить количество выводимых сообщений\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1622,10 +1805,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: не удалось отсортировать записи в %s\n"
 
-#
-msgid "Usage: pwconv\n"
-msgstr "Использование: pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: с включённым режимом tcb работа невозможна\n"
@@ -1634,10 +1813,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: не удалось изменить права %s на 0600\n"
 
-#
-msgid "Usage: pwunconv\n"
-msgstr "Использование: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Доступ к su для этой учётной записи ЗАПРЕЩЁН.\n"
 
@@ -1703,18 +1878,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: должен запускаться из терминала\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Игнорировано)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: ошибка %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Неизвестный id: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "У вас нет прав на выполнение su %s\n"
 
@@ -1722,14 +1893,6 @@
 msgstr "(Введите ваш собственный пароль)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Игнорировано)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: не удалось пройти проверку подлинности\n"
 
@@ -1737,9 +1900,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s: у вас нет прав выполнять su в данный момент\n"
 
-msgid "No shell\n"
-msgstr "Отсутствует оболочка\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Отсутствует запись для «root»"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: должен запускаться из терминала\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: ошибка %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot remove the content of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: не удалось удалить содержимое %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Не удалось выполнить %s"
+
 msgid "No password file"
 msgstr "Отсутствует файл паролей"
 
@@ -1781,8 +1964,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: слишком длинная строка в %s: %s…"
 
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: rename: %s: %s"
 
 #, c-format
@@ -1793,9 +1977,15 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: указано слишком много групп (максимум %d).\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1948,10 +2138,6 @@
 msgstr "%s: для -Z в ядре требуется включить SELinux\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: конфликт параметров %s и %s\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr "%s: не удалось сбросить запись в faillog для UID %lu: %s\n"
 
@@ -2016,32 +2202,47 @@
 "%s: предупреждение: домашний каталог уже существует.\n"
 "Никакие файлы из каталога шаблонов копироваться не будут.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -f, --force                   exit successfully if the group already "
+#| "exists,\n"
+#| "                                and cancel -g if the GID is already used\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Использование: userdel [параметры] ПОЛЬЗОВАТЕЛЬ\n"
-"\n"
-"Параметры:\n"
-"  -f, --force                   удалять файлы, даже если они\n"
-"                                не принадлежат пользователю\n"
-"  -h, --help                    показать данное сообщение и закончить "
-"работу\n"
-"  -r, --remove                  удалить домашний каталог и почтовый ящик\n"
-"\n"
+"  -f, --force                   закончить работу без ошибки, если группа\n"
+"                                существует и отменить -g, если GID уже\n"
+"                                используется\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+"  -r, --reset                   сбросить счётчик неудачных попыток входа\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: не удалось удалить первичную группу пользователя «%s»\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 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: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: домашний каталог пользователя %s (%s) не найден\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: предупреждение: не удалось удалить %s: %s\n"
@@ -2071,10 +2272,6 @@
 msgstr "%s: пользователь %s является пользователем NIS\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: пользователь %s сейчас работает в системе\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: домашний каталог пользователя %s (%s) не найден\n"
 
@@ -2087,65 +2284,106 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: ошибка удаления каталога %s\n"
 
-#, c-format
+#, fuzzy
+#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr "  -c, --comment КОММЕНТАРИЙ     поле GECOS новой учётной записи\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+"  -d, --home-dir ДОМ_КАТ        домашний каталог новой учётной записи\n"
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+"  -e, --expiredate ДАТА_УСТ     дата устаревания новой учётной записи\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -p, --password ПАРОЛЬ         изменить пароль на заданный (шифрованный)\n"
+"                                ПАРОЛЬ\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+"  -g, --gid GID                 для новой группы использовать указанный GID\n"
+
+#, fuzzy
+#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr "  -M, --members ПОЛЬЗ,…         задать список членов ГРУППЫ\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+"  -u, --uid UID                 пользовательский ID новой учётной записи\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
+#| "the\n"
+#| "                                new account\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -b, --base-dir БАЗ_КАТ        базовый каталог для домашнего каталога "
+"новой\n"
+"                                учётной записи\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
+#| "GID\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -o, --non-unique              разрешить повторяющиеся (не уникальные) GID\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       use this encrypted password for the new "
+#| "group\n"
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Использование: usermod [параметры] ПОЛЬЗОВАТЕЛЬ\n"
-"\n"
-"Параметры:\n"
-"  -c, --comment КОММЕНТАРИЙ     новое значение поля GECOS\n"
-"  -d, --home ДОМ_КАТ            новый домашний каталог учётной записи\n"
-"  -e, --expiredate ДАТА_УСТ     установить дату окончания действия\n"
-"                                учётной записи в ДАТА_УСТ\n"
-"  -f, --inactive НЕАКТИВНОСТЬ   установить период неактивности пароля после\n"
-"                                устаревания учётной записи равным "
-"НЕАКТИВНОСТЬ\n"
-"  -g, --gid ГРУППА              принудительно назначить первичную ГРУППУ\n"
-"  -G, --groups ГРУППЫ           список дополнительных ГРУПП\n"
-"  -a, --append                  добавить пользователя в дополнительные\n"
-"                                ГРУППЫ, указанные в параметре -G не удаляя\n"
-"                                пользователя из других групп\n"
-"  -h, --help                    показать данное сообщение и закончить "
-"работу\n"
-"  -l, --login НОВОЕ_ИМЯ         новое значение имени учётной записи\n"
-"  -L, --lock                    заблокировать учётную запись\n"
-"  -m, --move-home               переместить содержимое домашнего каталога в\n"
-"                                новое место (использовать только вместе с -"
-"d)\n"
-"  -o, --non-unique              разрешить создание учётной записи с уже\n"
-"                                имеющимся (не уникальным) UID\n"
-"  -p, --password ПАРОЛЬ         задать новый шифрованный пароль для\n"
-"                                учётной записи\n"
-"  -s, --shell ОБОЛОЧКА          задать новую оболочку для\n"
-"                                учётной записи\n"
-"  -u, --uid UID                 новый UID для учётной записи\n"
-"  -U, --unlock                  разблокировать учётную запись\n"
-"%s\n"
+"  -p, --password ПАРОЛЬ         использовать этот шифрованный пароль для\n"
+"                                новой группы\n"
 
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+"  -u, --uid UID                 пользовательский ID новой учётной записи\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+"  -u, --uid UID                 пользовательский ID новой учётной записи\n"
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2165,9 +2403,14 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: пользователь «%s» уже существует в %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: не удалось открыть %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: не заданы параметры\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr "%s: параметры -L, -p и -U взаимоисключающие\n"
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
@@ -2175,10 +2418,6 @@
 "%s: для параметров -e и -f требуется поддержка теневых файлов паролей\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr "%s: параметры -L, -p и -U взаимоисключающие\n"
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr "%s: UID «%lu» уже существует\n"
 
@@ -2254,10 +2493,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -p, --passwd                  редактировать базу данных паролей\n"
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-"  -q, --quiet                   сократить количество выводимых сообщений\n"
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -s, --shadow                  редактировать базу данных shadow или "
@@ -2321,6 +2556,332 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: не удалось найти каталог tcb для %s\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "не удалось выполнить malloc(%d)\n"
+
+#
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Использование: chage [параметры] [ПОЛЬЗОВАТЕЛЬ]\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "  -d, --lastday LAST_DAY        установить последний день смены пароля\n"
+#~ "                                в LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  установить дату окончания действия\n"
+#~ "                                учётной записи в EXPIRE_DATE\n"
+#~ "  -h, --help                    показать это сообщение и закончить "
+#~ "работу\n"
+#~ "  -I, --inactive INACTIVE       установить неактивность пароля после\n"
+#~ "                                устаревания в значение INACTIVE\n"
+#~ "  -l, --list                    показать «возраст» учётной записи\n"
+#~ "  -m, --mindays MIN_DAYS        установить минимальное число дней перед\n"
+#~ "                                сменой пароля в MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        установить максимальное число дней перед\n"
+#~ "                                сменой пароля в MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      установить количество дней с выдачей\n"
+#~ "                                предупреждения в WARN_DAYS\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: проверка подлинности PAM завершилась неудачно\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Использование: %s [-f полное имя] [-r номер комнаты] [-w рабочий "
+#~ "телефон]\n"
+#~ "\t[-h домашний телефон] [-o другое] [пользователь]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Использование: %s [-f полное имя] [-r номер комнаты] [-w рабочий телефон] "
+#~ "[-h домашний телефон]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Использование: %s [параметры]\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "  -c, --crypt-method    алгоритм шифрования (один из %s)\n"
+#~ "  -e, --encrypted       вводится уже шифрованный пароль\n"
+#~ "  -h, --help            показать это сообщение и завершить работу "
+#~ "программы\n"
+#~ "  -m, --md5             использовать шифрование MD5 вместо DES, если "
+#~ "пароль\n"
+#~ "                        вводится не шифрованным\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Использование: chsh [параметры] [ПОЛЬЗОВАТЕЛЬ]\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "  -h, --help            показать данное сообщение и закончить работу\n"
+#~ "  -s, --shell SHELL     новая регистрационная оболочка для учётной "
+#~ "записи\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Использование: expiry {-f|-c}\n"
+
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "faillog: не удалось получить запись для UID %lu\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "faillog: не удалось открыть %s: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: не удалось получить размер %s: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Использование: groupdel группа\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Использование: %s [-r] [-s] [файл_group [файл_gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Использование: %s [-r] [-s] [файл_group]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s и -r не могут использоваться одновременно\n"
+
+#
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Использование: grpconv\n"
+
+#
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Использование: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Использование: lastlog [параметры]\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "  -b, --before ДНЕЙ     показать записи lastlog за последние ДНЕЙ дней\n"
+#~ "  -h, --help            показать это сообщение и завершить работу "
+#~ "программы\n"
+#~ "  -t, --time ДНЕЙ       показать записи lastlog за последние ДНЕЙ дней\n"
+#~ "  -u, --user ИМЯ        показать запись lastlog для учётной записи ИМЯ\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\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"
+#~ "                                записей\n"
+#~ "  -d, --delete                  удалить пароль заданной учётной записи\n"
+#~ "  -e, --expire                  просрочить пароль заданной учётной "
+#~ "записи\n"
+#~ "  -h, --help                    показать это сообщение и завершить "
+#~ "работу\n"
+#~ "                                программы\n"
+#~ "  -k, --keep-tokens             изменять пароль только с истёкшим сроком\n"
+#~ "                                действия\n"
+#~ "  -i, --inactive INACTIVE       установить неактивность пароля после\n"
+#~ "                                истечения срока в значение INACTIVE\n"
+#~ "  -l, --lock                    заблокировать заданную учётную запись\n"
+#~ "  -n, --mindays MIN_DAYS        установить минимальное число дней перед\n"
+#~ "                                сменой пароля в MIN_DAYS\n"
+#~ "  -q, --quiet                   не показывать сообщений\n"
+#~ "  -r, --repository REPOSITORY   изменить пароль в репозитории REPOSITORY\n"
+#~ "  -S, --status                  показать состояние пароля заданной "
+#~ "учётной\n"
+#~ "                                записи\n"
+#~ "  -u, --unlock                  разблокировать заданную учётную запись\n"
+#~ "  -w, --warndays WARN_DAYS      установить количество дней с\n"
+#~ "                                выдачей предупреждения в WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        установить максимальное число дней перед\n"
+#~ "                                сменой пароля в MAX_DAYS\n"
+#~ "\n"
+
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Использование: %s [-q] [-r] [passwd]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Использование: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Использование: pwconv\n"
+
+#
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Использование: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Неизвестный id: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Отсутствует оболочка\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Использование: userdel [параметры] ПОЛЬЗОВАТЕЛЬ\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "  -f, --force                   удалять файлы, даже если они\n"
+#~ "                                не принадлежат пользователю\n"
+#~ "  -h, --help                    показать данное сообщение и закончить "
+#~ "работу\n"
+#~ "  -r, --remove                  удалить домашний каталог и почтовый ящик\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: пользователь %s сейчас работает в системе\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Использование: usermod [параметры] ПОЛЬЗОВАТЕЛЬ\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "  -c, --comment КОММЕНТАРИЙ     новое значение поля GECOS\n"
+#~ "  -d, --home ДОМ_КАТ            новый домашний каталог учётной записи\n"
+#~ "  -e, --expiredate ДАТА_УСТ     установить дату окончания действия\n"
+#~ "                                учётной записи в ДАТА_УСТ\n"
+#~ "  -f, --inactive НЕАКТИВНОСТЬ   установить период неактивности пароля "
+#~ "после\n"
+#~ "                                устаревания учётной записи равным "
+#~ "НЕАКТИВНОСТЬ\n"
+#~ "  -g, --gid ГРУППА              принудительно назначить первичную ГРУППУ\n"
+#~ "  -G, --groups ГРУППЫ           список дополнительных ГРУПП\n"
+#~ "  -a, --append                  добавить пользователя в дополнительные\n"
+#~ "                                ГРУППЫ, указанные в параметре -G не "
+#~ "удаляя\n"
+#~ "                                пользователя из других групп\n"
+#~ "  -h, --help                    показать данное сообщение и закончить "
+#~ "работу\n"
+#~ "  -l, --login НОВОЕ_ИМЯ         новое значение имени учётной записи\n"
+#~ "  -L, --lock                    заблокировать учётную запись\n"
+#~ "  -m, --move-home               переместить содержимое домашнего каталога "
+#~ "в\n"
+#~ "                                новое место (использовать только вместе с "
+#~ "-d)\n"
+#~ "  -o, --non-unique              разрешить создание учётной записи с уже\n"
+#~ "                                имеющимся (не уникальным) UID\n"
+#~ "  -p, --password ПАРОЛЬ         задать новый шифрованный пароль для\n"
+#~ "                                учётной записи\n"
+#~ "  -s, --shell ОБОЛОЧКА          задать новую оболочку для\n"
+#~ "                                учётной записи\n"
+#~ "  -u, --uid UID                 новый UID для учётной записи\n"
+#~ "  -U, --unlock                  разблокировать учётную запись\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: не заданы параметры\n"
+
 #, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"

Modified: upstream/trunk/po/shadow.pot
===================================================================
--- upstream/trunk/po/shadow.pot	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/shadow.pot	2011-11-13 18:21:43 UTC (rev 3579)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -38,6 +38,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr ""
 
@@ -204,6 +212,10 @@
 msgstr ""
 
 #, c-format
+msgid "%s: failed to allocate memory: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr ""
 
@@ -285,6 +297,30 @@
 msgstr ""
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: invalid chroot path '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -312,30 +348,51 @@
 msgid "Unable to determine your tty name."
 msgstr ""
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr ""
-
 msgid "No"
 msgstr ""
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
 
 msgid "Enter the new value, or press ENTER for the default"
@@ -410,7 +467,7 @@
 msgstr ""
 
 #, c-format
-msgid "%s: PAM authentication failed\n"
+msgid "%s: PAM: %s\n"
 msgstr ""
 
 #, c-format
@@ -434,10 +491,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr ""
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr ""
 
@@ -451,14 +504,29 @@
 
 #, c-format
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr ""
 
@@ -538,12 +606,18 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 
 msgid ""
@@ -584,28 +658,6 @@
 msgstr ""
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr ""
 
@@ -613,13 +665,7 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr ""
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
 
 msgid "Login Shell"
@@ -649,9 +695,23 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr ""
 
-msgid "Usage: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
 msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unexpected argument: %s\n"
+msgstr ""
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -679,7 +739,7 @@
 msgstr ""
 
 #, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
 msgstr ""
 
 msgid "Login       Failures Maximum Latest                   On\n"
@@ -694,30 +754,26 @@
 msgstr ""
 
 #, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr ""
 
 #, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr ""
 
 #, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr ""
 
 #, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr ""
 
 #, c-format
-msgid "faillog: Cannot open %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
 msgstr ""
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -730,6 +786,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -848,7 +907,8 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-msgid "Usage: groupdel group\n"
+#, c-format
+msgid "%s: Cannot setup cleanup service.\n"
 msgstr ""
 
 #, c-format
@@ -949,15 +1009,29 @@
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr ""
 
 msgid "invalid group file entry"
@@ -1025,12 +1099,6 @@
 msgid "%s: no changes\n"
 msgstr ""
 
-msgid "Usage: grpconv\n"
-msgstr ""
-
-msgid "Usage: grpunconv\n"
-msgstr ""
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr ""
@@ -1045,19 +1113,16 @@
 msgstr ""
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1070,14 +1135,6 @@
 msgstr ""
 
 #, 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 ""
 
@@ -1141,6 +1198,10 @@
 msgstr ""
 
 #, c-format
+msgid "Cannot find user (%s)\n"
+msgstr ""
+
+#, c-format
 msgid ""
 "\n"
 "%s login: "
@@ -1253,28 +1314,57 @@
 msgstr ""
 
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
 
 msgid "Old password: "
@@ -1350,15 +1440,20 @@
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
+msgid "  -q, --quiet                   report errors only\n"
 msgstr ""
 
 #, c-format
@@ -1434,9 +1529,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr ""
 
-msgid "Usage: pwconv\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr ""
@@ -1445,9 +1537,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-msgid "Usage: pwunconv\n"
-msgstr ""
-
 msgid "Access to su to that account DENIED.\n"
 msgstr ""
 
@@ -1500,39 +1589,44 @@
 msgstr ""
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
 msgstr ""
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
+msgid "You are not authorized to su %s\n"
 msgstr ""
 
+msgid "(Enter your own password)"
+msgstr ""
+
 #, c-format
-msgid "Unknown id: %s\n"
+msgid "%s: Authentication failure\n"
 msgstr ""
 
 #, c-format
-msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
 msgstr ""
 
-msgid "(Enter your own password)"
+#, c-format
+msgid "No passwd entry for user '%s'\n"
 msgstr ""
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
+msgid "%s: must be run from a terminal\n"
 msgstr ""
 
 #, c-format
-msgid "%s: Authentication failure\n"
+msgid "%s: pam_start: error %d\n"
 msgstr ""
 
 #, c-format
-msgid "%s: You are not authorized to su at that time\n"
+msgid "%s: Cannot drop the controlling terminal\n"
 msgstr ""
 
-msgid "No shell\n"
+#, c-format
+msgid "Cannot execute %s\n"
 msgstr ""
 
 msgid "No password file"
@@ -1574,7 +1668,7 @@
 msgstr ""
 
 #, c-format
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr ""
 
 #, c-format
@@ -1588,6 +1682,8 @@
 #, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1705,10 +1801,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -1766,21 +1858,31 @@
 msgstr ""
 
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr ""
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 
 #, c-format
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr ""
 
@@ -1809,10 +1911,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr ""
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr ""
 
@@ -1824,34 +1922,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr ""
 
-#, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -1868,15 +1991,15 @@
 msgstr ""
 
 #, c-format
-msgid "%s: no flags given\n"
+msgid "%s: no options\n"
 msgstr ""
 
 #, c-format
-msgid "%s: shadow passwords required for -e and -f\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgid "%s: shadow passwords required for -e and -f\n"
 msgstr ""
 
 #, c-format
@@ -1942,9 +2065,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 

Modified: upstream/trunk/po/sk.po
===================================================================
--- upstream/trunk/po/sk.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/sk.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -6,7 +6,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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2009-04-11 15:38+0100\n"
 "Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -39,6 +39,14 @@
 msgstr ""
 "konfiguračná chyba - neznámy predmet „%s“ (informujte správcu systému)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Heslo: "
 
@@ -229,6 +237,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "chyba pri zmene vlastníka schránky"
+
+#, fuzzy, c-format
 #| msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: Nedá sa získať jedinečný UID (už nie sú dostupné žiadne UID)\n"
@@ -312,6 +325,33 @@
 msgstr "Chybné heslo pre %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: zlyhalo odstránenie právomocí (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: chybné telefónne číslo domov: „%s“\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: nedá sa vytvoriť adresár %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: nedá sa vytvoriť adresár %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -341,69 +381,71 @@
 msgid "Unable to determine your tty name."
 msgstr "Nedá sa zistiť názov vášho tty."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "volanie malloc(%d) zlyhalo\n"
-
 msgid "No"
 msgstr "Nie"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "Použitie: %s [vstup]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Použitie: chage [voľby] používateľ\n"
-"\n"
-"Options:\n"
-"  -d, --lastday POSL_DEN        nastaví dátum poslednej zmeny hesla na "
-"POSL_DEN\n"
-"  -E, --expiredate EXP_DATUM    nastaví dátum vypršania platnosti účtu na\n"
-"                                EXP_DATUM\n"
-"  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
-"  -I, --inactive NEAKTIV        nastaví nefunkčnosť hesla na NEAKTIV dní\n"
-"                                po vypršaní platnosti účtu\n"
-"  -l, --list                    zobrazí časové údaje o účte\n"
-"  -m, --mindays MIN_DNÍ         nastaví minimálny počet dní pred zmenou\n"
-"                                hesla na MIN_DNÍ\n"
-"  -M, --maxdays MAX_DNÍ         nastaví maximálny počet dní pred zmenou\n"
-"                                hesla na MAX_DNÍ\n"
-"  -W, --warndays UPOZ_DNÍ       nastaví upozornenie o platnosti účtu na "
-"UPOZ_DNÍ\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr ""
@@ -477,10 +519,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -503,10 +545,6 @@
 msgstr "%s: súbor s tieňovými heslami nie je dostupný\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: zlyhalo odstránenie právomocí (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: používateľ „%s“ neexistuje v %s\n"
 
@@ -518,22 +556,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: chyba pri zmene položiek\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "Použitie: %s [vstup]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Použitie: %s [-f celé_meno] [-r číslo_miestnosti] [-w "
-"telefón_do_zamestnania]\n"
-"\t[-h telefón_domov] [-o ostatné] [používateľ]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
 msgstr ""
-"Použitie: %s [-f celé_meno] [-r číslo_miestnosti] [-w "
-"telefón_do_zamestnania]\n"
-"\t[-h telefón_domov]\n"
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Celé meno"
 
@@ -608,27 +656,31 @@
 msgid "%s: fields too long\n"
 msgstr "%s: položka je príliš dlhá\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "Použitie: %s [vstup]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Použitie: %s [voľby]\n"
-"\n"
-"Voľby:\n"
-"  -c, --crypt-method            metóda šifrovania (jedna z %s)\n"
-"  -e, --encrypted               zadané heslá sú zakódované\n"
-"  -h, --help                    vypíše tohto pomocníka a ukončí sa\n"
-"  -m, --md5                     použije MD5 kódovanie namiesto DES, ak\n"
-"                                zadané heslá nie sú zakódované\n"
-"%s\n"
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -670,35 +722,6 @@
 msgstr "%s: zistená chyba, zmeny budú zamietnuté\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Použitie: %s [vstup]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
-
-#, fuzzy, c-format
 #| msgid "%s: line %d: user '%s' does not exist\n"
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: riadok %d: používateľ „%s“ neexistuje\n"
@@ -707,21 +730,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: riadok %d: používateľ „%s“ neexistuje\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Použitie: chsh [voľby] ÚČET\n"
-"\n"
-"Voľby:\n"
-"  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
-"  -s, --shell SHELL             nový prihlasovací shell používateľského "
-"účtu\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "Predvolený shell"
@@ -753,9 +763,30 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: upozornenie: vlastníkom %s nie je %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Použitie: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: voľby %s a %s sú v konflikte\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: neočakávaný argument: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -783,9 +814,9 @@
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "faillog: Failed to get the entry for UID %d\n"
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "faillog: Nepodarilo sa získať položku s UID %d\n"
+#| msgid "lastlog: Failed to get the entry for UID %d\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog: Nepodarilo sa získať položku s UID %d\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Chybné   Najviac Posledné                 Na\n"
@@ -800,31 +831,29 @@
 
 #, fuzzy, c-format
 #| msgid "faillog: Failed to reset fail count for UID %d\n"
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: Nepodarilo sa znulovať počet chýb pre UID %d\n"
 
 #, fuzzy, c-format
 #| msgid "faillog: Failed to set max for UID %d\n"
-msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "faillog: Nepodarilo sa nastaviť max. pre UID %d\n"
 
 #, fuzzy, c-format
 #| msgid "faillog: Failed to set locktime for UID %d\n"
-msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: Nepodarilo sa nastaviť čas zamknutia pre UID %d\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog: Neznámy používateľ alebo rozsah: %s.\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "faillog: Súbor %s sa nedá otvoriť: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: Nepodarilo sa zistiť veľkosť %s: %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: Nepodarilo sa zistiť veľkosť %s: %s\n"
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -839,6 +868,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -980,8 +1012,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: GID „%lu“ už existuje\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Použitie: groupdel skupina\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: vaše používateľské meno sa nedá zistiť.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1087,17 +1121,39 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: používateľ %s je neznámy\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Použitie: %s [vstup]\n"
+
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "Použitie: %s [vstup]\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
 msgstr ""
-"Použitie: %s [-r] [-s] [súbor_so_skupinami [súbor_s_tieňovými_skupinami]]\n"
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Použitie: %s [-r] [-s] [súbor_so_skupinami]\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s a -r nie sú zlučiteľné\n"
 
 msgid "invalid group file entry"
@@ -1165,12 +1221,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: bezo zmien\n"
 
-msgid "Usage: grpconv\n"
-msgstr "Použitie: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "Použitie: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: nie je možné zmazať %s\n"
@@ -1185,31 +1235,18 @@
 msgstr " skupiny="
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr ""
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Použitie: lastlog [voľby]\n"
-"\n"
-"Voľby:\n"
-"  -b, --before DAYS     vypíše posledné prihlásenia staršie ako DAYS dní\n"
-"  -h, --help            zobrazí tohto pomocníka a ukončí sa\n"
-"  -t, --time DAYS       vypíše posledné prihlásenia nie staršie ako DAYS "
-"dní\n"
-"  -u, --user LOGIN      vypíše posledné prihlásenia používateľa uvedeného\n"
-"                        ako LOGIN\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %d\n"
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Nepodarilo sa získať položku s UID %d\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "Používateľ       Port     Z                Naposledy"
 
@@ -1220,14 +1257,6 @@
 msgstr "**Nebol nikdy prihlásený**"
 
 #, 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 "lastlog: Nepodarilo sa zistiť veľkosť %s: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Použitie: %s [-p] [meno]\n"
 
@@ -1300,6 +1329,11 @@
 msgid "Login incorrect"
 msgstr "Chybné prihlásenie"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: riadok %d: nedá sa nájsť používateľ %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1420,52 +1454,76 @@
 msgstr "%s: riadok %d: položka sa nedá aktualizovať\n"
 
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Použitie: passwd [voľby] [ÚČET]\n"
-"\n"
-"Voľby:\n"
-"  -a, --all                     zobrazí stav hesiel pre všetky účty\n"
-"  -d, --delete                  odstráni heslo pre zadaný účet\n"
-"  -e, --expire                  vynúti platnosť hesla pre zadaný účet\n"
-"  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
-"  -k, --keep-tokens             zmení heslo iba v prípade vypršania času\n"
-"                                jeho platnosti\n"
-"  -i, --inactive INACTIVE       nastaví neplatnosť hesla po vypršaní času\n"
-"                                platnosti na INACTIVE dní\n"
-"  -l, --lock                    zablokuje zadaný účet\n"
-"  -n, --mindays MIN_DNÍ         nastaví minimálny počet dní pred zmenou\n"
-"                                hesla na MIN_DNÍ dní\n"
-"  -q, --quiet                   stručný režim\n"
-"  -r, --repository REPOSITORY   zmení heslo v repozitári REPOSITORY\n"
-"  -S, --status                  zobrazí stav hesla pre zadaný účet\n"
-"  -u, --unlock                  odblokuje zadaný účet\n"
-"  -w, --warndays WARN_DAYS      nastaví počet dní na upozornenie o vypršaní\n"
-"                                platnosti na WARN_DAYS dní\n"
-"  -x, --maxdays MAX_DNÍ         nastaví maximálny počet dní pred zmenou\n"
-"                                hesla na MAX_DNÍ dní\n"
-"\n"
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
 
 msgid "Old password: "
 msgstr "Staré heslo: "
@@ -1550,21 +1608,24 @@
 msgstr "Upozornenie o uplynutí doby platnosti hesla"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr ""
-"Použitie: %s [-q] [-r] [-s] [súbor_s_heslami [súbor_s_tieňovými_heslami]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "Použitie: %s [vstup]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Použitie: %s [vstup]\n"
+
+msgid "  -q, --quiet                   report errors only\n"
 msgstr ""
-"Použitie: %s [-q] [-r] [-s] [súbor_s_heslami [súbor_s_tieňovými_heslami]]\n"
 
-#, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s a -r nie sú zlučiteľné\n"
-
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1642,9 +1703,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: nie je možné zoradiť položdy v %s\n"
 
-msgid "Usage: pwconv\n"
-msgstr "Použitie: pwconv\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1654,9 +1712,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: lastlog: Nepodarilo sa zmeniť režim %s na 0600\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "Použitie: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Z tohto účtu je prístup k su ZAKÁZANÝ.\n"
 
@@ -1722,32 +1777,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: musí byť spustené z terminálu\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ignorujem)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: chyba %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Id %s je neznáme.\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Nie ste oprávnení používať su %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(Zadajte vaše heslo)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ignorujem)\n"
-
 #  c-format
 #, c-format
 msgid "%s: Authentication failure\n"
@@ -1757,9 +1800,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s: Nie ste momentálne oprávnení používať su\n"
 
-msgid "No shell\n"
-msgstr "Žiadny shell\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "V súbore passwd nie je položka pre používateľa „root“"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: musí byť spustené z terminálu\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: chyba %d\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "lastlog: Nepodarilo sa zistiť veľkosť %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "%s sa nedá spustiť."
+
 msgid "No password file"
 msgstr "Súbor s heslami neexistuje"
 
@@ -1804,7 +1867,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: premenovať: %s"
 
 #, c-format
@@ -1819,6 +1882,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "Použitie: %s [vstup]\n"
@@ -1972,10 +2037,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: voľby %s a %s sú v konflikte\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr "%s: Nepodarilo sa obnoviť položku faillog s UID %lu: %s\n"
 
@@ -2039,32 +2100,42 @@
 "%s: upozornenie: domovský adresár už existuje.\n"
 "Zo skel adresára sa tam neskopíruje žiaden súbor.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Použitie: userdel [voľby] LOGIN\n"
-"\n"
-"Voľby:\n"
-"  -f, --force                   vynúti odstránenie súborov, aj keď\n"
-"                                používateľ nie je ich vlastníkom\n"
-"  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
-"  -r, --remove                  odstráni domovský adresár a súbory s poštou\n"
-"\n"
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: nie je možné odstrniť primárnu skupinu používateľa „%s“.\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 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"
 
 #, fuzzy, c-format
+#| msgid "%s: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: chybný domovský adresár „%s“\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove %s: %s"
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: upozornenie: nemôžem odstrániť %s: %s"
@@ -2096,10 +2167,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: používateľ %s je NIS používateľom\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: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2113,94 +2180,83 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: chyba pri mazaní adresára %s\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: usermod [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --comment COMMENT         new value of the GECOS field\n"
-#| "  -d, --home HOME_DIR           new home directory for the user account\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP as new primary group\n"
-#| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-#| "  -a, --append                  append the user to the supplemental "
-#| "GROUPS\n"
-#| "                                mentioned by the -G option without "
-#| "removing\n"
-#| "                                him/her from other groups\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --login NEW_LOGIN         new value of the login name\n"
-#| "  -L, --lock                    lock the user account\n"
-#| "  -m, --move-home               move contents of the home directory to "
-#| "the\n"
-#| "                                new location (use only with -d)\n"
-#| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new "
-#| "password\n"
-#| "  -s, --shell SHELL             new login shell for the user account\n"
-#| "  -u, --uid UID                 new UID for the user account\n"
-#| "  -U, --unlock                  unlock the user account\n"
-#| "\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Použitie: usermod [voľby] ÚČET\n"
-"\n"
-"Voľby:\n"
-"  -c, --comment KOMENTÁR        nová hodnota poľa GECOS\n"
-"  -d, --home DOM_ADR            nový domovský adresár pre nový "
-"používateľský\n"
-"                                účet\n"
-"  -e, --expiredate EXP_DATUM    nastaví čas vypršania platnosti účtu na\n"
-"                                EXP_DATUM\n"
-"  -f, --inactive NEAKTIV        zablokuje platnosť hesla po NEAKTIV dňoch\n"
-"                                od času vypršania platnosti\n"
-"  -g, --gid SKUPINA             vynúti použitie skupiny SKUPINA ako novej\n"
-"                                prvotnej prihlasovacej skupiny\n"
-"  -G, --groups SKUPINY          zobrazí prídavné skupiny\n"
-"  -a, --append SKUPINA          pridá používateľa do ďalšej skupiny\n"
-"  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
-"  -l, --login LOGIN             nová hodnota prihlasovacieho mena\n"
-"  -L, --lock                    zablokuje používateľský účet\n"
-"  -m, --move-home               presunie obsah domovského adresára do "
-"nového\n"
-"                                umiestnenia (používať iba s -d)\n"
-"  -o, --non-unique              dovolí použitie duplicitného\n"
-"                                (nejedinečného) UID\n"
-"  -p, --password HESLO          ako nové heslo použije zadané zašifrované\n"
-"                                HESLO\n"
-"  -s, --shell SHELL             nový prihlasovací shell pre používateľský\n"
-"                                účet\n"
-"  -u, --uid UID                 nový UID pre používateľský účet\n"
-"  -U, --unlock                  odblokuje používateľský účet\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2218,19 +2274,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: používateľ %s už existuje v %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: súbor %s sa nedá otvoriť\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: žiadne prepínače\n"
+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: shadow passwords required for -e and -f\n"
 msgstr "%s: prepínače -e a -f vyžadujú tieňové heslá\n"
 
 #, c-format
-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' already exists\n"
 msgstr "%s: UID „%lu“ už existuje\n"
 
@@ -2304,9 +2361,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2384,8 +2438,387 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: chybný základný adresár „%s“\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "volanie malloc(%d) zlyhalo\n"
+
 #, fuzzy
 #~| msgid ""
+#~| "Usage: chage [options] [LOGIN]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+#~| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -l, --list                    show account aging information\n"
+#~| "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~| "password\n"
+#~| "                                change to MIN_DAYS\n"
+#~| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~| "password\n"
+#~| "                                change to MAX_DAYS\n"
+#~| "  -W, --warndays WARN_DAYS      set expiration warning days to "
+#~| "WARN_DAYS\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použitie: chage [voľby] používateľ\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday POSL_DEN        nastaví dátum poslednej zmeny hesla na "
+#~ "POSL_DEN\n"
+#~ "  -E, --expiredate EXP_DATUM    nastaví dátum vypršania platnosti účtu "
+#~ "na\n"
+#~ "                                EXP_DATUM\n"
+#~ "  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
+#~ "  -I, --inactive NEAKTIV        nastaví nefunkčnosť hesla na NEAKTIV dní\n"
+#~ "                                po vypršaní platnosti účtu\n"
+#~ "  -l, --list                    zobrazí časové údaje o účte\n"
+#~ "  -m, --mindays MIN_DNÍ         nastaví minimálny počet dní pred zmenou\n"
+#~ "                                hesla na MIN_DNÍ\n"
+#~ "  -M, --maxdays MAX_DNÍ         nastaví maximálny počet dní pred zmenou\n"
+#~ "                                hesla na MAX_DNÍ\n"
+#~ "  -W, --warndays UPOZ_DNÍ       nastaví upozornenie o platnosti účtu na "
+#~ "UPOZ_DNÍ\n"
+#~ "\n"
+
+#  c-format
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM autentifikácia zlyhala\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Použitie: %s [-f celé_meno] [-r číslo_miestnosti] [-w "
+#~ "telefón_do_zamestnania]\n"
+#~ "\t[-h telefón_domov] [-o ostatné] [používateľ]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Použitie: %s [-f celé_meno] [-r číslo_miestnosti] [-w "
+#~ "telefón_do_zamestnania]\n"
+#~ "\t[-h telefón_domov]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Použitie: %s [voľby]\n"
+#~ "\n"
+#~ "Voľby:\n"
+#~ "  -c, --crypt-method            metóda šifrovania (jedna z %s)\n"
+#~ "  -e, --encrypted               zadané heslá sú zakódované\n"
+#~ "  -h, --help                    vypíše tohto pomocníka a ukončí sa\n"
+#~ "  -m, --md5                     použije MD5 kódovanie namiesto DES, ak\n"
+#~ "                                zadané heslá nie sú zakódované\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použitie: chsh [voľby] ÚČET\n"
+#~ "\n"
+#~ "Voľby:\n"
+#~ "  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
+#~ "  -s, --shell SHELL             nový prihlasovací shell používateľského "
+#~ "účtu\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Použitie: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "faillog: Failed to get the entry for UID %d\n"
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "faillog: Nepodarilo sa získať položku s UID %d\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "faillog: Súbor %s sa nedá otvoriť: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: Nepodarilo sa zistiť veľkosť %s: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Použitie: groupdel skupina\n"
+
+#~ 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"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Použitie: %s [-r] [-s] [súbor_so_skupinami]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s a -r nie sú zlučiteľné\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Použitie: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Použitie: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použitie: lastlog [voľby]\n"
+#~ "\n"
+#~ "Voľby:\n"
+#~ "  -b, --before DAYS     vypíše posledné prihlásenia staršie ako DAYS dní\n"
+#~ "  -h, --help            zobrazí tohto pomocníka a ukončí sa\n"
+#~ "  -t, --time DAYS       vypíše posledné prihlásenia nie staršie ako DAYS "
+#~ "dní\n"
+#~ "  -u, --user LOGIN      vypíše posledné prihlásenia používateľa "
+#~ "uvedeného\n"
+#~ "                        ako LOGIN\n"
+
+#~ 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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použitie: passwd [voľby] [ÚČET]\n"
+#~ "\n"
+#~ "Voľby:\n"
+#~ "  -a, --all                     zobrazí stav hesiel pre všetky účty\n"
+#~ "  -d, --delete                  odstráni heslo pre zadaný účet\n"
+#~ "  -e, --expire                  vynúti platnosť hesla pre zadaný účet\n"
+#~ "  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
+#~ "  -k, --keep-tokens             zmení heslo iba v prípade vypršania času\n"
+#~ "                                jeho platnosti\n"
+#~ "  -i, --inactive INACTIVE       nastaví neplatnosť hesla po vypršaní "
+#~ "času\n"
+#~ "                                platnosti na INACTIVE dní\n"
+#~ "  -l, --lock                    zablokuje zadaný účet\n"
+#~ "  -n, --mindays MIN_DNÍ         nastaví minimálny počet dní pred zmenou\n"
+#~ "                                hesla na MIN_DNÍ dní\n"
+#~ "  -q, --quiet                   stručný režim\n"
+#~ "  -r, --repository REPOSITORY   zmení heslo v repozitári REPOSITORY\n"
+#~ "  -S, --status                  zobrazí stav hesla pre zadaný účet\n"
+#~ "  -u, --unlock                  odblokuje zadaný účet\n"
+#~ "  -w, --warndays WARN_DAYS      nastaví počet dní na upozornenie o "
+#~ "vypršaní\n"
+#~ "                                platnosti na WARN_DAYS dní\n"
+#~ "  -x, --maxdays MAX_DNÍ         nastaví maximálny počet dní pred zmenou\n"
+#~ "                                hesla na MAX_DNÍ dní\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr ""
+#~ "Použitie: %s [-q] [-r] [-s] [súbor_s_heslami "
+#~ "[súbor_s_tieňovými_heslami]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr ""
+#~ "Použitie: %s [-q] [-r] [-s] [súbor_s_heslami "
+#~ "[súbor_s_tieňovými_heslami]]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Použitie: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Použitie: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Id %s je neznáme.\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Žiadny shell\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použitie: userdel [voľby] LOGIN\n"
+#~ "\n"
+#~ "Voľby:\n"
+#~ "  -f, --force                   vynúti odstránenie súborov, aj keď\n"
+#~ "                                používateľ nie je ich vlastníkom\n"
+#~ "  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
+#~ "  -r, --remove                  odstráni domovský adresár a súbory s "
+#~ "poštou\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: používateľ %s je práve prihlásený\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Usage: usermod [options] LOGIN\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~| "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~| "  -a, --append                  append the user to the supplemental "
+#~| "GROUPS\n"
+#~| "                                mentioned by the -G option without "
+#~| "removing\n"
+#~| "                                him/her from other groups\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~| "  -L, --lock                    lock the user account\n"
+#~| "  -m, --move-home               move contents of the home directory to "
+#~| "the\n"
+#~| "                                new location (use only with -d)\n"
+#~| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~| "  -p, --password PASSWORD       use encrypted password for the new "
+#~| "password\n"
+#~| "  -s, --shell SHELL             new login shell for the user account\n"
+#~| "  -u, --uid UID                 new UID for the user account\n"
+#~| "  -U, --unlock                  unlock the user account\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Použitie: usermod [voľby] ÚČET\n"
+#~ "\n"
+#~ "Voľby:\n"
+#~ "  -c, --comment KOMENTÁR        nová hodnota poľa GECOS\n"
+#~ "  -d, --home DOM_ADR            nový domovský adresár pre nový "
+#~ "používateľský\n"
+#~ "                                účet\n"
+#~ "  -e, --expiredate EXP_DATUM    nastaví čas vypršania platnosti účtu na\n"
+#~ "                                EXP_DATUM\n"
+#~ "  -f, --inactive NEAKTIV        zablokuje platnosť hesla po NEAKTIV "
+#~ "dňoch\n"
+#~ "                                od času vypršania platnosti\n"
+#~ "  -g, --gid SKUPINA             vynúti použitie skupiny SKUPINA ako "
+#~ "novej\n"
+#~ "                                prvotnej prihlasovacej skupiny\n"
+#~ "  -G, --groups SKUPINY          zobrazí prídavné skupiny\n"
+#~ "  -a, --append SKUPINA          pridá používateľa do ďalšej skupiny\n"
+#~ "  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
+#~ "  -l, --login LOGIN             nová hodnota prihlasovacieho mena\n"
+#~ "  -L, --lock                    zablokuje používateľský účet\n"
+#~ "  -m, --move-home               presunie obsah domovského adresára do "
+#~ "nového\n"
+#~ "                                umiestnenia (používať iba s -d)\n"
+#~ "  -o, --non-unique              dovolí použitie duplicitného\n"
+#~ "                                (nejedinečného) UID\n"
+#~ "  -p, --password HESLO          ako nové heslo použije zadané "
+#~ "zašifrované\n"
+#~ "                                HESLO\n"
+#~ "  -s, --shell SHELL             nový prihlasovací shell pre "
+#~ "používateľský\n"
+#~ "                                účet\n"
+#~ "  -u, --uid UID                 nový UID pre používateľský účet\n"
+#~ "  -U, --unlock                  odblokuje používateľský účet\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: žiadne prepínače\n"
+
+#, fuzzy
+#~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
 #~| "Options:\n"
@@ -3021,9 +3454,6 @@
 #~ 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"

Modified: upstream/trunk/po/sq.po
===================================================================
--- upstream/trunk/po/sq.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/sq.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2004-11-20 03:28+0100\n"
 "Last-Translator: Elian Myftiu <pinguini AT fastwebnet DOT it>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit at lists.sourceforge.net>\n"
@@ -37,6 +37,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr ""
 
@@ -204,6 +212,10 @@
 "(%lu)\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "Kujdes: grup i panjohur %s\n"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr ""
@@ -287,6 +299,30 @@
 msgstr ""
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "Kujdes: grup i panjohur %s\n"
+
+#, fuzzy, c-format
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "Kujdes: grup i panjohur %s\n"
+
+#, fuzzy, c-format
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "Kujdes: grup i panjohur %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -314,30 +350,51 @@
 msgid "Unable to determine your tty name."
 msgstr ""
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr ""
-
 msgid "No"
 msgstr ""
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
 
 msgid "Enter the new value, or press ENTER for the default"
@@ -412,9 +469,9 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: PAM: %s\n"
+msgstr "Kujdes: grup i panjohur %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -437,10 +494,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr ""
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr ""
 
@@ -454,14 +507,29 @@
 
 #, c-format
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr ""
 
@@ -541,12 +609,18 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 
 msgid ""
@@ -586,28 +660,6 @@
 msgid "%s: error detected, changes ignored\n"
 msgstr ""
 
-#, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "Kujdes: grup i panjohur %s\n"
@@ -616,13 +668,7 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr ""
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
 
 msgid "Login Shell"
@@ -652,9 +698,23 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr ""
 
-msgid "Usage: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
 msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unexpected argument: %s\n"
+msgstr ""
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -682,7 +742,7 @@
 msgstr ""
 
 #, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
 msgstr ""
 
 msgid "Login       Failures Maximum Latest                   On\n"
@@ -697,30 +757,26 @@
 msgstr ""
 
 #, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr ""
 
 #, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr ""
 
 #, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr ""
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Unknown user or range: %s\n"
+msgstr "Kujdes: grup i panjohur %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "Kujdes: grup i panjohur %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -733,6 +789,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -851,8 +910,9 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-msgid "Usage: groupdel group\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "Kujdes: grup i panjohur %s\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -952,15 +1012,29 @@
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr ""
 
 msgid "invalid group file entry"
@@ -1029,12 +1103,6 @@
 msgid "%s: no changes\n"
 msgstr ""
 
-msgid "Usage: grpconv\n"
-msgstr ""
-
-msgid "Usage: grpunconv\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "Kujdes: grup i panjohur %s\n"
@@ -1049,19 +1117,16 @@
 msgstr ""
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1074,14 +1139,6 @@
 msgstr ""
 
 #, 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 ""
 
@@ -1144,6 +1201,10 @@
 msgid "Login incorrect"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Cannot find user (%s)\n"
+msgstr "Kujdes: grup i panjohur %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1258,28 +1319,57 @@
 msgstr ""
 
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
 
 msgid "Old password: "
@@ -1355,15 +1445,20 @@
 msgstr "Fjalëkalimi yt ka skaduar."
 
 #, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
 msgstr ""
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
+msgid "  -q, --quiet                   report errors only\n"
 msgstr ""
 
 #, c-format
@@ -1440,9 +1535,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr ""
 
-msgid "Usage: pwconv\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr ""
@@ -1451,9 +1543,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-msgid "Usage: pwunconv\n"
-msgstr ""
-
 msgid "Access to su to that account DENIED.\n"
 msgstr ""
 
@@ -1506,41 +1595,46 @@
 msgstr ""
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
 msgstr ""
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
+msgid "You are not authorized to su %s\n"
 msgstr ""
 
-#, c-format
-msgid "Unknown id: %s\n"
+msgid "(Enter your own password)"
 msgstr ""
 
 #, c-format
-msgid "You are not authorized to su %s\n"
+msgid "%s: Authentication failure\n"
 msgstr ""
 
-msgid "(Enter your own password)"
+#, c-format
+msgid "%s: You are not authorized to su at that time\n"
 msgstr ""
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
+msgid "No passwd entry for user '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: Authentication failure\n"
+msgid "%s: must be run from a terminal\n"
 msgstr ""
 
 #, c-format
-msgid "%s: You are not authorized to su at that time\n"
+msgid "%s: pam_start: error %d\n"
 msgstr ""
 
-msgid "No shell\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "Kujdes: grup i panjohur %s\n"
 
+#, fuzzy, c-format
+msgid "Cannot execute %s\n"
+msgstr "Kujdes: grup i panjohur %s\n"
+
 #, fuzzy
 msgid "No password file"
 msgstr "Fjalëkalimi yt ka skaduar."
@@ -1581,7 +1675,7 @@
 msgstr "Kujdes: grup i panjohur %s\n"
 
 #, fuzzy, c-format
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "Kujdes: grup i panjohur %s\n"
 
 #, c-format
@@ -1595,6 +1689,8 @@
 #, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1712,10 +1808,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -1773,20 +1865,30 @@
 msgstr ""
 
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr ""
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 
+#, c-format
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "Kujdes: grup i panjohur %s\n"
@@ -1816,10 +1918,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr ""
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr ""
 
@@ -1831,34 +1929,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr ""
 
-#, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -1874,8 +1997,12 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: no options\n"
+msgstr "Kujdes: grup i panjohur %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
 #, c-format
@@ -1883,10 +2010,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr ""
 
@@ -1949,9 +2072,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 

Modified: upstream/trunk/po/sv.po
===================================================================
--- upstream/trunk/po/sv.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/sv.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2011-04-04 15:37+0000\n"
 "Last-Translator: Daniel Nylander <yeager at ubuntu.com>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -39,6 +39,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "konfigurationsfel - okänd post \"%s\" (informera administratören)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Lösenord: "
 
@@ -212,6 +220,11 @@
 "%s: Ogiltig konfiguration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
 "(%lu)\n"
 
+#, fuzzy, c-format
+#| msgid "failed to allocate memory"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "misslyckades att allokera minne"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: Kan inte få unikt system GID (inga fler tillgängliga GID)\n"
@@ -296,6 +309,33 @@
 msgstr "Felaktigt lösenord för %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: misslyckades med att kasta rättigheterna (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: ogiltigt telefonnummer (hem): \"%s\"\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot create directory %s: %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: Kan inte skapa katalogen %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Failed to create tcb directory for %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: Misslyckades med att skapa tcb-katalog för %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -325,52 +365,82 @@
 msgid "Unable to determine your tty name."
 msgstr "Kunde inte fastställa ditt tty-namn."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) misslyckades\n"
-
 msgid "No"
 msgstr "Nej"
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"Användning: %s [flaggor] INLOGGNINGSNAMN\n"
+"\n"
+"Flaggor:\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "  -e, --expiredate UTGÅNGSDATUM utgångsdatum för det nya kontot\n"
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -p, --password LÖSENORD       ändra lösenordet till detta (krypterade)\n"
+"                                LÖSENORD\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+"  -r, --reset                   nollställd räknarna för inloggningsfel\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
+"                                krypteringsalgoritmerna\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
+"                                krypteringsalgoritmerna\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir HEM_KAT        hemkatalog för det nya kontot\n"
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Användning: chage [flaggor] [INLOGGNINGSNAMN]\n"
-"\n"
-"Flaggor:\n"
-"  -d, --lastday SISTA_DAG       ställ in datum för sista lösenordsändring "
-"till SISTA_DAG\n"
-"  -E, --expiredate UTGÅNGSDATUM ställ in kontots utgångsdatum till "
-"UTGÅNGSDATUM\n"
-"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
-"  -I, --inactive INAKTIV        ställ in lösenordet till inaktivt efter "
-"utgång\n"
-"                                till INAKTIV\n"
-"  -l, --list                    visa åldringsinformation om kontot\n"
-"  -m, --mindays MIN_DAGAR       ställ in minimum antal dagar innan "
-"lösenords-\n"
-"                                ändring till MIN_DAGAR\n"
-"  -M, --maxdays MAX_DAGAR       ställ in maximalt antal dagar innan "
-"lösenords-\n"
-"                                ändring till MAX_DAGAR\n"
-"  -W, --warndays VARN_DAGAR     ställ in dagar för utgångsvarning till "
-"VARN_DAGAR\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Ange det nya värdet eller tryck ENTER för standardvärdet"
@@ -443,9 +513,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -468,10 +539,6 @@
 msgstr "%s: skugglösenordsfilen finns inte\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: misslyckades med att kasta rättigheterna (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: användaren \"%s\" finns inte i %s\n"
 
@@ -483,19 +550,41 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: fel vid ändring av fält\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Användning: %s [-f fullt_namn] [-r rums_nr] [-w arb_tel]\n"
-"\t[-h hem_tel] [-o annat] [användare]\n"
+"Användning: %s [flaggor] INLOGGNINGSNAMN\n"
+"\n"
+"Flaggor:\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Användning: %s [-f fullt_namn] [-r rums_nr] [-w arb_tel] [-h hem_tel]\n"
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Helt namn"
 
@@ -575,22 +664,24 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 "Användning: %s [flaggor]\n"
 "\n"
 "Flaggor:\n"
-"  -c, --crypt-method            krypteringsmetoden (en av %s)\n"
-"  -e, --encrypted               angivna lösenord är krypterade\n"
-"  -h, --help                    visa detta hjälpmeddelande och avsluta.\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr "  -c, --crypt-method <METOD>    krypteringsmetoden (en av %s)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr "  -e, --encrypted               angivna lösenord är krypterade\n"
+
+msgid ""
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
+msgstr ""
 "  -m, --md5                     kryptera klartextlösenordet med\n"
 "                                MD5-algoritmen\n"
-"%s\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -632,34 +723,6 @@
 msgstr "%s: ett fel upptäcktes, ändringar ignorerade\n"
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Användning: %s [flaggor]\n"
-"\n"
-"Flaggor:\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method <METOD>    krypteringsmetoden (en av %s)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr "  -e, --encrypted               angivna lösenord är krypterade\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -m, --md5                     kryptera klartextlösenordet med\n"
-"                                MD5-algoritmen\n"
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: (rad %d, användare %s) lösenordet har inte ändrats\n"
 
@@ -667,20 +730,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: rad %d: användaren \"%s\" finns inte\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
-msgstr ""
-"Användning: chsh [flaggor] [KONTO]\n"
-"\n"
-"Flaggor:\n"
-"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
-"  -s, --shell SHELL             nytt inloggningsskal för användarkontot\n"
-"\n"
+#, fuzzy
+#| msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
+msgstr "  -s, --shell SKAL              inloggningsskal för det nya kontot\n"
 
 msgid "Login Shell"
 msgstr "Inloggningsskal"
@@ -709,9 +762,35 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Varning: %s är inte en körbar fil\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Användning: expiry {-f|-c}\n"
+#, fuzzy
+#| msgid ""
+#| "  -u, --user                    which user's tcb shadow file to edit\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
+"  -u, --user                    vilken användares tcb shadow-fil att "
+"redigera\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -m, --md5                     kryptera klartextlösenordet med\n"
+"                                MD5-algoritmen\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: flaggorna %s och %s står i konflikt\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: oväntat argument: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 "  -a, --all                     visa faillog-poster för alla användare\n"
@@ -742,8 +821,9 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
 msgstr "faillog: Misslyckades med att få posten för UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
@@ -757,31 +837,32 @@
 msgid " [%lds lock]"
 msgstr " [%lds låsta]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "faillog: Misslyckades med att ställa in låstid för UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "faillog: Misslyckades med att ställa in max för UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: Misslyckades med att ställa in låstid för UID %lu\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog: Okänd användare eller intervall: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "faillog: Kan inte öppna %s: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: Kan inte få storleken för %s: %s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: Kan inte få storleken för %s: %s\n"
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -797,6 +878,11 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete ANVÄNDARE        ta bort ANVÄNDARE från GRUPP\n"
 
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir HEM_KAT        hemkatalog för det nya kontot\n"
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         ta bort GRUPPens lösenord\n"
 
@@ -931,8 +1017,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: GID \"%lu\" finns redan\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Användning: groupdel grupp\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Kan inte fastställa ditt användarnamn.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1045,16 +1133,52 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: okänd användare %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Användning: %s [-r] [-s] [grupp [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Användning: %s [flaggor] [åtgärd]\n"
+"\n"
+"Flaggor:\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Användning: %s [-r] [-s] [grupp]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Användning: %s [flaggor] [åtgärd]\n"
+"\n"
+"Flaggor:\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
+"                                krypteringsalgoritmerna\n"
+
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -l, --list                    lista medlemmarna av gruppen\n"
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s och -r är inkompatibla\n"
 
 msgid "invalid group file entry"
@@ -1124,12 +1248,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: inga ändringar\n"
 
-msgid "Usage: grpconv\n"
-msgstr "Användning: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "Användning: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: kan inte ta bort %s\n"
@@ -1143,29 +1261,25 @@
 msgid " groups="
 msgstr " grupper="
 
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -a, --all                     visa faillog-poster för alla användare\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Användning: lastlog [flaggor]\n"
-"\n"
-"Flaggor:\n"
-"  -b, --before DAGAR    skriv endast ut lastlog information äldre än DAGAR\n"
-"  -h, --help            visa detta hjälpmeddelande och avsluta\n"
-"  -t, --time DAGAR      skriv endast ut lastlog information senare än DAGAR\n"
-"  -u, --user LOGIN      skriv ut lastlog information för användare\n"
-"                        angiven med LOGIN\n"
-"\n"
+"  -a, --all                     visa faillog-poster för alla användare\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1178,14 +1292,6 @@
 msgstr "**Aldrig varit inloggad**"
 
 #, 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 "lastlog: Kan inte få storleken för %s: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Användning: %s [-p] [namn]\n"
 
@@ -1254,6 +1360,11 @@
 msgid "Login incorrect"
 msgstr "Inloggning misslyckad"
 
+#, fuzzy, c-format
+#| msgid "%s: Cannot fork user shell\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: Kan inte grena användarskal\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1372,57 +1483,93 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: rad %d: kan inte uppdatera post\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+"  -a, --all                     visa faillog-poster för alla användare\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system                  skapa ett systemkonto\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system                  skapa ett systemkonto\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr "  -e, --encrypted               angivna lösenord är krypterade\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -p, --password LÖSENORD       ändra lösenordet till detta (krypterade)\n"
+"                                LÖSENORD\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr "  -u, --uid UID                 användare-ID för det nya kontot\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
+"                                krypteringsalgoritmerna\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr "  -q, --quiet                   tyst läge\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system                  skapa ett systemkonto\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr "  -u, --uid UID                 användare-ID för det nya kontot\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Användning: passwd [flaggor] [INLOGGNINGSNAMN]\n"
-"\n"
-"Flaggor:\n"
-"  -a, --all                     rapportera lösenordsstatus för alla konton\n"
-"  -d, --delete                  ta bort lösenordet för angivet konto\n"
-"  -e, --expire                  tvinga utgång för lösenordet för det angivna "
-"kontot\n"
-"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
-"  -k, --keep-tokens             ändra lösenord endast om utgånget\n"
-"  -i, --inactive INAKTIV        ställ in lösenordet som inaktivt efter "
-"utgång\n"
-"                                till INAKTIV\n"
-"  -l, --lock                    lås lösenordet för det angivna kontot\n"
-"  -n, --mindays MIN_DAGAR       ställ in minsta antal dagar innan "
-"lösenords-\n"
-"                                ändring till MIN_DAGAR\n"
-"  -q, --quiet                   tyst läge\n"
-"  -r, --repository FÖRRÅD       ändra lösenord i förrådet FÖRRÅD\n"
-"  -S, --status                  rapportera lösenordsstatus för det angivna "
-"kontot\n"
-"  -u, --unlock                  lås upp lösenordet för det angivna kontot\n"
-"  -w, --warndays VARN_DAGAR     ställ in dagar för utgångsvarning till "
-"VARN_DAGAR\n"
-"  -x, --maxdays MAX_DAGAR       ställ in maximalt antal dagar innan "
-"lösenords-\n"
-"                                ändring till MAX_DAGAR\n"
-"\n"
+"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
+"                                krypteringsalgoritmerna\n"
 
 msgid "Old password: "
 msgstr "Gammalt lösenord: "
@@ -1506,17 +1653,38 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: information om lösenordets utgång har ändrats.\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Användning: %s [-q] [-r] [passwd]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Användning: %s [flaggor] [åtgärd]\n"
+"\n"
+"Flaggor:\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Användning: %s [-q] [-r] [-s] [lösenord [skugga]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Användning: %s [flaggor] [åtgärd]\n"
+"\n"
+"Flaggor:\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s och -r är inkompatibla\n"
+#, fuzzy
+#| msgid "  -q, --quiet                   quiet mode\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr "  -q, --quiet                   tyst läge\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1593,9 +1761,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: kan inte sortera poster i %s\n"
 
-msgid "Usage: pwconv\n"
-msgstr "Användning: pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s: kan inte fungera med tcb aktiverat\n"
@@ -1604,9 +1769,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: misslyckades med att ändra rättigheter för %s till 0600\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "Användning: pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Tillgång med su till det kontot NEKAS.\n"
 
@@ -1671,18 +1833,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: måste köras från en terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ignorerad)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: fel %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Okänt id: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Du är inte bemyndigad att su %s\n"
 
@@ -1690,14 +1848,6 @@
 msgstr "(Ange ditt egna lösenord)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ignorerad)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: Autentiseringsfel\n"
 
@@ -1705,9 +1855,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s: Du är inte behörig att använda su för tillfället\n"
 
-msgid "No shell\n"
-msgstr "Inget skal\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Ingen lösenordspost för \"root\""
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: måste köras från en terminal\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: fel %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot remove the content of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: Kan inte ta bort innehållet i %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Kunde inte starta %s"
+
 msgid "No password file"
 msgstr "Ingen lösenordsfil"
 
@@ -1749,8 +1919,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: raden är för lång i %s: %s..."
 
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: byt namn: %s: %s"
 
 #, c-format
@@ -1761,9 +1932,15 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: för många grupper angivna (max %d).\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1904,10 +2081,6 @@
 msgstr "%s: -Z kräver en SELinux-aktiverad kärna\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: flaggorna %s och %s står i konflikt\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -1970,31 +2143,46 @@
 "%s: varning: hem-katalogen finns redan.\n"
 "Kopierar ingen fil från skel-katalogen till den.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -f, --force                   exit successfully if the group already "
+#| "exists,\n"
+#| "                                and cancel -g if the GID is already used\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Användning: userdel [flaggor] KONTO\n"
-"\n"
-"Flaggor:\n"
-"  -f, --force                   tvinga borttagning av filer, även om\n"
-"                                de inte ägs av användaren\n"
-"  -h, --help                    visa detta hjälpmeddelandet och avsluta\n"
-"  -r, --remove                  ta bort hemkatalog och postkö\n"
-"\n"
+"  -f, --force                   avsluta normalt om gruppen redan finns,\n"
+"                                och avbryt -g om GID redan används\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+"  -r, --reset                   nollställd räknarna för inloggningsfel\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: kan inte ta bort primära gruppen för användaren \"%s\"\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: gruppen %s är den primära gruppen för en annan användare och tas inte "
 "bort.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: %s hemkatalogen (%s) hittades inte\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: varning: kan inte ta bort %s: %s\n"
@@ -2024,10 +2212,6 @@
 msgstr "%s: användaren %s är en NIS-användare\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: användaren %s är för närvarande inloggad\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: %s hemkatalogen (%s) hittades inte\n"
 
@@ -2040,62 +2224,101 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: fel vid borttagning av katalogen %s\n"
 
-#, c-format
+#, fuzzy
+#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr "  -c, --comment KOMMENTAR       GECOS-fält för det nya kontot\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr "  -d, --home-dir HEM_KAT        hemkatalog för det nya kontot\n"
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr "  -e, --expiredate UTGÅNGSDATUM utgångsdatum för det nya kontot\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -p, --password LÖSENORD       ändra lösenordet till detta (krypterade)\n"
+"                                LÖSENORD\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr "  -g, --gid GID                 använd GID för den nya gruppen\n"
+
+#, fuzzy
+#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -M, --members ANVÄNDARE,...   ställ in listan för medlemmar av GRUPP\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr "  -u, --uid UID                 användare-ID för det nya kontot\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
+#| "the\n"
+#| "                                new account\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -b, --base-dir BASKATALOG     baskatalog för hemkatalogen för\n"
+"                                det nya kontot\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
+#| "GID\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -o, --non-unique              tillåt användning av dubletta (icke-unika) "
+"GID\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       use this encrypted password for the new "
+#| "group\n"
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Användning: usermod [flaggor] INLOGGNINGSNAMN\n"
-"\n"
-"Flaggor:\n"
-"  -c, --comment KOMMENTAR       nytt värde för GECOS-fältet\n"
-"  -d, --home HEMKAT             ny hemkatalog för användarkontot\n"
-"  -e, --expiredate UTGÅNGSDATUM ställ in kontots utgångsdatum\n"
-"                                till UTGÅNGSDATUM\n"
-"  -f, --inactive INAKTIV        ställ in lösenordet som inaktivt efter\n"
-"                                utgångsdatum till INAKTIV\n"
-"  -g, --gid GRUPP               tvinga användning av GRUPP som ny "
-"primärgrupp\n"
-"  -G, --groups GRUPPER         ny lista över ytterligare GRUPPER\n"
-"  -a, --append                  lägg till användaren till ytterligare "
-"GRUPPER\n"
-"                                som nämns av flaggan -G utan att ta bort\n"
-"                                honom/henne från andra grupper\n"
-"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
-"  -l, --login NYTT_NAMN         nytt värde för inloggningsnamnet\n"
-"  -L, --lock                    lås användarkontot\n"
-"  -m, --move-home               flytta innehållet i hemkatalogen till\n"
-"                                en ny plats (använd endast med -d)\n"
-"  -o, --non-unique              tillåt användning av dubbletta (icke-unika) "
-"UID\n"
-"  -p, --password LÖSENORD       använd krypterat lösenord som nytt lösenord\n"
-"  -s, --shell SKAL              nytt inloggningsskal för användarkontot\n"
-"  -u, --uid UID                 nytt UID för användarkontot\n"
-"  -U, --unlock                  lås upp användarkontot\n"
-"%s\n"
+"  -p, --password LÖSENORD       använd detta krypterade lösenord för nya "
+"gruppen\n"
 
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr "  -u, --uid UID                 användare-ID för det nya kontot\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr "  -u, --uid UID                 användare-ID för det nya kontot\n"
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2115,19 +2338,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: användaren \"%s\" finns redan i %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: kan inte öppna %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: inga flaggor angivna\n"
+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: shadow passwords required for -e and -f\n"
 msgstr "%s: skugglösenord krävs för -e och -f\n"
 
 #, c-format
-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' already exists\n"
 msgstr "%s: UID \"%lu\" finns redan\n"
 
@@ -2203,9 +2427,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -p, --passwd                  redigera lösenordsdatabas\n"
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -q, --quiet                   tyst läge\n"
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 "  -s, --shadow                  redigera shadow- eller gshadow-databasen\n"
@@ -2267,6 +2488,316 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: misslyckades med att hitta tcb-katalog för %s\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) misslyckades\n"
+
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Användning: chage [flaggor] [INLOGGNINGSNAMN]\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ "  -d, --lastday SISTA_DAG       ställ in datum för sista lösenordsändring "
+#~ "till SISTA_DAG\n"
+#~ "  -E, --expiredate UTGÅNGSDATUM ställ in kontots utgångsdatum till "
+#~ "UTGÅNGSDATUM\n"
+#~ "  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+#~ "  -I, --inactive INAKTIV        ställ in lösenordet till inaktivt efter "
+#~ "utgång\n"
+#~ "                                till INAKTIV\n"
+#~ "  -l, --list                    visa åldringsinformation om kontot\n"
+#~ "  -m, --mindays MIN_DAGAR       ställ in minimum antal dagar innan "
+#~ "lösenords-\n"
+#~ "                                ändring till MIN_DAGAR\n"
+#~ "  -M, --maxdays MAX_DAGAR       ställ in maximalt antal dagar innan "
+#~ "lösenords-\n"
+#~ "                                ändring till MAX_DAGAR\n"
+#~ "  -W, --warndays VARN_DAGAR     ställ in dagar för utgångsvarning till "
+#~ "VARN_DAGAR\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM autentisering misslyckades\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Användning: %s [-f fullt_namn] [-r rums_nr] [-w arb_tel]\n"
+#~ "\t[-h hem_tel] [-o annat] [användare]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Användning: %s [-f fullt_namn] [-r rums_nr] [-w arb_tel] [-h hem_tel]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Användning: %s [flaggor]\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ "  -c, --crypt-method            krypteringsmetoden (en av %s)\n"
+#~ "  -e, --encrypted               angivna lösenord är krypterade\n"
+#~ "  -h, --help                    visa detta hjälpmeddelande och avsluta.\n"
+#~ "  -m, --md5                     kryptera klartextlösenordet med\n"
+#~ "                                MD5-algoritmen\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Användning: chsh [flaggor] [KONTO]\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ "  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+#~ "  -s, --shell SHELL             nytt inloggningsskal för användarkontot\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Användning: expiry {-f|-c}\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "faillog: Kan inte öppna %s: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: Kan inte få storleken för %s: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Användning: groupdel grupp\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Användning: %s [-r] [-s] [grupp [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Användning: %s [-r] [-s] [grupp]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s och -r är inkompatibla\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Användning: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Användning: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Användning: lastlog [flaggor]\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ "  -b, --before DAGAR    skriv endast ut lastlog information äldre än "
+#~ "DAGAR\n"
+#~ "  -h, --help            visa detta hjälpmeddelande och avsluta\n"
+#~ "  -t, --time DAGAR      skriv endast ut lastlog information senare än "
+#~ "DAGAR\n"
+#~ "  -u, --user LOGIN      skriv ut lastlog information för användare\n"
+#~ "                        angiven med LOGIN\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Användning: passwd [flaggor] [INLOGGNINGSNAMN]\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ "  -a, --all                     rapportera lösenordsstatus för alla "
+#~ "konton\n"
+#~ "  -d, --delete                  ta bort lösenordet för angivet konto\n"
+#~ "  -e, --expire                  tvinga utgång för lösenordet för det "
+#~ "angivna kontot\n"
+#~ "  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+#~ "  -k, --keep-tokens             ändra lösenord endast om utgånget\n"
+#~ "  -i, --inactive INAKTIV        ställ in lösenordet som inaktivt efter "
+#~ "utgång\n"
+#~ "                                till INAKTIV\n"
+#~ "  -l, --lock                    lås lösenordet för det angivna kontot\n"
+#~ "  -n, --mindays MIN_DAGAR       ställ in minsta antal dagar innan "
+#~ "lösenords-\n"
+#~ "                                ändring till MIN_DAGAR\n"
+#~ "  -q, --quiet                   tyst läge\n"
+#~ "  -r, --repository FÖRRÅD       ändra lösenord i förrådet FÖRRÅD\n"
+#~ "  -S, --status                  rapportera lösenordsstatus för det "
+#~ "angivna kontot\n"
+#~ "  -u, --unlock                  lås upp lösenordet för det angivna "
+#~ "kontot\n"
+#~ "  -w, --warndays VARN_DAGAR     ställ in dagar för utgångsvarning till "
+#~ "VARN_DAGAR\n"
+#~ "  -x, --maxdays MAX_DAGAR       ställ in maximalt antal dagar innan "
+#~ "lösenords-\n"
+#~ "                                ändring till MAX_DAGAR\n"
+#~ "\n"
+
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Användning: %s [-q] [-r] [passwd]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Användning: %s [-q] [-r] [-s] [lösenord [skugga]]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Användning: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Användning: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Okänt id: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Inget skal\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Användning: userdel [flaggor] KONTO\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ "  -f, --force                   tvinga borttagning av filer, även om\n"
+#~ "                                de inte ägs av användaren\n"
+#~ "  -h, --help                    visa detta hjälpmeddelandet och avsluta\n"
+#~ "  -r, --remove                  ta bort hemkatalog och postkö\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: användaren %s är för närvarande inloggad\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Användning: usermod [flaggor] INLOGGNINGSNAMN\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ "  -c, --comment KOMMENTAR       nytt värde för GECOS-fältet\n"
+#~ "  -d, --home HEMKAT             ny hemkatalog för användarkontot\n"
+#~ "  -e, --expiredate UTGÅNGSDATUM ställ in kontots utgångsdatum\n"
+#~ "                                till UTGÅNGSDATUM\n"
+#~ "  -f, --inactive INAKTIV        ställ in lösenordet som inaktivt efter\n"
+#~ "                                utgångsdatum till INAKTIV\n"
+#~ "  -g, --gid GRUPP               tvinga användning av GRUPP som ny "
+#~ "primärgrupp\n"
+#~ "  -G, --groups GRUPPER         ny lista över ytterligare GRUPPER\n"
+#~ "  -a, --append                  lägg till användaren till ytterligare "
+#~ "GRUPPER\n"
+#~ "                                som nämns av flaggan -G utan att ta bort\n"
+#~ "                                honom/henne från andra grupper\n"
+#~ "  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+#~ "  -l, --login NYTT_NAMN         nytt värde för inloggningsnamnet\n"
+#~ "  -L, --lock                    lås användarkontot\n"
+#~ "  -m, --move-home               flytta innehållet i hemkatalogen till\n"
+#~ "                                en ny plats (använd endast med -d)\n"
+#~ "  -o, --non-unique              tillåt användning av dubbletta (icke-"
+#~ "unika) UID\n"
+#~ "  -p, --password LÖSENORD       använd krypterat lösenord som nytt "
+#~ "lösenord\n"
+#~ "  -s, --shell SKAL              nytt inloggningsskal för användarkontot\n"
+#~ "  -u, --uid UID                 nytt UID för användarkontot\n"
+#~ "  -U, --unlock                  lås upp användarkontot\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: inga flaggor angivna\n"
+
 #~ msgid "%s: %s is an invalid shell.\n"
 #~ msgstr "%s: %s är ett ogiltigt skal.\n"
 

Modified: upstream/trunk/po/tl.po
===================================================================
--- upstream/trunk/po/tl.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/tl.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2007-11-26 21:34+0100\n"
 "Last-Translator: Eric Pareja <xenos at upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl at banwa.upm.edu.ph>\n"
@@ -42,6 +42,14 @@
 "may mali sa pagsasaayos - hindi kilalang item '%s' (ipaalam sa "
 "tagapangasiwa)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Kontrasenyas: "
 
@@ -235,6 +243,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "bigo sa pagpalit ng may-ari ng mailbox"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: hindi makakuha ng kakaibang UID\n"
 
@@ -318,6 +331,33 @@
 msgstr "Maling kontrasenyas para kay %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: hindi tanggap na telepono sa bahay: '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: hindi malikha ang directory %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: hindi malikha ang directory %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -345,71 +385,55 @@
 msgid "Unable to determine your tty name."
 msgstr "Hindi malaman ang pangalan ng tty ninyo."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "bigo ang malloc(%d)\n"
-
 #, fuzzy
 #| msgid "No\n"
 msgid "No"
 msgstr "Hindi\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "Pag-gamit: %s [input]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Pag-gamit: chage [mga opsiyon] [LOGIN]\n"
-"\n"
-"Mga opsiyon:\n"
-"  -d, --lastday HULING_ARAW     itakda ang huling pagpalit ng kontrasenyas\n"
-"                                sa HULING_ARAW\n"
-"  -E, --expiredate EXPIRE_DATE  itakda ang pagkapaso ng account sa\n"
-"                                EXPIRE_DATE\n"
-"  -h, --help                    ipakita ang tulong at lumabas\n"
-"  -I, --inactive INACTIVE       itakda ang kontrasenyas na inaktibo matapos\n"
-"                                mapaso at gawin itong INACTIVE\n"
-"  -l, --list                    ipakita ang impormasyon tungkol sa account\n"
-"  -m, --mindays MIN_DAYS        itakda na hindi kukulang sa MIN_DAYS\n"
-"                                bago palitan ang kontrasenyas\n"
-"  -M, --maxdays MAX_DAYS        itakda na hindi hihigit sa MAX_DAYS\n"
-"                                bago palitan ang kontrasenyas\n"
-"  -W, --warndays WARN_DAYS      itakda ang babala tungkol sa pagpaso sa\n"
-"                                WARN_DAYS\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Ibigay ang bagong halaga, o pindutin ang ENTER para sa default"
@@ -482,9 +506,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -509,10 +534,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: wala ang talaksan ng shadow password\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: walang gumagamit na nagngangalang %s\n"
@@ -525,21 +546,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: error sa pagbabago ng mga field\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "Pag-gamit: %s [input]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Pag-gamit: %s [-f buong_pangalan] [-r bilang_ng_silid] [-w "
-"telepono_trabaho]\n"
-"\t[-h telepono_bahay] [-o iba] [gumagamit]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
 msgstr ""
-"Pag-gamit: %s [-f buong_pangalan] [-r bilang_ng_silid] [-w trabaho] [-h "
-"bahay]\n"
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Buong Pangalan"
 
@@ -617,25 +649,24 @@
 msgstr "%s: mahaba masyado ang mga field\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "Pag-gamit: %s [input]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Pag-gamit: chpasswd [mga opsiyon]\n"
-"\n"
-"Mga opsiyon:\n"
-"  -e, --encrypted   ang mga bigay na mga kontrasenyas ay naka-encrypt\n"
-"  -h, --help        ipakita itong payo na ito at lumabas\n"
-"  -m, --md5         gamitin ang MD5 encryption imbes na DES kapag ang\n"
-"                    mga ibinigay na mga kontrasenyas ay hindi naka-encrypt\n"
-"\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -677,29 +708,6 @@
 msgstr "%s: may error na naganap, di pinansin ang mga pagbabago\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Pag-gamit: %s [input]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: walang gumagamit na nagngangalang %s\n"
 
@@ -707,20 +715,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: walang gumagamit na nagngangalang %s\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Pag-gamit: chsh [mga opsiyon] [LOGIN]\n"
-"\n"
-"Mga opsiyon:\n"
-"  -h, --help                    ipakita ito at lumabas\n"
-"  -s, --shell SHELL             bagong login shell para sa gumagamit\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "Login Shell"
@@ -753,9 +749,24 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: babala: %s ay hindi pag-aari ni %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Pag-gamit: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: hindi inaasahang argumento: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -782,9 +793,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: hindi malikha ang directory %s\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Kabiguan Maximum Pinakahuli               On\n"
@@ -798,31 +810,30 @@
 msgid " [%lds lock]"
 msgstr " [%lds lock]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: hindi malikha ang directory %s\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: hindi malikha ang directory %s\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "Di kilalang Gumagamit: %s\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"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: hindi mapalitan ng pangalan ang directory %s sa %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -837,6 +848,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -964,8 +978,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Hindi makilala ang inyong pangalan.\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1069,16 +1085,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: di kilalang gumagamit %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Pag-gamit: %s [-r] [-s] [grupo [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Pag-gamit: %s [input]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Pag-gamit: %s [-r] [-s] [grupo]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "Pag-gamit: %s [input]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s at -r ay hindi maaring magkasabay\n"
 
 msgid "invalid group file entry"
@@ -1148,16 +1181,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: walang pagbabago\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "Pag-gamit: groupdel grupo\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "Pag-gamit: groupdel grupo\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1173,29 +1196,16 @@
 msgstr " mga grupo="
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Pag-gamit: lastlog [mga option]\n"
-"\n"
-"Mga option:\n"
-"  -b, --before ARAW     ipakita lamang ang lastlog record na mas-luma sa "
-"ARAW\n"
-"  -h, --help            ipakita ang tulong na ito at lumabas\n"
-"  -t, --time ARAW       ipakita lamang ang lastlog record na mas-bagos sa "
-"ARAW\n"
-"  -u, --user LOGIN      ipakita lamang ang gumagamit na LOGIN\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1208,14 +1218,6 @@
 msgstr "**Di pumasok kailanman**"
 
 #, 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"
 
@@ -1290,6 +1292,11 @@
 msgid "Login incorrect"
 msgstr "Maling pagpasok"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: linya %d: hindi mahanap ang gumagamit %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1412,54 +1419,59 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: linya %d: hindi ma-apdeyt ang ipinasok\n"
 
-#, fuzzy
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Pag-gamit: passwd [mga opsiyon] [login]\n"
-"\n"
-"Mga opsiyon:\n"
-"  -a, --all                     mag-ulat tungkol sa kalagayan ng\n"
-"                                kontrasenyas ng lahat\n"
-"  -d, --delete                  burahin ang kontrasenyas ng account\n"
-"  -e, --expire                  piliting mapaso ang kontrasenyas ng account\n"
-"  -h, --help                    ipakita ang tulong na ito at lumabas\n"
-"  -k, --keep-tokens             palitan ang kontrasenyas kung paso lamang\n"
-"  -i, --inactive INACTIVE       itakdang inaktibo matapos na mapaso\n"
-"                                sa INACTIVE\n"
-"  -l, --lock                    i-lock ang account\n"
-"  -n, --mindays MIN_ARAW\n"
-"  -q, --quiet                   tahimik lamang\n"
-"  -r, --repository REPOSITORYO  palitan ang kontrasenyas sa REPOSITORYO\n"
-"  -S, --status                  iulat ang kalagayan ng kontrasenyas ng\n"
-"                                ibinigay na account\n"
-"  -u, --unlock                  tanggalin ang pagkaaldaba ng account\n"
-"  -w, --warndays BABALA_ARAW    itakda ang pagbabala ng taning sa\n"
-"                                BABALA_ARAW\n"
-"  -x, --maxdays MAX_ARAW        itakda kung hanggang ilang araw bago\n"
-"                                magpalit ng kontrasenyas sa MAX_ARAW\n"
-"\n"
 
 msgid "Old password: "
 msgstr "Lumang kontrasenyas:"
@@ -1543,19 +1555,24 @@
 msgstr "Babala ng Paglipas ng Taning ng Password"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Pag-gamit: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "Pag-gamit: %s [input]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Pag-gamit: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s at -r ay hindi maaring magkasabay\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Pag-gamit: %s [input]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1638,11 +1655,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: hindi mabuksan ang talaksang %s\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "Pag-gamit: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1652,11 +1664,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "Pag-gamit: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Ang paggamit ng su sa account na iyan ay IPINAGBAWAL.\n"
 
@@ -1723,32 +1730,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: kinakailangang patakbuhin mula sa isang terminal\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Di pinansin)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: error %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Di kilalang id: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Hindi kayo awtorisadong gumamit ng su %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(Ibigay ang sarili niyong password.)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Di pinansin)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1759,9 +1754,29 @@
 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"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Walang ipinasok sa password para sa 'root'"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: kinakailangang patakbuhin mula sa isang terminal\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: error %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: hindi mapalitan ng pangalan ang directory %s sa %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Hindi mapatakbo ang %s"
+
 msgid "No password file"
 msgstr "Walang talaksang password"
 
@@ -1806,7 +1821,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: baguhin ang pangalan: %s"
 
 #, c-format
@@ -1821,6 +1836,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "Pag-gamit: %s [input]\n"
@@ -1938,10 +1955,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -2008,25 +2021,23 @@
 "Walang kokopyahing talaksan mula sa skel directory dito.\n"
 
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Paggamit: userdel [mga opsiyon] LOGIN\n"
-"\n"
-"Mga opsiyon:\n"
-"  -f, --force                   ipilit ang pagtanggal ng mga talaksan,\n"
-"                                kahit hindi pag-aari ng gumagamit\n"
-"  -h, --help                    ipakita ang patalastas na ito at lumabas\n"
-"  -r, --remove                  tanggalin ang home directory at mail spool\n"
-"\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: hindi mapalitan ang gumagamit '%s' sa NIS client.\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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"
@@ -2035,6 +2046,11 @@
 "gumagamit.\n"
 
 #, fuzzy, c-format
+#| msgid "%s: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: hindi tanggap na directory na tahanan '%s'\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: babala: hindi matanggal "
@@ -2066,10 +2082,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: ang gumagamit na %s ay nasa NIS\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: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2083,64 +2095,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: error sa pagtanggal ng directory %s\n"
 
-#, fuzzy, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Pag-gamit: usermod [mga opsiyon] LOGIN\n"
-"\n"
-"Mga opsiyon:\n"
-"  -a, --append GRUPO            idagdag ang gumagamit sa karagdagang GRUPO\n"
-"  -c, --comment KOMENTO         itakda ang GECOS field\n"
-"  -d, --home HOME_DIR           ang tahanang directory ng bagong account\n"
-"  -e, --expiredate EXPIRE_DATE  itakda ang petsa ng expiration ng account\n"
-"                                sa EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       itakda ang password na inaktibo matapos ng\n"
-"                                pagkapaso na INACTIVE\n"
-"  -g, --gid GRUPO               ipilit na gamitin ang GRUPO para sa bagong\n"
-"                                account\n"
-"  -G, --groups MGAGRUPO         idagdag ang mga grupo sa MGAGRUPO sa bagong\n"
-"                                account\n"
-"  -h, --help                    ipakita ang payo na ito\n"
-"  -l, --login LOGIN             bagong halaga ng pangalang panglogin\n"
-"  -L, --lock                    ialdaba ang account ng gumagamit\n"
-"  -m, --move-home               ilipat ang laman ng tahanang directory sa\n"
-"                                bagong lugar (gamitin lamang kasama ng -d)\n"
-"  -o, --non-unique              payagang lumikha ng user na may kaparehong "
-"UID\n"
-"  -p, --password PASSWOWRD      gumamit ng encrypted password para sa "
-"bagong\n"
-"                                account\n"
-"  -s, --shell SHELL             itakda ang login shell para sa bagong "
-"account\n"
-"  -u, --uid UID                 gamitin ang UID para sa bagong account\n"
-"  -U, --unlock                  tanggalin ang pagkaaldaba ng account ng\n"
-"                                gumagamit\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2157,18 +2164,19 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: mayroon nang gumagamit na %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: hindi mabuksan ang talaksang %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: walang binigay na mga flag\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: kailangan ang shadow password para sa -e at -f\n"
 
-#, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
@@ -2237,9 +2245,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2323,8 +2328,357 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: hindi tanggap na batayang directory '%s'\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "bigo ang malloc(%d)\n"
+
 #, fuzzy
 #~| msgid ""
+#~| "Usage: chage [options] [LOGIN]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+#~| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -l, --list                    show account aging information\n"
+#~| "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~| "password\n"
+#~| "                                change to MIN_DAYS\n"
+#~| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~| "password\n"
+#~| "                                change to MAX_DAYS\n"
+#~| "  -W, --warndays WARN_DAYS      set expiration warning days to "
+#~| "WARN_DAYS\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Pag-gamit: chage [mga opsiyon] [LOGIN]\n"
+#~ "\n"
+#~ "Mga opsiyon:\n"
+#~ "  -d, --lastday HULING_ARAW     itakda ang huling pagpalit ng "
+#~ "kontrasenyas\n"
+#~ "                                sa HULING_ARAW\n"
+#~ "  -E, --expiredate EXPIRE_DATE  itakda ang pagkapaso ng account sa\n"
+#~ "                                EXPIRE_DATE\n"
+#~ "  -h, --help                    ipakita ang tulong at lumabas\n"
+#~ "  -I, --inactive INACTIVE       itakda ang kontrasenyas na inaktibo "
+#~ "matapos\n"
+#~ "                                mapaso at gawin itong INACTIVE\n"
+#~ "  -l, --list                    ipakita ang impormasyon tungkol sa "
+#~ "account\n"
+#~ "  -m, --mindays MIN_DAYS        itakda na hindi kukulang sa MIN_DAYS\n"
+#~ "                                bago palitan ang kontrasenyas\n"
+#~ "  -M, --maxdays MAX_DAYS        itakda na hindi hihigit sa MAX_DAYS\n"
+#~ "                                bago palitan ang kontrasenyas\n"
+#~ "  -W, --warndays WARN_DAYS      itakda ang babala tungkol sa pagpaso sa\n"
+#~ "                                WARN_DAYS\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: bigo ang pagpapakilalang PAM\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Pag-gamit: %s [-f buong_pangalan] [-r bilang_ng_silid] [-w "
+#~ "telepono_trabaho]\n"
+#~ "\t[-h telepono_bahay] [-o iba] [gumagamit]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Pag-gamit: %s [-f buong_pangalan] [-r bilang_ng_silid] [-w trabaho] [-h "
+#~ "bahay]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Pag-gamit: chpasswd [mga opsiyon]\n"
+#~ "\n"
+#~ "Mga opsiyon:\n"
+#~ "  -e, --encrypted   ang mga bigay na mga kontrasenyas ay naka-encrypt\n"
+#~ "  -h, --help        ipakita itong payo na ito at lumabas\n"
+#~ "  -m, --md5         gamitin ang MD5 encryption imbes na DES kapag ang\n"
+#~ "                    mga ibinigay na mga kontrasenyas ay hindi naka-"
+#~ "encrypt\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Pag-gamit: chsh [mga opsiyon] [LOGIN]\n"
+#~ "\n"
+#~ "Mga opsiyon:\n"
+#~ "  -h, --help                    ipakita ito at lumabas\n"
+#~ "  -s, --shell SHELL             bagong login shell para sa gumagamit\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Pag-gamit: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: hindi mabuksan ang talaksang %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Pag-gamit: groupdel grupo\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Pag-gamit: %s [-r] [-s] [grupo [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Pag-gamit: %s [-r] [-s] [grupo]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s at -r ay hindi maaring magkasabay\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Pag-gamit: groupdel grupo\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Pag-gamit: groupdel grupo\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Pag-gamit: lastlog [mga option]\n"
+#~ "\n"
+#~ "Mga option:\n"
+#~ "  -b, --before ARAW     ipakita lamang ang lastlog record na mas-luma sa "
+#~ "ARAW\n"
+#~ "  -h, --help            ipakita ang tulong na ito at lumabas\n"
+#~ "  -t, --time ARAW       ipakita lamang ang lastlog record na mas-bagos sa "
+#~ "ARAW\n"
+#~ "  -u, --user LOGIN      ipakita lamang ang gumagamit na LOGIN\n"
+#~ "\n"
+
+#, 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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Pag-gamit: passwd [mga opsiyon] [login]\n"
+#~ "\n"
+#~ "Mga opsiyon:\n"
+#~ "  -a, --all                     mag-ulat tungkol sa kalagayan ng\n"
+#~ "                                kontrasenyas ng lahat\n"
+#~ "  -d, --delete                  burahin ang kontrasenyas ng account\n"
+#~ "  -e, --expire                  piliting mapaso ang kontrasenyas ng "
+#~ "account\n"
+#~ "  -h, --help                    ipakita ang tulong na ito at lumabas\n"
+#~ "  -k, --keep-tokens             palitan ang kontrasenyas kung paso "
+#~ "lamang\n"
+#~ "  -i, --inactive INACTIVE       itakdang inaktibo matapos na mapaso\n"
+#~ "                                sa INACTIVE\n"
+#~ "  -l, --lock                    i-lock ang account\n"
+#~ "  -n, --mindays MIN_ARAW\n"
+#~ "  -q, --quiet                   tahimik lamang\n"
+#~ "  -r, --repository REPOSITORYO  palitan ang kontrasenyas sa REPOSITORYO\n"
+#~ "  -S, --status                  iulat ang kalagayan ng kontrasenyas ng\n"
+#~ "                                ibinigay na account\n"
+#~ "  -u, --unlock                  tanggalin ang pagkaaldaba ng account\n"
+#~ "  -w, --warndays BABALA_ARAW    itakda ang pagbabala ng taning sa\n"
+#~ "                                BABALA_ARAW\n"
+#~ "  -x, --maxdays MAX_ARAW        itakda kung hanggang ilang araw bago\n"
+#~ "                                magpalit ng kontrasenyas sa MAX_ARAW\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Pag-gamit: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Pag-gamit: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Pag-gamit: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Pag-gamit: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Di kilalang id: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Walang shell\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Paggamit: userdel [mga opsiyon] LOGIN\n"
+#~ "\n"
+#~ "Mga opsiyon:\n"
+#~ "  -f, --force                   ipilit ang pagtanggal ng mga talaksan,\n"
+#~ "                                kahit hindi pag-aari ng gumagamit\n"
+#~ "  -h, --help                    ipakita ang patalastas na ito at lumabas\n"
+#~ "  -r, --remove                  tanggalin ang home directory at mail "
+#~ "spool\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: gumagamit na si %s ay kasalukuyang nakapasok\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Pag-gamit: usermod [mga opsiyon] LOGIN\n"
+#~ "\n"
+#~ "Mga opsiyon:\n"
+#~ "  -a, --append GRUPO            idagdag ang gumagamit sa karagdagang "
+#~ "GRUPO\n"
+#~ "  -c, --comment KOMENTO         itakda ang GECOS field\n"
+#~ "  -d, --home HOME_DIR           ang tahanang directory ng bagong account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  itakda ang petsa ng expiration ng "
+#~ "account\n"
+#~ "                                sa EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       itakda ang password na inaktibo matapos "
+#~ "ng\n"
+#~ "                                pagkapaso na INACTIVE\n"
+#~ "  -g, --gid GRUPO               ipilit na gamitin ang GRUPO para sa "
+#~ "bagong\n"
+#~ "                                account\n"
+#~ "  -G, --groups MGAGRUPO         idagdag ang mga grupo sa MGAGRUPO sa "
+#~ "bagong\n"
+#~ "                                account\n"
+#~ "  -h, --help                    ipakita ang payo na ito\n"
+#~ "  -l, --login LOGIN             bagong halaga ng pangalang panglogin\n"
+#~ "  -L, --lock                    ialdaba ang account ng gumagamit\n"
+#~ "  -m, --move-home               ilipat ang laman ng tahanang directory "
+#~ "sa\n"
+#~ "                                bagong lugar (gamitin lamang kasama ng -"
+#~ "d)\n"
+#~ "  -o, --non-unique              payagang lumikha ng user na may "
+#~ "kaparehong UID\n"
+#~ "  -p, --password PASSWOWRD      gumamit ng encrypted password para sa "
+#~ "bagong\n"
+#~ "                                account\n"
+#~ "  -s, --shell SHELL             itakda ang login shell para sa bagong "
+#~ "account\n"
+#~ "  -u, --uid UID                 gamitin ang UID para sa bagong account\n"
+#~ "  -U, --unlock                  tanggalin ang pagkaaldaba ng account ng\n"
+#~ "                                gumagamit\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: walang binigay na mga flag\n"
+
+#, fuzzy
+#~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
 #~| "Options:\n"
@@ -2868,9 +3222,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/tr.po
===================================================================
--- upstream/trunk/po/tr.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/tr.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\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"
@@ -42,6 +42,14 @@
 msgstr ""
 "yapılandırma hatası - bilinmeyen öğe '%s' (sistem yöneticisine bildirin)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Parola: "
 
@@ -227,6 +235,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "postakutusu sahibi değiştirilmedi"
+
+#, fuzzy, c-format
 #| msgid "Can't get unique UID (no more available UIDs)\n"
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "Benzersiz bir UID alınamıyor (mevcut UID yok)\n"
@@ -314,6 +327,33 @@
 msgstr "`%s' için yanlış parola\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: geçersiz ev telefonu: '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: %s dizini yaratılamıyor\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: %s dizini yaratılamıyor\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -343,78 +383,73 @@
 msgid "Unable to determine your tty name."
 msgstr "Kullanıcı isminiz belirlenemedi."
 
-#, 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"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "Kullanım: %s [girdi]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Kullanım: chage [seçenekler] kullanıcı\n"
-"\n"
-"Seçenekler:\n"
-"  -d, --lastday SON_GÜN(LAST_DAY)\n"
-"                                son şifre değiştirme gününü SON_GÜN olarak\n"
-"                                belirle\n"
-"  -E, --expiredate GEÇERLİLİK_TARİHİ(EXPIRE_DATE)\n"
-"                                hesap geçerlilik tarihini GEÇERLİLİK_TARİHİ\n"
-"                                olarak belirle\n"
-"  -h, --help                    bu yardım mesajını görüntüle ve çık\n"
-"  -I, --inactive INACTIVE       kullanım süresi dolduktan sonra şifreyi\n"
-"                                INACTIVE olarak belirle\n"
-"  -l, --list                    hesap aging bilgisini göster\n"
-"  -m, --mindays ASGARİ_GÜN(MIN_DAYS)\n"
-"                                şifre değişikliği için asgari gün\n"
-"                                sayısını ASGARİ_GÜN olarak belirle\n"
-"  -M, --maxdays AZAMİ_GÜN(MAX_DAYS)\n"
-"                                şifre değişikliği için azami gün\n"
-"                                sayısını AZAMİ_GÜN olarak belirle\n"
-"  -W, --warndays UYARI_GÜN_SAYISI (WARN_DAYS)\n"
-"                                zorunlu şifre değişikliği uyarısından "
-"önceki\n"
-"                                gün sayısını UYARI_GÜN_SAYISI olarak "
-"belirle\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Yeni değeri girin, veya varsayılan değer için ENTER'a basın"
@@ -487,9 +522,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -515,10 +551,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: shadow parola dosyası açılamadı\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: user `%s' does not exist\n"
 msgid "%s: user '%s' does not exist in %s\n"
@@ -532,18 +564,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: alanları değiştirirken hata oluştu\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "Kullanım: %s [girdi]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Kullanım: %s [-f tam_isim] [-r oda_no] [-w iş_tel]\n"
-"\t[-h ev_tel] [-o diğer] [kullanıcı]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
-msgstr "Kullanım: %s [-f tam_isim] [-r oda_no] [-w iş_tel] [-h ev_tel]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Tam İsim"
 
@@ -621,27 +667,31 @@
 msgid "%s: fields too long\n"
 msgstr "%s: alanlar çok uzun\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "Kullanım: %s [girdi]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Kullanım: %s [seçenekler]\n"
-"\n"
-"Seçenekler:\n"
-"  -c, --crypt-method           kripto metodu (bunlardan biri: %s)\n"
-"  -e, --encrypted              verilen parolalar kriptolu\n"
-"  -h, --help                   bu yardım dosyasını göster ve çık\n"
-"  -m, --md5                    şifresiz metin parolayı MD5 algoritması ile "
-"şifrele\n"
-"%s\n"
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -686,35 +736,6 @@
 msgstr "%s: hata algılandı, değişiklikler görmezden gelindi\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Kullanım: %s [girdi]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
-"                                SHA yuvarlamaları sayısı\n"
-
-#, fuzzy, c-format
 #| msgid "%s: user `%s' does not exist\n"
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: kullanıcı `%s' mevcut değil\n"
@@ -724,20 +745,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: kullanıcı `%s' mevcut değil\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Kullanım: chsh [seçenekler] [KULLANICI]\n"
-"\n"
-"Seçenekler:\n"
-"  -h, --help                    bu yardım mesajını göster ve çık\n"
-"  -s, --shell KABUK(SHELL)      kullanıcı hesabı için yeni kabuk\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "Oturum Kabuğu"
@@ -770,9 +779,30 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: uyarı: %s %s kullanıcısına ait değil\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Kullanım: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: %s ve %s seçenekleri çakışıyor\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: bilinmeyen argüman: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -799,9 +829,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: %s dizini yaratılamıyor\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Oturum Aç       Failures Maximum Latest                   Açık\n"
@@ -815,32 +846,31 @@
 msgid " [%lds lock]"
 msgstr " [%lds kilitli]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: %s dizini yaratılamıyor\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: %s dizini yaratılamıyor\n"
 
 #, fuzzy, c-format
 #| msgid "Unknown user or range: %s\n"
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "Bilinmeyen kullanıcı veya aralık: %s\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"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: %s dizini %s olarak yeniden adlandırılamıyor\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -855,6 +885,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -997,8 +1030,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "Üye zaten mevcut\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Kullanım: groupdel grup_adı\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Kullanıcı isminiz belirlenemedi.\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1113,16 +1148,39 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: bilinmeyen kullanıcı %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Kullanım: %s [-r] [-s] [grup [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Kullanım: %s [girdi]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Kullanım: %s [-r] [-s] [grup]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "Kullanım: %s [girdi]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s ve -r uyumsuz\n"
 
 msgid "invalid group file entry"
@@ -1192,16 +1250,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: değişiklik yok\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "Kullanım: groupdel grup_adı\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "Kullanım: groupdel grup_adı\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1217,30 +1265,16 @@
 msgstr ".gruplar="
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Kullanım: lastlog [seçenekler]\n"
-"\n"
-"Seçenekler:\n"
-"  -b, --before GÜN_SAYISI(DAYS) GÜN_SAYISI kadar günden daha eski olan\n"
-"                                lastlog kayıtlarını gösterir\n"
-"  -h, --help                    display this help message and exit\n"
-"  -t, --time GÜN_SAYISI(DAYS)   GÜN_SAYISI kadar günden daha yeni olan\n"
-"                                lastlog kayıtlarını gösterir\n"
-"  -u, --user KULLANICI          KULLANICI ile belirtilen kullanıcının\n"
-"                                kastlog yıtlarını gösterir\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1253,14 +1287,6 @@
 msgstr "**Hiç giriş yapmadı**"
 
 #, 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"
 
@@ -1335,6 +1361,11 @@
 msgid "Login incorrect"
 msgstr "Giriş geçersiz"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: satır %d: kullanıcı %s bulunamadı\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1461,86 +1492,77 @@
 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"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Kullanım: passwd [seçenekler] [KULLANICI]\n"
-"\n"
-"Seçenekler:\n"
-"  -a, --all                 tüm hesaplardaki şifre durumunu bildirir\n"
-"  -d, --delete              ismi belirtilen hesabın şifresini siler\n"
-"  -e, --expire              ismi belirtilen hesaba ait şifrenin süresini "
-"bitirir\n"
-"  -h, --help                bu yardım dosyasını göster ve çık\n"
-"  -k, --keep-tokens         sadece süresi dolduğunda şifreleri değiştirir\n"
-"  -i, --inactive INACTIVE   şifre süresi dolduktan sonra, şifreyi INACTIVE\n"
-"                            olarak ayarlar\n"
-"  -l, --lock                ismi belirtilen hesabı kilitler\n"
-"  -n, --mindays ASGARİ_GÜN_SAYISI(MIN_DAYS)\n"
-"                            şifre değiştirilmeden önceki en az gün sayısını\n"
-"                            ASGARİ_GÜN_SAYISI olarak ayarlar\n"
-"  -q, --quiet               sessiz kip\n"
-"  -r, --repository DEPO(REPOSITORY)\n"
-"                            DEPO deposundaki şifreyi değiştirir\n"
-"  -S, --status              ismi belirtilen hesaptaki şifre durumunu "
-"bildirir\n"
-"  -u, --unlock              ismi belirtilen hesabın kilidini açar\n"
-"  -w, --warndays UYARI_GÜN_SAYISI(WARN_DAYS)\n"
-"                            şifre dolum uyarı gününü UYARI_GÜN_SAYISI\n"
-"                            olarak ayarlar\n"
-"  -x, --maxdays AZAMİ_GÜN_SAYISI(MAX_DAYS)\n"
-"                            şifre değiştirilmeden önceki en fazla gün\n"
-"                            sayısını AZAMİ_GÜN_SAYISI olarak ayarlar\n"
-"\n"
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
 
 msgid "Old password: "
 msgstr "Eski parola: "
@@ -1630,19 +1652,24 @@
 msgstr "Parola Kullanım Süresi Bitti Uyarısı"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Kullanım: %s [-q] [-r] [-s] [parola [gölge]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "Kullanım: %s [girdi]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Kullanım: %s [-q] [-r] [-s] [parola [gölge]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s ve -r uyumsuz\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Kullanım: %s [girdi]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1725,11 +1752,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: %s dosyası açılamıyor\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "Kullanım: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1739,11 +1761,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "Kullanım: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Bu hesap için 'su'ya erişim ENGELLENDİ.\n"
 
@@ -1809,32 +1826,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: bir terminalden çalıştırılmalı\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Dikkate alınmadı)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: hata %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Bilinmeyen id: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "su %s için yetkili değilsiniz\n"
 
 msgid "(Enter your own password)"
 msgstr "(Kendi parolanızı girin)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Dikkate alınmadı)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1845,9 +1850,29 @@
 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"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "'root' için parola kaydı yok"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: bir terminalden çalıştırılmalı\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: hata %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: %s dizini %s olarak yeniden adlandırılamıyor\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "%s çalıştırılamıyor"
+
 msgid "No password file"
 msgstr "Parola dosyası yok"
 
@@ -1892,7 +1917,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: yeniden adlandırma: %s"
 
 #, c-format
@@ -1907,6 +1932,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "Kullanım: %s [girdi]\n"
@@ -2060,10 +2087,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: %s ve %s seçenekleri çakışıyor\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -2129,25 +2152,33 @@
 "%s: uyarı: Ev dizini zaten mevcut.\n"
 "Temel dizinden hiçbir dosya kopyalanmıyor.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Kullanım: userdel [seçenekler] KULLANICI\n"
-"\n"
-"Seçenekler:\n"
-"  -f, --force                   dosyalar kullanıcıya ait değilse bile sil\n"
-"  -h, --help                    bu yardım mesajını göster ve çık\n"
-"  -r, --remove                  ev dizinini ve mesaj arşivini sil\n"
-"\n"
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid ""
+"%s: group %s not removed because it is not 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: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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"
@@ -2155,6 +2186,11 @@
 "%s: Başka bir kullanıcı için birincil grub olan %s grubu kaldırılamıyor.\n"
 
 #, fuzzy, c-format
+#| msgid "%s: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: geçersiz ev dizini '%s'\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: uyarı: silinemiyor "
@@ -2186,10 +2222,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: kullanıcı %s bir NIS kullanıcısı\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: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2203,92 +2235,83 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: %s dizini silinirken hata oluştu\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: usermod [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --comment COMMENT         new value of the GECOS field\n"
-#| "  -d, --home HOME_DIR           new home directory for the user account\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP as new primary group\n"
-#| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-#| "  -a, --append                  append the user to the supplemental "
-#| "GROUPS\n"
-#| "                                mentioned by the -G option without "
-#| "removing\n"
-#| "                                him/her from other groups\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --login NEW_LOGIN         new value of the login name\n"
-#| "  -L, --lock                    lock the user account\n"
-#| "  -m, --move-home               move contents of the home directory to "
-#| "the\n"
-#| "                                new location (use only with -d)\n"
-#| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new "
-#| "password\n"
-#| "  -s, --shell SHELL             new login shell for the user account\n"
-#| "  -u, --uid UID                 new UID for the user account\n"
-#| "  -U, --unlock                  unlock the user account\n"
-#| "\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Kullanım: usermod [seçenekler] LOGIN\n"
-"\n"
-"Seçenekler:\n"
-"  -c, --comment YORUM           GECOS alanının yeni değeri\n"
-"  -d, --home EV_DIZINI          kullanıcı hesabı için yeni oturum açma "
-"dizini\n"
-"  -e, --expiredate GEÇERLİLİK_TARİHİ hesap dolum süresini GEÇERLİLİK_TARİHİ\n"
-"                                (EXPIRE_DATE) olarak ayarla\n"
-"  -f, --inactive PASIF          şifre süresi dolduktan sonra şifreyi\n"
-"                                PASIF olarak ayarla\n"
-"  -g, --gid GRUP                birincil grup olarak GRUP kullanımını zorla\n"
-"  -G, --groups GRUPLAR          ilave grupları yeni listesi\n"
-"  -a, --append                  kullanıcıyı ilave grupların sonuna ekle\n"
-"                                -G seçeneğinde bahsedildiği gibi\n"
-"                                diğer gruplardan çıkarmadan\n"
-"  -h, --help                    bu yardım dosyasını göster ve çık\n"
-"  -l, --login YENI_LOGIN        oturum açma ismi için yeni değer\n"
-"  -L, --lock                    kullanıcı hesabını kilitle\n"
-"  -m, --move-home               Ev dizininin içeriğini yeni bir\n"
-"                                dizine kopyalar(sadece -d ile kullanılır)\n"
-"  -o, --non-unique              aynı UID yi kullanmaya izin verir\n"
-"  -p, --password PAROLA         yeni parolalar için şifrelenmiş parola "
-"kullan\n"
-"  -s, --shell SHELL             kullanıcı hesabı için yeni oturum açma "
-"kabuğu\n"
-"  -u, --uid UID                 kullanıcı hesabı için yeni UID\n"
-"  -U, --unlock                  kullanıcı hesabı kilidini aç\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2312,18 +2335,19 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: kullanıcı %s mevcut\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: %s dosyası açılamıyor\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: herhangi bir bayrak verilmedi\n"
+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: shadow passwords required for -e and -f\n"
 msgstr "%s: -e ve -f için gölge parolalar gerekli\n"
 
-#, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr "%s: -L, -p, ve -U bayrakları özel bayraklardır\n"
-
 #, fuzzy, c-format
 #| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
@@ -2398,9 +2422,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2484,8 +2505,418 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: geçersiz ana dizin '%s'\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) başarısız oldu\n"
+
 #, fuzzy
 #~| msgid ""
+#~| "Usage: chage [options] [LOGIN]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+#~| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -l, --list                    show account aging information\n"
+#~| "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~| "password\n"
+#~| "                                change to MIN_DAYS\n"
+#~| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~| "password\n"
+#~| "                                change to MAX_DAYS\n"
+#~| "  -W, --warndays WARN_DAYS      set expiration warning days to "
+#~| "WARN_DAYS\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Kullanım: chage [seçenekler] kullanıcı\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ "  -d, --lastday SON_GÜN(LAST_DAY)\n"
+#~ "                                son şifre değiştirme gününü SON_GÜN "
+#~ "olarak\n"
+#~ "                                belirle\n"
+#~ "  -E, --expiredate GEÇERLİLİK_TARİHİ(EXPIRE_DATE)\n"
+#~ "                                hesap geçerlilik tarihini "
+#~ "GEÇERLİLİK_TARİHİ\n"
+#~ "                                olarak belirle\n"
+#~ "  -h, --help                    bu yardım mesajını görüntüle ve çık\n"
+#~ "  -I, --inactive INACTIVE       kullanım süresi dolduktan sonra şifreyi\n"
+#~ "                                INACTIVE olarak belirle\n"
+#~ "  -l, --list                    hesap aging bilgisini göster\n"
+#~ "  -m, --mindays ASGARİ_GÜN(MIN_DAYS)\n"
+#~ "                                şifre değişikliği için asgari gün\n"
+#~ "                                sayısını ASGARİ_GÜN olarak belirle\n"
+#~ "  -M, --maxdays AZAMİ_GÜN(MAX_DAYS)\n"
+#~ "                                şifre değişikliği için azami gün\n"
+#~ "                                sayısını AZAMİ_GÜN olarak belirle\n"
+#~ "  -W, --warndays UYARI_GÜN_SAYISI (WARN_DAYS)\n"
+#~ "                                zorunlu şifre değişikliği uyarısından "
+#~ "önceki\n"
+#~ "                                gün sayısını UYARI_GÜN_SAYISI olarak "
+#~ "belirle\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM yetkilendirmesi başarısız oldu\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Kullanım: %s [-f tam_isim] [-r oda_no] [-w iş_tel]\n"
+#~ "\t[-h ev_tel] [-o diğer] [kullanıcı]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr "Kullanım: %s [-f tam_isim] [-r oda_no] [-w iş_tel] [-h ev_tel]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Kullanım: %s [seçenekler]\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ "  -c, --crypt-method           kripto metodu (bunlardan biri: %s)\n"
+#~ "  -e, --encrypted              verilen parolalar kriptolu\n"
+#~ "  -h, --help                   bu yardım dosyasını göster ve çık\n"
+#~ "  -m, --md5                    şifresiz metin parolayı MD5 algoritması "
+#~ "ile şifrele\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Kullanım: chsh [seçenekler] [KULLANICI]\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ "  -h, --help                    bu yardım mesajını göster ve çık\n"
+#~ "  -s, --shell KABUK(SHELL)      kullanıcı hesabı için yeni kabuk\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Kullanım: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: %s dosyası açılamıyor\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Kullanım: groupdel grup_adı\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Kullanım: %s [-r] [-s] [grup [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Kullanım: %s [-r] [-s] [grup]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s ve -r uyumsuz\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Kullanım: groupdel grup_adı\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Kullanım: groupdel grup_adı\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Kullanım: lastlog [seçenekler]\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ "  -b, --before GÜN_SAYISI(DAYS) GÜN_SAYISI kadar günden daha eski olan\n"
+#~ "                                lastlog kayıtlarını gösterir\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -t, --time GÜN_SAYISI(DAYS)   GÜN_SAYISI kadar günden daha yeni olan\n"
+#~ "                                lastlog kayıtlarını gösterir\n"
+#~ "  -u, --user KULLANICI          KULLANICI ile belirtilen kullanıcının\n"
+#~ "                                kastlog yıtlarını gösterir\n"
+#~ "\n"
+
+#, 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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Kullanım: passwd [seçenekler] [KULLANICI]\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ "  -a, --all                 tüm hesaplardaki şifre durumunu bildirir\n"
+#~ "  -d, --delete              ismi belirtilen hesabın şifresini siler\n"
+#~ "  -e, --expire              ismi belirtilen hesaba ait şifrenin süresini "
+#~ "bitirir\n"
+#~ "  -h, --help                bu yardım dosyasını göster ve çık\n"
+#~ "  -k, --keep-tokens         sadece süresi dolduğunda şifreleri "
+#~ "değiştirir\n"
+#~ "  -i, --inactive INACTIVE   şifre süresi dolduktan sonra, şifreyi "
+#~ "INACTIVE\n"
+#~ "                            olarak ayarlar\n"
+#~ "  -l, --lock                ismi belirtilen hesabı kilitler\n"
+#~ "  -n, --mindays ASGARİ_GÜN_SAYISI(MIN_DAYS)\n"
+#~ "                            şifre değiştirilmeden önceki en az gün "
+#~ "sayısını\n"
+#~ "                            ASGARİ_GÜN_SAYISI olarak ayarlar\n"
+#~ "  -q, --quiet               sessiz kip\n"
+#~ "  -r, --repository DEPO(REPOSITORY)\n"
+#~ "                            DEPO deposundaki şifreyi değiştirir\n"
+#~ "  -S, --status              ismi belirtilen hesaptaki şifre durumunu "
+#~ "bildirir\n"
+#~ "  -u, --unlock              ismi belirtilen hesabın kilidini açar\n"
+#~ "  -w, --warndays UYARI_GÜN_SAYISI(WARN_DAYS)\n"
+#~ "                            şifre dolum uyarı gününü UYARI_GÜN_SAYISI\n"
+#~ "                            olarak ayarlar\n"
+#~ "  -x, --maxdays AZAMİ_GÜN_SAYISI(MAX_DAYS)\n"
+#~ "                            şifre değiştirilmeden önceki en fazla gün\n"
+#~ "                            sayısını AZAMİ_GÜN_SAYISI olarak ayarlar\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Kullanım: %s [-q] [-r] [-s] [parola [gölge]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Kullanım: %s [-q] [-r] [-s] [parola [gölge]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Kullanım: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Kullanım: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Bilinmeyen id: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Kabuk yok\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Kullanım: userdel [seçenekler] KULLANICI\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ "  -f, --force                   dosyalar kullanıcıya ait değilse bile "
+#~ "sil\n"
+#~ "  -h, --help                    bu yardım mesajını göster ve çık\n"
+#~ "  -r, --remove                  ev dizinini ve mesaj arşivini sil\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: kullanıcı %s şu an oturumda\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Usage: usermod [options] LOGIN\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~| "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~| "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~| "  -a, --append                  append the user to the supplemental "
+#~| "GROUPS\n"
+#~| "                                mentioned by the -G option without "
+#~| "removing\n"
+#~| "                                him/her from other groups\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~| "  -L, --lock                    lock the user account\n"
+#~| "  -m, --move-home               move contents of the home directory to "
+#~| "the\n"
+#~| "                                new location (use only with -d)\n"
+#~| "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~| "  -p, --password PASSWORD       use encrypted password for the new "
+#~| "password\n"
+#~| "  -s, --shell SHELL             new login shell for the user account\n"
+#~| "  -u, --uid UID                 new UID for the user account\n"
+#~| "  -U, --unlock                  unlock the user account\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Kullanım: usermod [seçenekler] LOGIN\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ "  -c, --comment YORUM           GECOS alanının yeni değeri\n"
+#~ "  -d, --home EV_DIZINI          kullanıcı hesabı için yeni oturum açma "
+#~ "dizini\n"
+#~ "  -e, --expiredate GEÇERLİLİK_TARİHİ hesap dolum süresini "
+#~ "GEÇERLİLİK_TARİHİ\n"
+#~ "                                (EXPIRE_DATE) olarak ayarla\n"
+#~ "  -f, --inactive PASIF          şifre süresi dolduktan sonra şifreyi\n"
+#~ "                                PASIF olarak ayarla\n"
+#~ "  -g, --gid GRUP                birincil grup olarak GRUP kullanımını "
+#~ "zorla\n"
+#~ "  -G, --groups GRUPLAR          ilave grupları yeni listesi\n"
+#~ "  -a, --append                  kullanıcıyı ilave grupların sonuna ekle\n"
+#~ "                                -G seçeneğinde bahsedildiği gibi\n"
+#~ "                                diğer gruplardan çıkarmadan\n"
+#~ "  -h, --help                    bu yardım dosyasını göster ve çık\n"
+#~ "  -l, --login YENI_LOGIN        oturum açma ismi için yeni değer\n"
+#~ "  -L, --lock                    kullanıcı hesabını kilitle\n"
+#~ "  -m, --move-home               Ev dizininin içeriğini yeni bir\n"
+#~ "                                dizine kopyalar(sadece -d ile "
+#~ "kullanılır)\n"
+#~ "  -o, --non-unique              aynı UID yi kullanmaya izin verir\n"
+#~ "  -p, --password PAROLA         yeni parolalar için şifrelenmiş parola "
+#~ "kullan\n"
+#~ "  -s, --shell SHELL             kullanıcı hesabı için yeni oturum açma "
+#~ "kabuğu\n"
+#~ "  -u, --uid UID                 kullanıcı hesabı için yeni UID\n"
+#~ "  -U, --unlock                  kullanıcı hesabı kilidini aç\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: herhangi bir bayrak verilmedi\n"
+
+#, fuzzy
+#~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
 #~| "Options:\n"
@@ -3095,9 +3526,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/uk.po
===================================================================
--- upstream/trunk/po/uk.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/uk.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2007-11-26 22:52+0100\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen at univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -41,6 +41,14 @@
 msgstr ""
 "помилка у конфігурації - невідома позиція '%s' (повідомте адміністратора)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Пароль: "
 
@@ -229,6 +237,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "не можу змінити власника поштової скриньки"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s: не можу отримати унікальний UID\n"
 
@@ -312,6 +325,33 @@
 msgstr "Невірний пароль для %s.\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: не вдалося скинути привілеї (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: невірний домашній телефон: \"%s\"\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: не можу створити теку %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: не можу створити теку %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -339,74 +379,55 @@
 msgid "Unable to determine your tty name."
 msgstr "Неможливо визначити назву вашого термінала."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) не виконано\n"
-
 #, fuzzy
 #| msgid "No\n"
 msgid "No"
 msgstr "Ні\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: chage [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
-#| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -l, --list                    show account aging information\n"
-#| "  -m, --mindays MIN_DAYS        set minimum number of days before "
-#| "password\n"
-#| "                                change to MIN_DAYS\n"
-#| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
-#| "password\n"
-#| "                                change to MAX_DAYS\n"
-#| "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-#| "\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "Використання: %s [вхідні_данні]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Використання: chage [параметри] [LOGIN]\n"
-"\n"
-"Параметри:\n"
-"  -d, --lastday ОСТАННІЙ_ДЕНЬ   встановити дату останньої зміни пароля в\n"
-"                                ОСТАННІЙ_ДЕНЬ\n"
-"  -E, --expiredate ДАТА_ПРОСТР  встановити дату прострочення облікового\n"
-"                                запису у ДАТА_ПРОСТР\n"
-"  -h, --help                    вивести це довідкове повідомлення та вийти\n"
-"  -I, --inactive НЕАКТИВНИЙ     зробити пароль неактивним після "
-"прострочення\n"
-"  -l, --list                    показати інформацію про вік облікового "
-"запису\n"
-"  -m, --mindays МІН_ДНІВ        встановити найменшу кількість днів перед "
-"зміною\n"
-"                                пароля у МІН_ДНІВ\n"
-"  -M, --maxdays МАКС_ДНІВ       встановити максимальну кількість днів перед\n"
-"                                зміною пароля у МАКС_ДНІВ\n"
-"  -W, --warndays ПОПЕРЕДЖЕНЯЯ   встоновити кількість днів перед\n"
-"                                попередженням про прострочення у "
-"ПОПЕРЕДЖЕННЯ\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Введіть нове значення або натисніть ENTER для значення за замовчанням"
@@ -479,9 +500,10 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: Не можу визначити Ваше ім'я користувача.\n"
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr "%s: PAM автентифікація не пройшла\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -506,10 +528,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: не можу відкрити файл прихованих паролів\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: не вдалося скинути привілеї (%s)\n"
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: користувач %s не існує\n"
@@ -522,20 +540,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: помилка зміни полів\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "Використання: %s [вхідні_данні]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Використання: %s [-f повне_ім'я] [-r номер_кімнати] [-w робочій_телефон]\n"
-"\t[-h домашній_телефон] [-o інше] [користувач]\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
 msgstr ""
-"Використання: %s [-f повне_ім'я] [-r номер_кімнати]\n"
-"\t[-w робочій_телефон] [-h домашній_телефон]\n"
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Повне ім'я"
 
@@ -613,25 +643,24 @@
 msgstr "%s: поля занадто довгі\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "Використання: %s [вхідні_данні]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Використання: chpasswd [опції]\n"
-"\n"
-"Опції:\n"
-"  -e, --encrypted               вказаний пароль зашифровано\n"
-"  -h, --help                    показати цю допомогу та вийти\n"
-"  -m, --md5                     використовувати MD5 шифрування замість DES,\n"
-"                                якщо вказані паролі не зашифровано\n"
-"\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -673,29 +702,6 @@
 msgstr "%s: виявлено помилку, зміни ігноруються\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Використання: %s [вхідні_данні]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: користувач %s не існує\n"
 
@@ -703,20 +709,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: користувач %s не існує\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Використання: chsh [параметри] [LOGIN]\n"
-"\n"
-"Параметри:\n"
-"  -h, --help                    вивести це довідкове повідомлення та вийти\n"
-"  -s, --shell ОБОЛОНКА          нова вхідна оболонка для облікового запису\n"
-"\n"
 
 msgid "Login Shell"
 msgstr "Логін-оболонка"
@@ -749,9 +743,24 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: застереження: %s не належить %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "Використання: expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: неочікуваний аргумент: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -778,9 +787,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s: не можу створити теку %s\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Логін       Помилок Максимум Останнє                 На\n"
@@ -794,31 +804,30 @@
 msgid " [%lds lock]"
 msgstr " [%lds блоковано]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s: не можу створити теку %s\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s: не вдалося скинути привілеї (%s)\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s: не можу створити теку %s\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "Невідомий користувач: %s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "%s: не можу відкрити файл %s\n"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s: не можу перейменувати теку з %s на %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -833,6 +842,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -960,8 +972,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "Член вже існує\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "Використання: groupdel група\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: Не можу визначити Ваше ім'я користувача.\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1065,16 +1079,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: невідомий користувач %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Використання: %s [-r] [-s] [група [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Використання: %s [вхідні_данні]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Використання: %s [-r] [-s] [група]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "Використання: %s [вхідні_данні]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s та -r несумісні\n"
 
 msgid "invalid group file entry"
@@ -1144,16 +1175,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: без змін\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "Використання: groupdel група\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "Використання: groupdel група\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1169,28 +1190,16 @@
 msgstr " групи="
 
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -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 ДНІ              друкувати лише записи старіші за ДНІ\n"
-"  -h, --help                    вивести допомогу та вийти\n"
-"  -t, --time ДНІВ               вивести лише записи свіжіші за ДНІВ\n"
-"  -u, --user ЛОГІН              вивести записи останніх входів для\n"
-"                                користувача з ЛОГІНом\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1203,14 +1212,6 @@
 msgstr "**Ніколи не входив**"
 
 #, 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"
 
@@ -1284,6 +1285,11 @@
 msgid "Login incorrect"
 msgstr "Невірний логін"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: рядок %d: не можу знайти користувача %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1406,80 +1412,59 @@
 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"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -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"
-"  -d, --delete                  видалити пароль для вказаного запису\n"
-"  -e, --expire                  прострочити пароль для вказаного запису\n"
-"  -h, --help                    вивести це довідкове повідомлення та вийти\n"
-"  -k, --keep-tokens             змінити пароль лише якщо його прострочено\n"
-"  -i, --inactive INACTIVE       зробити пароль неактивним після "
-"прострочення\n"
-"  -l, --lock                    заблокувати вказаний запис\n"
-"  -n, --mindays МІН_ДНІВ        встановити найменшу кількість днів перед\n"
-"                                зміною пароля у МІН_ДНІВ\n"
-"  -q, --quiet                   тихий режим\n"
-"  -r, --repository СХОВИЩЕ      змінити пароль у вказаному СХОВИЩІ\n"
-"  -S, --status                  звітувати про стан пароля вказаного запису\n"
-"  -u, --unlock                  розблокувати вказаний запис\n"
-"  -w, --warndays ПОП_ДНІВ       встановити кількість днів перед\n"
-"                                повідомленням про прострочення у ПОП_ДНІВ\n"
-"  -x, --maxdays МАКС_ДНІВ       встановити максимальну кількість днів перед\n"
-"                                зміною пароля у МАКС_ДНІВ\n"
-"\n"
 
 msgid "Old password: "
 msgstr "Старий пароль: "
@@ -1563,19 +1548,24 @@
 msgstr "Застереження про прострочення пароля"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "Використання: %s [-q] [-r] [-s] [пароль [shadow]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "Використання: %s [вхідні_данні]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Використання: %s [-q] [-r] [-s] [пароль [shadow]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: -s та -r несумісні\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "Використання: %s [вхідні_данні]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1658,11 +1648,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: не можу відкрити файл %s\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "Використання: id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1672,11 +1657,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "Використання: id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Доступ цього користувача до su ЗАБОРОНЕНО.\n"
 
@@ -1741,32 +1721,20 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: повинно бути запущено з терміналу\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Ігнорую)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: помилка %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Невідомий id: %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Ви не авторизовані для su %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(Введіть ваш пароль)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Ігнорую)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1777,9 +1745,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "Ви не авторизовані для su %s\n"
 
-msgid "No shell\n"
-msgstr "Немає оболонки\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Бракує запису у базі паролів для 'root'"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: повинно бути запущено з терміналу\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: помилка %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s: не можу перейменувати теку з %s на %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Не можу виконати %s"
+
 msgid "No password file"
 msgstr "Немає файлу паролів"
 
@@ -1824,7 +1812,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: перейменування: %s"
 
 #, c-format
@@ -1839,6 +1827,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "Використання: %s [вхідні_данні]\n"
@@ -1956,10 +1946,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -2026,25 +2012,23 @@
 "Жоден файл з директорії кістяка не копіюється.\n"
 
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Використання: userdel [параметри] ЛОГІН\n"
-"\n"
-"Параметри:\n"
-"  -f, --force                   видаляти файли навіть якщо вказаний\n"
-"                                користувач не є їх володарем\n"
-"  -h, --help                    вивести це довідкове повідомлення та вийти\n"
-"  -r, --remove                  видалити домашню теку і поштову скриньку\n"
-"\n"
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: неможливо змінити користувача \"%s\" у клієнті NIS.\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, 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"
@@ -2052,6 +2036,11 @@
 "%s: не можу видалити групу %s яка є первинною групою іншого користувача.\n"
 
 #, fuzzy, c-format
+#| msgid "%s: invalid home directory '%s'\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: невірна домашня тека \"%s\"\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: застереження: не можу видалити "
@@ -2083,10 +2072,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: користувач %s є користувачем NIS\n"
 
-#, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: користувач %s на даний момент у системі\n"
-
 #, fuzzy, c-format
 #| msgid "%s: invalid home directory '%s'\n"
 msgid "%s: %s home directory (%s) not found\n"
@@ -2100,65 +2085,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: помилка видалення теки %s\n"
 
-#, fuzzy, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Використання: useradd [параметри] ЛОГІН\n"
-"\n"
-"Параметри:\n"
-"  -a, --append                  додати користувача до додаткових ГРУП\n"
-"                                (використовувати тільки з -G)\n"
-"  -c, --comment КОМЕНТАР        встановити поле GECOS для нового запису\n"
-"                                користувача\n"
-"  -d, --home ДОМ_ТЕКА           домашня тека для нового запису користувача\n"
-"  -e, --expiredate ДАТА_ПРОСТР  встановити дату прострочення запису\n"
-"  -f, --inactive НЕАКТИВНИЙ     зробити пароль неактивним після "
-"прострочення\n"
-"  -g, --gid ГРУПА               використовувати ГРУПУ для нового запису\n"
-"                                користувача\n"
-"  -G, --groups ГРУПИ            список додаткових груп для нового запису\n"
-"                                користувача\n"
-"  -h, --help                    показати це довідкове повідомлення і вийти\n"
-"  -l, --login НОВИЙ_ЛОГІН       нове значення реєстраційного імені\n"
-"  -L, --lock                    заблокувати обліковий запис користувача\n"
-"  -m, --move-home               перенести вміст домашньої теки в нове місце\n"
-"                                (використовувати тільки з -d)\n"
-"  -o, --non-unique              дозволювати створювати користувачів з UID "
-"що\n"
-"                                повторюються\n"
-"  -p, --password ПАРОЛЬ         використовувати зашифрований пароль для\n"
-"                                нового запису користувача\n"
-"  -s, --shell ОБОЛОНКА          вхідна оболонка для нового запису "
-"користувача\n"
-"  -u, --uid UID                 використовувати UID для нового запису\n"
-"                                користувача\n"
-"  -U, --unlock                  розблокувати обліковий запис користувача\n"
-"\n"
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2175,18 +2154,19 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: користувач %s існує\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s: не можу відкрити файл %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: не подано прапорців\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: приховані паролі потрібні для -e і -f\n"
 
-#, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Member already exists\n"
 msgid "%s: UID '%lu' already exists\n"
@@ -2254,9 +2234,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2340,8 +2317,387 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: невірна базова тека \"%s\"\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) не виконано\n"
+
 #, fuzzy
 #~| msgid ""
+#~| "Usage: chage [options] [LOGIN]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+#~| "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -l, --list                    show account aging information\n"
+#~| "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~| "password\n"
+#~| "                                change to MIN_DAYS\n"
+#~| "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~| "password\n"
+#~| "                                change to MAX_DAYS\n"
+#~| "  -W, --warndays WARN_DAYS      set expiration warning days to "
+#~| "WARN_DAYS\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Використання: chage [параметри] [LOGIN]\n"
+#~ "\n"
+#~ "Параметри:\n"
+#~ "  -d, --lastday ОСТАННІЙ_ДЕНЬ   встановити дату останньої зміни пароля в\n"
+#~ "                                ОСТАННІЙ_ДЕНЬ\n"
+#~ "  -E, --expiredate ДАТА_ПРОСТР  встановити дату прострочення облікового\n"
+#~ "                                запису у ДАТА_ПРОСТР\n"
+#~ "  -h, --help                    вивести це довідкове повідомлення та "
+#~ "вийти\n"
+#~ "  -I, --inactive НЕАКТИВНИЙ     зробити пароль неактивним після "
+#~ "прострочення\n"
+#~ "  -l, --list                    показати інформацію про вік облікового "
+#~ "запису\n"
+#~ "  -m, --mindays МІН_ДНІВ        встановити найменшу кількість днів перед "
+#~ "зміною\n"
+#~ "                                пароля у МІН_ДНІВ\n"
+#~ "  -M, --maxdays МАКС_ДНІВ       встановити максимальну кількість днів "
+#~ "перед\n"
+#~ "                                зміною пароля у МАКС_ДНІВ\n"
+#~ "  -W, --warndays ПОПЕРЕДЖЕНЯЯ   встоновити кількість днів перед\n"
+#~ "                                попередженням про прострочення у "
+#~ "ПОПЕРЕДЖЕННЯ\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: PAM автентифікація не пройшла\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Використання: %s [-f повне_ім'я] [-r номер_кімнати] [-w робочій_телефон]\n"
+#~ "\t[-h домашній_телефон] [-o інше] [користувач]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Використання: %s [-f повне_ім'я] [-r номер_кімнати]\n"
+#~ "\t[-w робочій_телефон] [-h домашній_телефон]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Використання: chpasswd [опції]\n"
+#~ "\n"
+#~ "Опції:\n"
+#~ "  -e, --encrypted               вказаний пароль зашифровано\n"
+#~ "  -h, --help                    показати цю допомогу та вийти\n"
+#~ "  -m, --md5                     використовувати MD5 шифрування замість "
+#~ "DES,\n"
+#~ "                                якщо вказані паролі не зашифровано\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Використання: chsh [параметри] [LOGIN]\n"
+#~ "\n"
+#~ "Параметри:\n"
+#~ "  -h, --help                    вивести це довідкове повідомлення та "
+#~ "вийти\n"
+#~ "  -s, --shell ОБОЛОНКА          нова вхідна оболонка для облікового "
+#~ "запису\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "Використання: expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s: не можу відкрити файл %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "Використання: groupdel група\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Використання: %s [-r] [-s] [група [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Використання: %s [-r] [-s] [група]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s: -s та -r несумісні\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Використання: groupdel група\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Використання: groupdel група\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Використання: lastlog [параметри]\n"
+#~ "\n"
+#~ "Параметри:\n"
+#~ "  -b, --before ДНІ              друкувати лише записи старіші за ДНІ\n"
+#~ "  -h, --help                    вивести допомогу та вийти\n"
+#~ "  -t, --time ДНІВ               вивести лише записи свіжіші за ДНІВ\n"
+#~ "  -u, --user ЛОГІН              вивести записи останніх входів для\n"
+#~ "                                користувача з ЛОГІНом\n"
+#~ "\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\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"
+#~ "  -d, --delete                  видалити пароль для вказаного запису\n"
+#~ "  -e, --expire                  прострочити пароль для вказаного запису\n"
+#~ "  -h, --help                    вивести це довідкове повідомлення та "
+#~ "вийти\n"
+#~ "  -k, --keep-tokens             змінити пароль лише якщо його "
+#~ "прострочено\n"
+#~ "  -i, --inactive INACTIVE       зробити пароль неактивним після "
+#~ "прострочення\n"
+#~ "  -l, --lock                    заблокувати вказаний запис\n"
+#~ "  -n, --mindays МІН_ДНІВ        встановити найменшу кількість днів перед\n"
+#~ "                                зміною пароля у МІН_ДНІВ\n"
+#~ "  -q, --quiet                   тихий режим\n"
+#~ "  -r, --repository СХОВИЩЕ      змінити пароль у вказаному СХОВИЩІ\n"
+#~ "  -S, --status                  звітувати про стан пароля вказаного "
+#~ "запису\n"
+#~ "  -u, --unlock                  розблокувати вказаний запис\n"
+#~ "  -w, --warndays ПОП_ДНІВ       встановити кількість днів перед\n"
+#~ "                                повідомленням про прострочення у "
+#~ "ПОП_ДНІВ\n"
+#~ "  -x, --maxdays МАКС_ДНІВ       встановити максимальну кількість днів "
+#~ "перед\n"
+#~ "                                зміною пароля у МАКС_ДНІВ\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "Використання: %s [-q] [-r] [-s] [пароль [shadow]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "Використання: %s [-q] [-r] [-s] [пароль [shadow]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Використання: id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Використання: id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Невідомий id: %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Немає оболонки\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Використання: userdel [параметри] ЛОГІН\n"
+#~ "\n"
+#~ "Параметри:\n"
+#~ "  -f, --force                   видаляти файли навіть якщо вказаний\n"
+#~ "                                користувач не є їх володарем\n"
+#~ "  -h, --help                    вивести це довідкове повідомлення та "
+#~ "вийти\n"
+#~ "  -r, --remove                  видалити домашню теку і поштову скриньку\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: користувач %s на даний момент у системі\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Використання: useradd [параметри] ЛОГІН\n"
+#~ "\n"
+#~ "Параметри:\n"
+#~ "  -a, --append                  додати користувача до додаткових ГРУП\n"
+#~ "                                (використовувати тільки з -G)\n"
+#~ "  -c, --comment КОМЕНТАР        встановити поле GECOS для нового запису\n"
+#~ "                                користувача\n"
+#~ "  -d, --home ДОМ_ТЕКА           домашня тека для нового запису "
+#~ "користувача\n"
+#~ "  -e, --expiredate ДАТА_ПРОСТР  встановити дату прострочення запису\n"
+#~ "  -f, --inactive НЕАКТИВНИЙ     зробити пароль неактивним після "
+#~ "прострочення\n"
+#~ "  -g, --gid ГРУПА               використовувати ГРУПУ для нового запису\n"
+#~ "                                користувача\n"
+#~ "  -G, --groups ГРУПИ            список додаткових груп для нового запису\n"
+#~ "                                користувача\n"
+#~ "  -h, --help                    показати це довідкове повідомлення і "
+#~ "вийти\n"
+#~ "  -l, --login НОВИЙ_ЛОГІН       нове значення реєстраційного імені\n"
+#~ "  -L, --lock                    заблокувати обліковий запис користувача\n"
+#~ "  -m, --move-home               перенести вміст домашньої теки в нове "
+#~ "місце\n"
+#~ "                                (використовувати тільки з -d)\n"
+#~ "  -o, --non-unique              дозволювати створювати користувачів з UID "
+#~ "що\n"
+#~ "                                повторюються\n"
+#~ "  -p, --password ПАРОЛЬ         використовувати зашифрований пароль для\n"
+#~ "                                нового запису користувача\n"
+#~ "  -s, --shell ОБОЛОНКА          вхідна оболонка для нового запису "
+#~ "користувача\n"
+#~ "  -u, --uid UID                 використовувати UID для нового запису\n"
+#~ "                                користувача\n"
+#~ "  -U, --unlock                  розблокувати обліковий запис користувача\n"
+#~ "\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: не подано прапорців\n"
+
+#, fuzzy
+#~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"
 #~| "Options:\n"
@@ -2879,9 +3235,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/vi.po
===================================================================
--- upstream/trunk/po/vi.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/vi.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2009-09-29 22:09+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -39,6 +39,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "lỗi cấu hình: không rõ mục « %s » (báo quản trị).\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "Mật khẩu : "
 
@@ -223,6 +231,11 @@
 "(%lu)\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "lỗi thay đổi chủ hộp thư"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr ""
@@ -307,6 +320,33 @@
 msgstr "Mật khẩu không đúng cho %s .\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: lỗi bỏ quyền truy cập (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s: số điện thoại ở nhà không hợp lệ: « %s »\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s: không thể tạo thư mục %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s: không thể tạo thư mục %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -336,51 +376,83 @@
 msgid "Unable to determine your tty name."
 msgstr "Không thể quyết định tên TTY của bạn."
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) (cấp phát bộ nhớ) bị lỗi\n"
-
 msgid "No"
 msgstr "Không"
 
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"Sử dụng: %s [tuỳ_chọn ...]\n"
+"\n"
+"Tuỳ chọn:\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "  -e, --expiredate NGÀY      ngày hết hạn sử dụng tài khoản mới\n"
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr "  -h, --help                    hiển thị trợ giúp này, sau đó thoát\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+"  -p, --password MẬT_KHẨU       thay đổi mật khẩu thành MẬT_KHẨU (đã mật mã) "
+"này\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+"  -r, --reset                   đặt lại các bộ đếm lần không đăng nhập được\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir THƯ_MỤC       thư mục chính của tài khoản mới\n"
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"Sử dụng: chage [tuỳ_chọn ...] [ĐĂNG_NHẬP]\n"
-"\n"
-"Tuỳ chọn:\n"
-"  -d, --lastday NGÀY_CUỐI        đặt ngày thay đổi mật khẩu cuối cùng thành "
-"ngày này\n"
-"  -E, --expiredate NGÀY_HẾT_HẠN    đặt ngày hết hạn dùng tài khoản thành "
-"ngày này\n"
-"  -h, --help                    \t\thiển thị trợ giúp này, sau đó thoát\n"
-"  -I, --inactive INACTIVE       \tđặt mật khẩu không còn hoạt động lại sau "
-"khi hết hạn dùng,\n"
-"\t\t\t\t\t\tthành INACTIVE\n"
-"  -l, --list                    \t\t\thiển thị thông tin về khoảng thời gian "
-"sử dụng tài khoản\n"
-"  -m, --mindays SỐ        \t\tđặt thành số này số tối thiểu các ngày trước "
-"khi thay đổi mật khẩu\n"
-"  -M, --maxdays SỐ\t\t\tđặt thành số này số tối đa các ngày trước khi thay "
-"đổi mật khẩu\n"
-"  -W, --warndays SỐ      \t\tđặt thành số này số các ngày gây ra cảnh báo về "
-"hết hạn dùng\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Nhập giá trị mới, hoạc bấm phím Enter đặt chọn giá trị mặc định"
@@ -453,9 +525,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -478,10 +551,6 @@
 msgstr "%s: không có tập tin mật khẩu bóng\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: lỗi bỏ quyền truy cập (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s: người dùng « %s » không tồn tại trong %s\n"
 
@@ -493,20 +562,40 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: gặp lỗi khi thay đổi trường\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Sử dụng: %s [-f họ_tên] [-r số_phòng] [-w điện_thoại_chỗ_làm]\n"
-"\t[-h điện_thoại_ở_nhà] [-o khác] [người_dùng]\n"
+"Sử dụng: %s [tuỳ_chọn ...]\n"
+"\n"
+"Tuỳ chọn:\n"
 
-#, c-format
-msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"Sử dụng: %s [-f họ_tên] [-r số_phòng] [-w điện_thoại_chỗ_làm]\n"
-"\t[-h điện_thoại_ở_nhà]\n"
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr "  -h, --help                    hiển thị trợ giúp này, sau đó thoát\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "Họ tên"
 
@@ -586,21 +675,26 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"Sử dụng: %s [tuỳ_chọn ...]\n"
+"\n"
+"Tuỳ chọn:\n"
+
+#, fuzzy, c-format
+#| msgid "  -c, --crypt-method            the crypt method (one of %s)\n"
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr "  -c, --crypt-method            phương pháp mật mã (một của %s)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+"  -e, --encrypted               các mật khẩu đã cung cấp cũng được mật mã\n"
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"Sử dụng: %s [tùy_chọn]\n"
-"\n"
-"Tùy chọn:\n"
-"  -c, --crypt-method            phương pháp mã hoá (một của %s)\n"
-"  -e, --encrypted               mã hoá mỗi mật khẩu đã cung cấp\n"
-"  -h, --help                    hiển thị trợ giúp này rồi thoát\n"
-"  -m, --md5           mã hoá mật khẩu nhập thô, dùng thuật toán MD5\n"
-"%s\n"
+"  -m, --md5                     mật mã hoá mật khẩu chữ thô, dùng thuật toán "
+"MD5\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -641,35 +735,6 @@
 msgstr "%s: gặp lỗi nên bỏ qua các thay đổi\n"
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Sử dụng: %s [tuỳ_chọn ...]\n"
-"\n"
-"Tuỳ chọn:\n"
-
-#, fuzzy, c-format
-#| msgid "  -c, --crypt-method            the crypt method (one of %s)\n"
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method            phương pháp mật mã (một của %s)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-"  -e, --encrypted               các mật khẩu đã cung cấp cũng được mật mã\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr "  -h, --help                    hiển thị trợ giúp này, sau đó thoát\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-"  -m, --md5                     mật mã hoá mật khẩu chữ thô, dùng thuật toán "
-"MD5\n"
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s: (dòng %d, người dùng %s) mật khẩu chưa thay đổi\n"
 
@@ -677,21 +742,11 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: dòng %d: người dùng « %s » không tồn tại\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+#, fuzzy
+#| msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"Sử dụng: chsh [tùy_chọn...] [ĐĂNG_NHẬP]\n"
-"\n"
-"Tùy chọn:\n"
-"  -h, --help                    hiện _trợ giúp_ này rồi thoát\n"
-"  -s, --shell TRÌNH_BAO        trình bao đăng nhập mới\n"
-"\t\t\t\t\t\tcho tài khoản người dùng\n"
-"\n"
+"  -s, --shell TRÌNH_BAO             trình bao đăng nhập của tài khoản mới\n"
 
 msgid "Login Shell"
 msgstr "Trình bao Đăng nhập"
@@ -723,11 +778,32 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: cảnh báo : %s không phải được %s sở hữu\n"
 
-msgid "Usage: expiry {-f|-c}\n"
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr "  -u, --uid UID                 mã số người dùng của tài khoản mới\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
 msgstr ""
-"Sử dụng: expiry {-f|-c}\n"
-"[expiry: mãn hạn]\n"
+"  -m, --md5                     mật mã hoá mật khẩu chữ thô, dùng thuật toán "
+"MD5\n"
 
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s: hai tùy chọn %s và %s xung đột với nhau\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog: đối số bất thường: %s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 "  -a, --all                     hiển thị các mục ghi faillog cho mọi người "
@@ -772,9 +848,10 @@
 "\t\t\t(nếu dùng với cờ « -r », « -m » hay « -l » riêng từng cái)\n"
 "\t\t\tchỉ cho mỗi tên đăng nhập đưa ra\n"
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "faillog: không lấy được mục nhập cho UID %lu\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog: Không lấy được mục nhập cho UID %lu\n"
 
 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"
@@ -787,30 +864,31 @@
 msgid " [%lds lock]"
 msgstr " [%lds khóa]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr "faillog: không đặt lại được hàm đếm cho UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "faillog: không đặt được số tối đa cho UID %lu\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: không đặt được thời gian khoá cho UID %lu\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "lastlog: không nhận ra người dùng hay phạm vi: %s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "faillog: không thể mở %s: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog: Không thể lấy kích cỡ của %s: %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "faillog: không thể lấy kích cỡ của %s: %s\n"
-
 #, fuzzy, c-format
 #| msgid ""
 #| "Usage: %s [options] GROUP\n"
@@ -833,6 +911,11 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir THƯ_MỤC       thư mục chính của tài khoản mới\n"
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -975,10 +1058,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: GID « %lu » đã có\n"
 
-msgid "Usage: groupdel group\n"
-msgstr ""
-"Sử dụng: groupdel nhóm\n"
-"[groupdel: xoá nhóm]\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s: không thể quyết định tên người dùng của bạn.\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1100,16 +1183,51 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: không rõ người dùng %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "Sử dụng: %s [-r] [-s] [nhóm [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Sử dụng: %s [tuỳ_chọn ...]\n"
+"\n"
+"Tuỳ chọn:\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Sử dụng: %s [-r] [-s] [nhóm]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Sử dụng: %s [tuỳ_chọn ...]\n"
+"\n"
+"Tuỳ chọn:\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: hai tùy chọn « -s » và « -r » không tương thích với nhau\n"
 
 msgid "invalid group file entry"
@@ -1179,12 +1297,6 @@
 msgid "%s: no changes\n"
 msgstr "%s: chưa thay đổi gì\n"
 
-msgid "Usage: grpconv\n"
-msgstr "Sử dụng: grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "Sử dụng: grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s: không thể xoá %s\n"
@@ -1198,34 +1310,31 @@
 msgid " groups="
 msgstr " nhóm="
 
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+"  -t, --time NGÀY               hiển thị các mục ghi faillog mới hơn số NGÀY "
+"này\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr ""
+"  -t, --time NGÀY               hiển thị các mục ghi faillog mới hơn số NGÀY "
+"này\n"
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"Sử dụng: lastlog [tùy_chọn...]\n"
-"\n"
-"[lastlog: bản ghi cuối cùng]\n"
-"\n"
-"Tùy chọn:\n"
-"  -b, --before SỐ       hiển thị chỉ những bản ghi lastlog\n"
-"                        cũ hơn số ngày này (_trước_)\n"
-"  -h, --help            hiển thị _trợ giúp_ này rồi thoát\n"
-"  -t, --time SỐ         hiển thị chỉ những mục ghi lastlog\n"
-"                        mới hơn số ngày này (_thời gian_)\n"
-"  -u, --user ĐĂ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 %lu\n"
-msgstr "lastlog: Không lấy được mục nhập cho UID %lu\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "Tên dùng\t\t Cổng    Từ\t\tMới nhất"
 
@@ -1236,14 +1345,6 @@
 msgstr "**Chưa bao giờ đăng nhập**"
 
 #, 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 "lastlog: Không thể lấy kích cỡ của %s: %s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Sử dụng: %s [-p] [tên]\n"
 
@@ -1314,6 +1415,11 @@
 msgid "Login incorrect"
 msgstr "Đăng nhập không đúng"
 
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s: không thể quyết định tên người dùng của bạn.\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1437,55 +1543,95 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: dòng %d: không thể cập nhật mục nhập\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr ""
+"  -a, --all                     hiển thị các mục ghi faillog cho mọi người "
+"dùng\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system                  tạo một tài khoản hệ thống\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system                  tạo một tài khoản hệ thống\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+"  -e, --encrypted               các mật khẩu đã cung cấp cũng được mật mã\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+"  -p, --password MẬT_KHẨU       thay đổi mật khẩu thành MẬT_KHẨU (đã mật mã) "
+"này\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr "  -u, --uid UID                 mã số người dùng của tài khoản mới\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system                  tạo một tài khoản hệ thống\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr "  -u, --uid UID                 mã số người dùng của tài khoản mới\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"Sử dụng: passwd [tuỳ_chọn ...] [ĐĂNG_NHẬP]\n"
-"\n"
-"Tuỳ chọn:\n"
-"  -a, --all\t\t\tthông báo trạng thái mật khẩu về mọi tài khoản\n"
-"  -d, --delete           \txoá mật khẩu cho tài khoản đặt tên\n"
-"  -e, --expire         \tép buộc hết hạn dùng mật khẩu cho tài khoản đặt "
-"tên\n"
-"  -h, --help                  \thiển thị trợ giúp này, sau đó thoát\n"
-"  -k, --keep-tokens\tthay đổi mật khẩu chỉ nếu bị hết hạn dùng\n"
-"  -i, --inactive INACTIVE\tđặt thành INACTIVE mật khẩu không còn hoạt động "
-"lại\n"
-"\t\t\t\t\tsau khi hết hạn dùng\n"
-"  -l, --lock                  \tkhoá mật khẩu của tài khoản đặt tên\n"
-"  -n, --mindays SỐ\tđặt thành số này số tối thiểu các ngày trước khi mật "
-"khẩu thay đổi được\n"
-"  -q, --quiet                 \tchế độ không xuất chi tiết\n"
-"  -r, --repository KHO\t\tthay đổi mật khẩu trong kho lưu này\n"
-"  -S, --status          \tthông báo trạng thái mật khẩu về tài khoản đặt "
-"tên\n"
-"  -u, --unlock\t\tmở khoá mật khẩu của tài khoản đặt tên\n"
-"  -w, --warndays NGÀY\tđặt thành số này số các ngày cảnh báo về hết hạn "
-"dùng\n"
-"  -x, --maxdays NGÀY\tđặt thành số này số tối đa các ngày trước khi thay đổi "
-"được mật khẩu\n"
-"\n"
+"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
 
 msgid "Old password: "
 msgstr "Mật khẩu cũ : "
@@ -1570,23 +1716,37 @@
 msgstr "%s: thông tin đã thay đổi về sự hết hạn sử dụng mật khẩu.\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Sử dụng: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-"[passwd: mật khẩu\n"
-"shadow: bóng]\n"
+"Sử dụng: %s [tuỳ_chọn ...]\n"
+"\n"
+"Tuỳ chọn:\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"Sử dụng: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-"[passwd: mật khẩu\n"
-"shadow: bóng]\n"
+"Sử dụng: %s [tuỳ_chọn ...]\n"
+"\n"
+"Tuỳ chọn:\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s: hai tùy chọn « -s » và « -r » không tương thích với nhau\n"
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1667,9 +1827,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s: không thể sắp xếp các mục nhập trong %s\n"
 
-msgid "Usage: pwconv\n"
-msgstr "Sử dụng: pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr ""
@@ -1678,9 +1835,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s: không thay đổi được chế độ của %s thành 0600\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "Sử dụng: pwunconv\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"
 
@@ -1748,18 +1902,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s: phải chạy từ thiết bị cuối\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s: %s\n"
+"(Bị bo qua)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s: pam_start: (pam bắt đầu) lỗi %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "Không rõ mã số : %s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\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"
 
@@ -1767,14 +1917,6 @@
 msgstr "(Nhập mật khẩu của mình)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s: %s\n"
-"(Bị bo qua)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: lỗi xác thực\n"
 
@@ -1783,9 +1925,29 @@
 msgstr ""
 "%s: Bạn không có quyền sử dụng lệnh « su » (siêu người dùng) vào lúc đó\n"
 
-msgid "No shell\n"
-msgstr "Không có trình bao\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "Không có mục nhập mật khẩu cho « root » (người chủ)"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s: phải chạy từ thiết bị cuối\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s: pam_start: (pam bắt đầu) lỗi %d\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "lastlog: Không thể lấy kích cỡ của %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "Không thể thực hiện %s"
+
 msgid "No password file"
 msgstr "Không có tập tin mật khẩu"
 
@@ -1827,8 +1989,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: dòng quá dài trong %s: %s..."
 
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s: thay tên: %s: %s"
 
 #, c-format
@@ -1846,6 +2009,8 @@
 #| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1985,10 +2150,6 @@
 msgstr "%s: « -Z » yêu cầu hạt nhân hiệu lực SELinux\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s: hai tùy chọn %s và %s xung đột với nhau\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr "%s: không đặt lại được mục nhập faillog của UID %lu: %s\n"
 
@@ -2052,30 +2213,45 @@
 "%s: cảnh báo : thư mục chính đã có.\n"
 "Vì vậy không sao chép vào nó tập tin nào từ thư mục « skel ».\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -f, --force                   exit successfully if the group already "
+#| "exists,\n"
+#| "                                and cancel -g if the GID is already used\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"Sử dụng: userdel [tùy_chọn...] ĐĂNG_NHẬP\n"
-"\n"
-"Tùy chọn:\n"
-"  -f, --force                   ép buộc gỡ bỏ tập tin, thậm chí nếu không\n"
-"                                được sở hữu bởi người dùng\n"
-"  -h, --help                    hiển thị trợ giúp này, sau đó thoát\n"
-"  -r, --remove                  gỡ bỏ thư mục chính và ống chỉ thư tín\n"
-"\n"
+"  -f, --force                   thoát thành công nếu nhóm đã có, và hủy bỏ « "
+"-g » nếu GID đã được dùng\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+"  -r, --reset                   đặt lại các bộ đếm lần không đăng nhập được\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s: không thể gỡ bỏ nhóm chính của người dùng « %s »\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: nhóm %s là nhóm chính của một người dùng khác thì không bị gỡ bỏ.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s: %s không tìm thấy thư mục chính (%s)\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s: cảnh báo : không thể gỡ bỏ %s: %s\n"
@@ -2108,10 +2284,6 @@
 msgstr "%s: người dùng %s là người dùng kiểu NIS\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s: người dùng %s hiện thời được đăng nhập\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s: %s không tìm thấy thư mục chính (%s)\n"
 
@@ -2125,63 +2297,103 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: gặp lỗi khi gỡ bỏ thư mục %s\n"
 
-#, c-format
+#, fuzzy
+#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr "  -c, --comment GHI_CHÚ         trường GECOS của tài khoản mới\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr "  -d, --home-dir THƯ_MỤC       thư mục chính của tài khoản mới\n"
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr "  -e, --expiredate NGÀY      ngày hết hạn sử dụng tài khoản mới\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -p, --password MẬT_KHẨU       thay đổi mật khẩu thành MẬT_KHẨU (đã mật mã) "
+"này\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -G, --groups GROUPS           list of supplementary groups of the new\n"
+#| "                                account\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+"  -G, --groups NHÓM           danh sách các nhóm phụ của tài khoản mới\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr "  -u, --uid UID                 mã số người dùng của tài khoản mới\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
+#| "the\n"
+#| "                                new account\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+"  -b, --base-dir THƯ_MỤC       đặt thư mục cơ bản cho thư mục chính của tài "
+"khoản mới\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
+#| "GID\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
-"Sử dụng: usermod [tuỳ_chọn...] ĐĂNG_NHẬP\n"
-"\n"
-"Tuỳ chọn:\n"
-"  -c, --comment GHI_LƯU\t\tgiá trị mới của trường GECOS\n"
-"  -d, --home THƯ_MỤC           \tthư mục chính mới cho tài khoản người dùng\n"
-"  -e, --expiredate NGÀY  \t\tđặt thành ngày này ngày hết hạn dùng tài khoản\n"
-"  -f, --inactive INACTIVE       \tđặt thành INACTIVE mật khẩu không còn hoạt "
-"động lại\n"
-"\t\t\t\t\t\tsau khi hết hạn dùng\n"
-"  -g, --gid NHÓM               \t\tép buộc sử dụng nhóm này làm nhóm chính "
-"mới\n"
-"  -G, --groups NHÓM           \tdanh sách mới chứa các nhóm phụ\n"
-"  -a, --append                  \t\tphụ thêm người dùng vào các nhóm phụ\n"
-"\t\t\t\t\t\tđưa ra bởi tuỳ chọn « -G » mà không gỡ bỏ ta khỏi nhóm khác\n"
-"  -h, --help                    \t\thiển thị trợ giúp này, sau đó thoát\n"
-"  -l, --login ĐĂNG_NHẬP         \tgiá trị mới của tên đăng nhập\n"
-"  -L, --lock                    \t\tkhoá tài khoản người dùng\n"
-"  -m, --move-home              \tdi chuyển nội dung của thư mục chính sang "
-"vị trí mới\n"
-"\t\t\t\t\t\t(chỉ dùng cùng với « -d »)\n"
-"  -o, --non-unique              \t\tcho phép sử dụng UID trùng (không duy "
+"  -o, --non-unique              cho phép sử dụng một GID trùng (không duy "
 "nhất)\n"
-"  -p, --password MẬT_KHẨU   \tmật mã hoá mật khẩu mới\n"
-"  -s, --shell TRÌNH_BAO             trình bao đăng nhập mới cho tài khoản "
-"người dùng\n"
-"  -u, --uid UID                 \t\tUID mới cho tài khoản người dùng\n"
-"  -U, --unlock                  \t\tmở khoá tài khoản người dùng\n"
-"%s\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       use this encrypted password for the new "
+#| "group\n"
 msgid ""
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+msgstr ""
+"  -p, --password MẬT_KHẨU       dùng mật khẩu đã mật mã này cho nhóm mới\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr "  -u, --uid UID                 mã số người dùng của tài khoản mới\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr "  -u, --uid UID                 mã số người dùng của tài khoản mới\n"
+
+msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
 msgstr ""
@@ -2202,19 +2414,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s: người dùng « %s » đã có trong %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s: không thể mở %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s: chưa đưa ra cờ\n"
+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: shadow passwords required for -e and -f\n"
 msgstr "%s: mật khẩu bóng cần thiết cho hai tùy chọn « -e » và « -f »\n"
 
 #, c-format
-msgid "%s: 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' already exists\n"
 msgstr "%s: UID « %lu » đã có\n"
 
@@ -2298,11 +2511,6 @@
 msgstr "  -r, --system                  tạo các tài khoản hệ thống\n"
 
 #, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
-
-#, fuzzy
 #| msgid ""
 #| "  -a, --all                     display faillog records for all users\n"
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
@@ -2384,7 +2592,332 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: thư mục cơ ban không hợp lệ « %s »\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) (cấp phát bộ nhớ) bị lỗi\n"
+
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Sử dụng: chage [tuỳ_chọn ...] [ĐĂNG_NHẬP]\n"
+#~ "\n"
+#~ "Tuỳ chọn:\n"
+#~ "  -d, --lastday NGÀY_CUỐI        đặt ngày thay đổi mật khẩu cuối cùng "
+#~ "thành ngày này\n"
+#~ "  -E, --expiredate NGÀY_HẾT_HẠN    đặt ngày hết hạn dùng tài khoản thành "
+#~ "ngày này\n"
+#~ "  -h, --help                    \t\thiển thị trợ giúp này, sau đó thoát\n"
+#~ "  -I, --inactive INACTIVE       \tđặt mật khẩu không còn hoạt động lại "
+#~ "sau khi hết hạn dùng,\n"
+#~ "\t\t\t\t\t\tthành INACTIVE\n"
+#~ "  -l, --list                    \t\t\thiển thị thông tin về khoảng thời "
+#~ "gian sử dụng tài khoản\n"
+#~ "  -m, --mindays SỐ        \t\tđặt thành số này số tối thiểu các ngày "
+#~ "trước khi thay đổi mật khẩu\n"
+#~ "  -M, --maxdays SỐ\t\t\tđặt thành số này số tối đa các ngày trước khi "
+#~ "thay đổi mật khẩu\n"
+#~ "  -W, --warndays SỐ      \t\tđặt thành số này số các ngày gây ra cảnh báo "
+#~ "về hết hạn dùng\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s: lỗi xác thực PAM\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "Sử dụng: %s [-f họ_tên] [-r số_phòng] [-w điện_thoại_chỗ_làm]\n"
+#~ "\t[-h điện_thoại_ở_nhà] [-o khác] [người_dùng]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr ""
+#~ "Sử dụng: %s [-f họ_tên] [-r số_phòng] [-w điện_thoại_chỗ_làm]\n"
+#~ "\t[-h điện_thoại_ở_nhà]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Sử dụng: %s [tùy_chọn]\n"
+#~ "\n"
+#~ "Tùy chọn:\n"
+#~ "  -c, --crypt-method            phương pháp mã hoá (một của %s)\n"
+#~ "  -e, --encrypted               mã hoá mỗi mật khẩu đã cung cấp\n"
+#~ "  -h, --help                    hiển thị trợ giúp này rồi thoát\n"
+#~ "  -m, --md5           mã hoá mật khẩu nhập thô, dùng thuật toán MD5\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Sử dụng: chsh [tùy_chọn...] [ĐĂNG_NHẬP]\n"
+#~ "\n"
+#~ "Tùy chọn:\n"
+#~ "  -h, --help                    hiện _trợ giúp_ này rồi thoát\n"
+#~ "  -s, --shell TRÌNH_BAO        trình bao đăng nhập mới\n"
+#~ "\t\t\t\t\t\tcho tài khoản người dùng\n"
+#~ "\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr ""
+#~ "Sử dụng: expiry {-f|-c}\n"
+#~ "[expiry: mãn hạn]\n"
+
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "faillog: không lấy được mục nhập cho UID %lu\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "faillog: không thể mở %s: %s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "faillog: không thể lấy kích cỡ của %s: %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr ""
+#~ "Sử dụng: groupdel nhóm\n"
+#~ "[groupdel: xoá nhóm]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "Sử dụng: %s [-r] [-s] [nhóm [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "Sử dụng: %s [-r] [-s] [nhóm]\n"
+
+#~ 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"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "Sử dụng: grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "Sử dụng: grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Sử dụng: lastlog [tùy_chọn...]\n"
+#~ "\n"
+#~ "[lastlog: bản ghi cuối cùng]\n"
+#~ "\n"
+#~ "Tùy chọn:\n"
+#~ "  -b, --before SỐ       hiển thị chỉ những bản ghi lastlog\n"
+#~ "                        cũ hơn số ngày này (_trước_)\n"
+#~ "  -h, --help            hiển thị _trợ giúp_ này rồi thoát\n"
+#~ "  -t, --time SỐ         hiển thị chỉ những mục ghi lastlog\n"
+#~ "                        mới hơn số ngày này (_thời gian_)\n"
+#~ "  -u, --user ĐĂNG_NHẬP   hiển thị mục ghi lastlog cho _người dùng_ tên "
+#~ "này\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Sử dụng: passwd [tuỳ_chọn ...] [ĐĂNG_NHẬP]\n"
+#~ "\n"
+#~ "Tuỳ chọn:\n"
+#~ "  -a, --all\t\t\tthông báo trạng thái mật khẩu về mọi tài khoản\n"
+#~ "  -d, --delete           \txoá mật khẩu cho tài khoản đặt tên\n"
+#~ "  -e, --expire         \tép buộc hết hạn dùng mật khẩu cho tài khoản đặt "
+#~ "tên\n"
+#~ "  -h, --help                  \thiển thị trợ giúp này, sau đó thoát\n"
+#~ "  -k, --keep-tokens\tthay đổi mật khẩu chỉ nếu bị hết hạn dùng\n"
+#~ "  -i, --inactive INACTIVE\tđặt thành INACTIVE mật khẩu không còn hoạt "
+#~ "động lại\n"
+#~ "\t\t\t\t\tsau khi hết hạn dùng\n"
+#~ "  -l, --lock                  \tkhoá mật khẩu của tài khoản đặt tên\n"
+#~ "  -n, --mindays SỐ\tđặt thành số này số tối thiểu các ngày trước khi mật "
+#~ "khẩu thay đổi được\n"
+#~ "  -q, --quiet                 \tchế độ không xuất chi tiết\n"
+#~ "  -r, --repository KHO\t\tthay đổi mật khẩu trong kho lưu này\n"
+#~ "  -S, --status          \tthông báo trạng thái mật khẩu về tài khoản đặt "
+#~ "tên\n"
+#~ "  -u, --unlock\t\tmở khoá mật khẩu của tài khoản đặt tên\n"
+#~ "  -w, --warndays NGÀY\tđặt thành số này số các ngày cảnh báo về hết hạn "
+#~ "dùng\n"
+#~ "  -x, --maxdays NGÀY\tđặt thành số này số tối đa các ngày trước khi thay "
+#~ "đổi được mật khẩu\n"
+#~ "\n"
+
 #, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr ""
+#~ "Sử dụng: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ "[passwd: mật khẩu\n"
+#~ "shadow: bóng]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr ""
+#~ "Sử dụng: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ "[passwd: mật khẩu\n"
+#~ "shadow: bóng]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "Sử dụng: pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "Sử dụng: pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "Không rõ mã số : %s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "Không có trình bao\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Sử dụng: userdel [tùy_chọn...] ĐĂNG_NHẬP\n"
+#~ "\n"
+#~ "Tùy chọn:\n"
+#~ "  -f, --force                   ép buộc gỡ bỏ tập tin, thậm chí nếu "
+#~ "không\n"
+#~ "                                được sở hữu bởi người dùng\n"
+#~ "  -h, --help                    hiển thị trợ giúp này, sau đó thoát\n"
+#~ "  -r, --remove                  gỡ bỏ thư mục chính và ống chỉ thư tín\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s: người dùng %s hiện thời được đăng nhập\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Sử dụng: usermod [tuỳ_chọn...] ĐĂNG_NHẬP\n"
+#~ "\n"
+#~ "Tuỳ chọn:\n"
+#~ "  -c, --comment GHI_LƯU\t\tgiá trị mới của trường GECOS\n"
+#~ "  -d, --home THƯ_MỤC           \tthư mục chính mới cho tài khoản người "
+#~ "dùng\n"
+#~ "  -e, --expiredate NGÀY  \t\tđặt thành ngày này ngày hết hạn dùng tài "
+#~ "khoản\n"
+#~ "  -f, --inactive INACTIVE       \tđặt thành INACTIVE mật khẩu không còn "
+#~ "hoạt động lại\n"
+#~ "\t\t\t\t\t\tsau khi hết hạn dùng\n"
+#~ "  -g, --gid NHÓM               \t\tép buộc sử dụng nhóm này làm nhóm "
+#~ "chính mới\n"
+#~ "  -G, --groups NHÓM           \tdanh sách mới chứa các nhóm phụ\n"
+#~ "  -a, --append                  \t\tphụ thêm người dùng vào các nhóm phụ\n"
+#~ "\t\t\t\t\t\tđưa ra bởi tuỳ chọn « -G » mà không gỡ bỏ ta khỏi nhóm khác\n"
+#~ "  -h, --help                    \t\thiển thị trợ giúp này, sau đó thoát\n"
+#~ "  -l, --login ĐĂNG_NHẬP         \tgiá trị mới của tên đăng nhập\n"
+#~ "  -L, --lock                    \t\tkhoá tài khoản người dùng\n"
+#~ "  -m, --move-home              \tdi chuyển nội dung của thư mục chính "
+#~ "sang vị trí mới\n"
+#~ "\t\t\t\t\t\t(chỉ dùng cùng với « -d »)\n"
+#~ "  -o, --non-unique              \t\tcho phép sử dụng UID trùng (không duy "
+#~ "nhất)\n"
+#~ "  -p, --password MẬT_KHẨU   \tmật mã hoá mật khẩu mới\n"
+#~ "  -s, --shell TRÌNH_BAO             trình bao đăng nhập mới cho tài khoản "
+#~ "người dùng\n"
+#~ "  -u, --uid UID                 \t\tUID mới cho tài khoản người dùng\n"
+#~ "  -U, --unlock                  \t\tmở khoá tài khoản người dùng\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s: chưa đưa ra cờ\n"
+
+#, fuzzy
 #~| msgid ""
 #~| "Usage: vipw [options]\n"
 #~| "\n"

Modified: upstream/trunk/po/zh_CN.po
===================================================================
--- upstream/trunk/po/zh_CN.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/zh_CN.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -9,7 +9,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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2010-10-07 03:09+0800\n"
 "Last-Translator: YunQiang Su <wzssyqa at gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh at googlegroups.com>\n"
@@ -39,6 +39,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "配置错误 - 未知项目“%s”(请通知管理员)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "密码："
 
@@ -211,6 +219,11 @@
 "(%lu)\n"
 msgstr "%s：无效的配置：SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%lu)\n"
 
+#, fuzzy, c-format
+#| msgid "failed to allocate memory"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "申请内存失败"
+
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s：无法获取独有的系统 GID (没有更多可用的 GID 了)\n"
@@ -293,6 +306,33 @@
 msgstr "%s 的密码不正确。\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s：放弃特权时失败 (%s)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s：无效的家庭电话：“%s”\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot create directory %s: %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s：无法创建目录 %s：%s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Failed to create tcb directory for %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s：为 %s 创建 tcb 目录失败\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -322,43 +362,74 @@
 msgid "Unable to determine your tty name."
 msgstr "无法确定您的 tty 终端名。"
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) 失败\n"
-
 msgid "No"
 msgstr "否"
 
+#, c-format
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr ""
+"用法：%s [选项] 登录\n"
+"\n"
+"选项：\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr " -e, --expiredate EXPIRE_DATE  新账户的过期日期\n"
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr "  -h, --help\t\t显示此帮助信息并推出\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr "  -p, --password PASSWORD\t将密码更改为(加密过的) PASSWORD\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -l, --list                    show account aging information\n"
+msgstr "  -r, --reset\t\t重置登陆失败计数\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr "  -s, --sha-rounds\t\tSHA* 加密算法中的 SHA 旁边的数字\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr "  -s, --sha-rounds\t\tSHA* 加密算法中的 SHA 旁边的数字\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir HOME_DIR       新账户的主目录\n"
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"用法：chage [选项] [登录]\n"
-"\n"
-"选项：\n"
-"  -d, --lastday 最近日期\t将最近一次密码设置时间设为“最近日期”\n"
-"  -E, --expiredate 过期日期\t将帐户过期时间设为“过期日期”\n"
-"  -h, --help\t\t\t显示此帮助信息并退出\n"
-"  -I, --inactive INACITVE\t过期 INACTIVE 天数后，设定密码为失效状态\n"
-"  -l, --list\t\t\t显示帐户年龄信息\n"
-"  -m, --mindays 最小天数\t将两次改变密码之间相距的最小天数设为“最小天数”\n"
-"  -M, --maxdays 最大天数\t将两次改变密码之间相距的最大天数设为“最大天数”\n"
-"  -W, --warndays 警告天数\t将过期警告天数设为“警告天数”\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "请输入新值，或直接敲回车键以使用默认值"
@@ -431,9 +502,10 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s：无法确定您的用户名。\n"
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr "%s：PAM 验证失败\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "%s: PAM: %s\n"
+msgstr "%s：%s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -456,10 +528,6 @@
 msgstr "%s：影子密码文件不存在\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s：放弃特权时失败 (%s)\n"
-
-#, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s：用户 %s 不存在于 %s 中\n"
 
@@ -471,18 +539,40 @@
 msgid "%s: error changing fields\n"
 msgstr "%s：改变字段时出错\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
 msgstr ""
-"用法：%s [-f 全名] [-r 房间号] [-w 工作电话]\n"
-"\t[-h 家庭电话] [-o 其它] [用户]\n"
+"用法：%s [选项] 登录\n"
+"\n"
+"选项：\n"
 
-#, 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"
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
+msgstr ""
 
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
+
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr "  -h, --help\t\t显示此帮助信息并推出\n"
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "全名"
 
@@ -562,23 +652,24 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
 "用法：%s [选项]\n"
 "\n"
 "选项：\n"
-"  -c, --crypt-method\t加密方法 (%s 中的一个)\n"
-"  -e, --encrypted\t\t提供的密码是加密过的\n"
-"  -h, --help\t\t\t显示此帮助信息然后推出\n"
-"  -m, --md5\t\t\t使用 MD5 算法加密明文密码\n"
-"%s\n"
 
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr "  -c, --crypt-method <方法>   加密方法(%s 中的一个)\n"
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr "  -e, --encrypted\t\t提供的密码已经加密\n"
+
 msgid ""
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
+msgstr "  -m, --md5\t\t使用 MD5 算法加密明文密码\n"
+
+msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
 "                                crypt algorithms\n"
 msgstr "  -s, --sha-rounds\t\tSHA* 加密算法中的 SHA 旁边的数字\n"
@@ -618,31 +709,6 @@
 msgstr "%s：发现错误，忽略改动\n"
 
 #, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"用法：%s [选项]\n"
-"\n"
-"选项：\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method <方法>   加密方法(%s 中的一个)\n"
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr "  -e, --encrypted\t\t提供的密码已经加密\n"
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr "  -h, --help\t\t显示此帮助信息并推出\n"
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr "  -m, --md5\t\t使用 MD5 算法加密明文密码\n"
-
-#, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s：(第 %d 行，用户 %s) 不存在\n"
 
@@ -650,19 +716,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s：第 %d 行：用户“%s”不存在\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
-msgstr ""
-"用法：chsh [选项] [登录]\n"
-"\n"
-"选项：\n"
-"  -h, --help\t\t\t\t显示此帮助信息并退出\n"
-"  -s, --shell SHELL\t\t\t该用户帐号的新登录 shell\n"
+#, fuzzy
+#| msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
+msgstr "  -s, --shell SHELL\t\t新账户的登录 shell\n"
 
 msgid "Login Shell"
 msgstr "登录 Shell"
@@ -691,9 +748,31 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s：警告：%s 不可执行\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "用法：expiry {-f|-c}\n"
+#, fuzzy
+#| msgid ""
+#| "  -u, --user                    which user's tcb shadow file to edit\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr "  -u, --user                    要编辑哪个用户的 tcb 影子文件\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr "  -m, --md5\t\t使用 MD5 算法加密明文密码\n"
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr "%s：选项 %s 和 %s 冲突\n"
+
+#, fuzzy, c-format
+#| msgid "lastlog: unexpected argument: %s\n"
+msgid "%s: unexpected argument: %s\n"
+msgstr "lastlog：意外的参数：%s\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr "  -a, --all\t\t\t为所有用户显示登陆失败记录\n"
 
@@ -722,9 +801,10 @@
 "  -u, --user LOGIN/RANGE\t只为指定的登录显示登录失败记录或维护失败\n"
 "\t\t\t\t\t计数和限制(如果使用了 -r, -m 或 -l)\n"
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr "登录失败：获取 UID %lu 的条目失败\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "lastlog：获取 UID %lu 的条目失败\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "登录        失败次数  最多   最近                     于\n"
@@ -737,31 +817,32 @@
 msgid " [%lds lock]"
 msgstr " [锁定 %lds]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr "登录失败：为 UID %lu 重置失败计数失败\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set max for UID %lu\n"
+msgid "%s: Failed to set max for UID %lu\n"
 msgstr "登录失败：为 UID %lu 设置最大值失败\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
+#, fuzzy, c-format
+#| msgid "faillog: Failed to set locktime for UID %lu\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "登录失败：为 UID %lu 设置锁定时间失败\n"
 
-#, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "最近登录：未知用户或范围：%s\n"
 
-#, c-format
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "登录失败：无法打开 %s：%s\n"
+#, fuzzy, c-format
+#| msgid "lastlog: Cannot get the size of %s: %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "lastlog：无法获得 %s 的大小：%s\n"
 
 #, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr "登录失败：无法获取 %s 的大小：%s\n"
-
-#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
@@ -777,6 +858,11 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete USER             从组 GROUP 中添加或删除用户\n"
 
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr "  -d, --home-dir HOME_DIR       新账户的主目录\n"
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         移除组 GROUP 的密码\n"
 
@@ -900,8 +986,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s：GID “%lu”已经存在\n"
 
-msgid "Usage: groupdel group\n"
-msgstr "用法：groupdel 组\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s：无法确定您的用户名。\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1004,16 +1092,50 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s：未知用户 %s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "用法：%s [-r] [-s] [组 [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"用法：%s [选项] [动作]\n"
+"\n"
+"选项：\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "用法：%s [-r] [-s] [组]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"用法：%s [选项] [动作]\n"
+"\n"
+"选项：\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr "  -s, --sha-rounds\t\tSHA* 加密算法中的 SHA 旁边的数字\n"
+
+#, fuzzy
+#| msgid "  -l, --list                    list the members of the group\n"
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr "  -l, --list                    列出组中的所有成员\n"
+
 #, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s：-s 和 -r 不兼容\n"
 
 msgid "invalid group file entry"
@@ -1081,12 +1203,6 @@
 msgid "%s: no changes\n"
 msgstr "%s：无改变\n"
 
-msgid "Usage: grpconv\n"
-msgstr "用法：grpconv\n"
-
-msgid "Usage: grpunconv\n"
-msgstr "用法：grpunconv\n"
-
 #, c-format
 msgid "%s: cannot delete %s\n"
 msgstr "%s：无法删除 %s\n"
@@ -1100,30 +1216,27 @@
 msgid " groups="
 msgstr " 组="
 
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "  -t, --time DAYS\t\t显示 DAYS 天来的登陆失败记录\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
+msgstr "  -t, --time DAYS\t\t显示 DAYS 天来的登陆失败记录\n"
+
+msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
-"\n"
 msgstr ""
-"用法：lastlog [选项]\n"
-"\n"
-"选项：\n"
-"  -b, --before DAYS\t仅打印早于 DAYS 的最近登录记录\n"
-"  -h, --help\t\t显示此帮助信息并退出\n"
-"  -t, --time DAYS\t仅打印晚于 DAYS 的最近登录记录\n"
-"  -u, --user LOGIN\t打印 LOGIN 用户的最近登录记录\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
-msgstr "lastlog：获取 UID %lu 的条目失败\n"
-
 msgid "Username         Port     From             Latest"
 msgstr "用户名           端口     来自             最后登陆时间"
 
@@ -1134,14 +1247,6 @@
 msgstr "**从未登录过**"
 
 #, 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 "lastlog：无法获得 %s 的大小：%s\n"
-
-#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "用法：%s [-p] [名称]\n"
 
@@ -1210,6 +1315,11 @@
 msgid "Login incorrect"
 msgstr "登录错误"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s：第 %d 行：无法找到用户 %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1326,50 +1436,86 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s：第 %d 行：无法更新条目\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
-"Usage: passwd [options] [LOGIN]\n"
-"\n"
-"Options:\n"
 "  -a, --all                     report password status on all accounts\n"
+msgstr "  -a, --all\t\t\t为所有用户显示登陆失败记录\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr "  -r, --system                  创建一个系统账户\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -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"
+msgstr "  -r, --system                  创建一个系统账户\n"
+
+#, fuzzy
+#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr "  -e, --encrypted\t\t提供的密码已经加密\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr "  -p, --password PASSWORD\t将密码更改为(加密过的) PASSWORD\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr "  -u, --uid UID\t\t\t新账户的用户 ID\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr "  -s, --sha-rounds\t\tSHA* 加密算法中的 SHA 旁边的数字\n"
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr "  -q, --quiet                   安静模式\n"
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create a system account\n"
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr "  -r, --system                  创建一个系统账户\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr "  -u, --uid UID\t\t\t新账户的用户 ID\n"
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
-msgstr ""
-"用法：passwd [选项] [用户名]\n"
-"\n"
-"选项：\n"
-"  -a, --all\t\t\t报告所有帐户的密码状态\n"
-"  -d, --delete\t\t\t删除指定帐户的密码\n"
-"  -e, --expire\t\t\t强制使指定帐户的密码过期\n"
-"  -h, --help\t\t\t显示此帮助信息并退出\n"
-"  -k, --keep-tokens\t\t仅在过期后修改密码\n"
-"  -i, --inactive INACTIVE\t密码过期后设置密码不活动为 INACTIVE\n"
-"  -l, --lock\t\t\t锁定指定的帐户\n"
-"  -n, --mindays MIN_DAYS\t设置到下次修改密码所须等待的最短天数\n"
-"\t\t\t\t为 MIN_DAYS\n"
-"  -q, --quiet\t\t\t安静模式\n"
-"  -r, --repository REPOSITORY\t在 REPOSITORY 库中改变密码\n"
-"  -S, --status\t\t\t报告指定帐户密码的状态\n"
-"  -u, --unlock\t\t\t解锁被指定帐户\n"
-"  -w, --warndays WARN_DAYS\t设置过期警告天数为 WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\t设置到下次修改密码所须等待的最多天数\n"
-"\t\t\t\t为 MAX_DAYS\n"
-"\n"
+msgstr "  -s, --sha-rounds\t\tSHA* 加密算法中的 SHA 旁边的数字\n"
 
 msgid "Old password: "
 msgstr "旧密码："
@@ -1451,17 +1597,38 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s：密码过期信息已更改。\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "用法：%s [-q] [-r] [passwd]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"用法：%s [选项] [动作]\n"
+"\n"
+"选项：\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "用法：%s [-q] [-r] [-s] [passwd [shadow]]\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] [action]\n"
+#| "\n"
+#| "Options:\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr ""
+"用法：%s [选项] [动作]\n"
+"\n"
+"选项：\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s：-s 和 -r 不兼容\n"
+#, fuzzy
+#| msgid "  -q, --quiet                   quiet mode\n"
+msgid "  -q, --quiet                   report errors only\n"
+msgstr "  -q, --quiet                   安静模式\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1536,9 +1703,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s：在 %s 中无法排序条目\n"
 
-msgid "Usage: pwconv\n"
-msgstr "用法：pwconv\n"
-
 #, c-format
 msgid "%s: can't work with tcb enabled\n"
 msgstr "%s：不能与 tcb 配合使用\n"
@@ -1547,9 +1711,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr "%s：将 %s 的模式更改为 0600 失败\n"
 
-msgid "Usage: pwunconv\n"
-msgstr "用法：pwunconv\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "su 到该帐户被拒。\n"
 
@@ -1612,18 +1773,14 @@
 "\n"
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s：必须从终端中执行\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s：%s\n"
+"(忽略)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s：pam_start：错误 %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "未知 id：%s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "您没有被授权 su %s\n"
 
@@ -1631,14 +1788,6 @@
 msgstr "(请输入您自己的密码)"
 
 #, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s：%s\n"
-"(忽略)\n"
-
-#, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s：验证失败\n"
 
@@ -1646,9 +1795,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "%s：那时，您没有被授权 su\n"
 
-msgid "No shell\n"
-msgstr "没有 shell\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "没有“root”的密码项"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s：必须从终端中执行\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s：pam_start：错误 %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Cannot remove the content of %s: %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s：无法删除 %s 的内容：%s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "无法执行 %s"
+
 msgid "No password file"
 msgstr "没有密码文件"
 
@@ -1690,8 +1859,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s：%s 中行太长：%s..."
 
-#, c-format
-msgid "%s: rename: %s: %s"
+#, fuzzy, c-format
+#| msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s：改名：%s：%s"
 
 #, c-format
@@ -1702,9 +1872,15 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s：指定了过多组(最多 %d)。\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1825,10 +2001,6 @@
 msgstr "%s: -Z 选项要求内核启用 SELinux\n"
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr "%s：选项 %s 和 %s 冲突\n"
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr "%s：重置 UID %lu 的登录失败条目失败：%s\n"
 
@@ -1887,28 +2059,43 @@
 "%s：警告：此主目录已经存在。\n"
 "不从 skel 目录里向其中复制任何文件。\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -f, --force                   exit successfully if the group already "
+#| "exists,\n"
+#| "                                and cancel -g if the GID is already used\n"
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
-"用法：userdel [选项] 登录\n"
-"\n"
-"选项：\n"
-"  -f, --force\t\t即使不属于此用户，也强制删除文件\n"
-"  -h, --help\t\t显示此帮组文件并退出\n"
-"  -r, --remove\t\t删除主目录和邮箱\n"
-"\n"
+"  -f, --force\t\t如果组已经存在则成功退出\n"
+"\t\t\t并且如果 GID 已经存在则取消 -g\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -r, --reset                   reset the counters of login failures\n"
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr "  -r, --reset\t\t重置登陆失败计数\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot remove the primary group of user '%s'\n"
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s：不能移除用户“%s”的主组\n"
+
 #, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, c-format
 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: %s home directory (%s) not found\n"
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s：未找到 %s 的主目录“%s”\n"
+
 #, c-format
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s：警告：无法删除 %s：%s\n"
@@ -1938,10 +2125,6 @@
 msgstr "%s：用户 %s 是 NIS 用户\n"
 
 #, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s：用户 %s 目前已登录\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s：未找到 %s 的主目录“%s”\n"
 
@@ -1953,55 +2136,92 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s：删除目录 %s 时出错\n"
 
-#, c-format
+#, fuzzy
+#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr "  -c, --comment COMMENT         新账户的 GECOS 字段\n"
+
+#, fuzzy
+#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr "  -d, --home-dir HOME_DIR       新账户的主目录\n"
+
+#, fuzzy
+#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr " -e, --expiredate EXPIRE_DATE  新账户的过期日期\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
+#| "                                PASSWORD\n"
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr "  -p, --password PASSWORD\t将密码更改为(加密过的) PASSWORD\n"
+
+#, fuzzy
+#| msgid "  -g, --gid GID                 use GID for the new group\n"
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr "  -g, --gid GID                 为新组使用 GID\n"
+
+#, fuzzy
+#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr "  -M, --members USER,...        设置组 GROUP 的成员列表\n"
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -L, --lock                    lock the user account\n"
+msgstr "  -u, --uid UID\t\t\t新账户的用户 ID\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
+#| "the\n"
+#| "                                new account\n"
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr "  -b, --base-dir BASE_DIR\t新账户的主目录的基目录\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
+#| "GID\n"
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr "  -o, --non-unique              允许使用重复的 GID\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -p, --password PASSWORD       use this encrypted password for the new "
+#| "group\n"
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
-msgstr ""
-"用法：usermod [选项] 登录\n"
-"\n"
-"选项：\n"
-"  -c, --comment 注释\t\tGECOS 字段的新值\n"
-"  -d, --home HOME_DIR\t\t用户的新主目录\n"
-"  -e, --expiredate EXPIRE_DATE\t设定帐户过期的日期为 EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\t过期 INACTIVE 天数后，设定密码为失效状态\n"
-"  -g, --gid GROUP\t\t强制使用 GROUP 为新主组\n"
-"  -G, --groups GROUPS\t\t新的附加组列表 GROUPS\n"
-"  -a, --append GROUP\t将用户追加至上边 -G 中提到的附加组中，\n"
-"\t\t\t\t\t并不从其它组中删除此用户\n"
-"  -h, --help\t\t\t显示此帮助信息并退出\n"
-"  -l, --login LOGIN\t\t新的登录名称\n"
-"  -L, --lock\t\t\t锁定用户帐号\n"
-"  -m, --move-home\t\t将家目录内容移至新位置 (仅于 -d 一起使用)\n"
-"  -o, --non-unique\t\t允许使用重复的(非唯一的) UID\n"
-"  -p, --password PASSWORD\t将加密过的密码 (PASSWORD) 设为新密码\n"
-"  -s, --shell SHELL\t\t用户帐号的新登录 shell\n"
-"  -u, --uid UID\t\t\t用户帐号的新 UID\n"
-"  -U, --unlock\t\t\t解锁用户帐号\n"
-"%s\n"
+msgstr "  -p, --password PASSWORD       为新组使用此加密过的密码\n"
 
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr "  -u, --uid UID\t\t\t新账户的用户 ID\n"
+
+#, fuzzy
+#| msgid "  -u, --uid UID                 user ID of the new account\n"
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr "  -u, --uid UID\t\t\t新账户的用户 ID\n"
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2019,19 +2239,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s：用户 %s 已存在于 %s 中\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open %s\n"
+msgid "%s: no options\n"
+msgstr "%s：无法打开 %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s：没有指定标志\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr "%s：-L ，-p 和 -U 标志互斥\n"
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s：-e 和 -f 参数需要影子密码\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr "%s：-L ，-p 和 -U 标志互斥\n"
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr "%s：UID “%lu”已经存在\n"
 
@@ -2100,9 +2321,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr "  -p, --passwd                  编辑 passwd 数据库\n"
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -q, --quiet                   安静模式\n"
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr "  -s, --shadow                  编辑 shadow 或 gshadow 数据库\n"
 
@@ -2161,6 +2379,286 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s：无法为“%s”找到 tcb 目录\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) 失败\n"
+
+#~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "用法：chage [选项] [登录]\n"
+#~ "\n"
+#~ "选项：\n"
+#~ "  -d, --lastday 最近日期\t将最近一次密码设置时间设为“最近日期”\n"
+#~ "  -E, --expiredate 过期日期\t将帐户过期时间设为“过期日期”\n"
+#~ "  -h, --help\t\t\t显示此帮助信息并退出\n"
+#~ "  -I, --inactive INACITVE\t过期 INACTIVE 天数后，设定密码为失效状态\n"
+#~ "  -l, --list\t\t\t显示帐户年龄信息\n"
+#~ "  -m, --mindays 最小天数\t将两次改变密码之间相距的最小天数设为“最小天数”\n"
+#~ "  -M, --maxdays 最大天数\t将两次改变密码之间相距的最大天数设为“最大天数”\n"
+#~ "  -W, --warndays 警告天数\t将过期警告天数设为“警告天数”\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s：PAM 验证失败\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "用法：%s [-f 全名] [-r 房间号] [-w 工作电话]\n"
+#~ "\t[-h 家庭电话] [-o 其它] [用户]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr "用法：%s [-f 全名] [-r 房间号] [-w 工作电话] [-h 家庭电话]\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "用法：%s [选项]\n"
+#~ "\n"
+#~ "选项：\n"
+#~ "  -c, --crypt-method\t加密方法 (%s 中的一个)\n"
+#~ "  -e, --encrypted\t\t提供的密码是加密过的\n"
+#~ "  -h, --help\t\t\t显示此帮助信息然后推出\n"
+#~ "  -m, --md5\t\t\t使用 MD5 算法加密明文密码\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Usage: chsh [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "用法：chsh [选项] [登录]\n"
+#~ "\n"
+#~ "选项：\n"
+#~ "  -h, --help\t\t\t\t显示此帮助信息并退出\n"
+#~ "  -s, --shell SHELL\t\t\t该用户帐号的新登录 shell\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "用法：expiry {-f|-c}\n"
+
+#~ msgid "faillog: Failed to get the entry for UID %lu\n"
+#~ msgstr "登录失败：获取 UID %lu 的条目失败\n"
+
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "登录失败：无法打开 %s：%s\n"
+
+#~ msgid "faillog: Cannot get the size of %s: %s\n"
+#~ msgstr "登录失败：无法获取 %s 的大小：%s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "用法：groupdel 组\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "用法：%s [-r] [-s] [组 [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "用法：%s [-r] [-s] [组]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s：-s 和 -r 不兼容\n"
+
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "用法：grpconv\n"
+
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "用法：grpunconv\n"
+
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "用法：lastlog [选项]\n"
+#~ "\n"
+#~ "选项：\n"
+#~ "  -b, --before DAYS\t仅打印早于 DAYS 的最近登录记录\n"
+#~ "  -h, --help\t\t显示此帮助信息并退出\n"
+#~ "  -t, --time DAYS\t仅打印晚于 DAYS 的最近登录记录\n"
+#~ "  -u, --user LOGIN\t打印 LOGIN 用户的最近登录记录\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"
+#~ "  -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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\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\t\t\t报告所有帐户的密码状态\n"
+#~ "  -d, --delete\t\t\t删除指定帐户的密码\n"
+#~ "  -e, --expire\t\t\t强制使指定帐户的密码过期\n"
+#~ "  -h, --help\t\t\t显示此帮助信息并退出\n"
+#~ "  -k, --keep-tokens\t\t仅在过期后修改密码\n"
+#~ "  -i, --inactive INACTIVE\t密码过期后设置密码不活动为 INACTIVE\n"
+#~ "  -l, --lock\t\t\t锁定指定的帐户\n"
+#~ "  -n, --mindays MIN_DAYS\t设置到下次修改密码所须等待的最短天数\n"
+#~ "\t\t\t\t为 MIN_DAYS\n"
+#~ "  -q, --quiet\t\t\t安静模式\n"
+#~ "  -r, --repository REPOSITORY\t在 REPOSITORY 库中改变密码\n"
+#~ "  -S, --status\t\t\t报告指定帐户密码的状态\n"
+#~ "  -u, --unlock\t\t\t解锁被指定帐户\n"
+#~ "  -w, --warndays WARN_DAYS\t设置过期警告天数为 WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS\t设置到下次修改密码所须等待的最多天数\n"
+#~ "\t\t\t\t为 MAX_DAYS\n"
+#~ "\n"
+
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "用法：%s [-q] [-r] [passwd]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "用法：%s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "用法：pwconv\n"
+
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "用法：pwunconv\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "未知 id：%s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "没有 shell\n"
+
+#~ msgid ""
+#~ "Usage: userdel [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force removal of files,\n"
+#~ "                                even if not owned by user\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -r, --remove                  remove home directory and mail spool\n"
+#~ "\n"
+#~ msgstr ""
+#~ "用法：userdel [选项] 登录\n"
+#~ "\n"
+#~ "选项：\n"
+#~ "  -f, --force\t\t即使不属于此用户，也强制删除文件\n"
+#~ "  -h, --help\t\t显示此帮组文件并退出\n"
+#~ "  -r, --remove\t\t删除主目录和邮箱\n"
+#~ "\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s：用户 %s 目前已登录\n"
+
+#~ msgid ""
+#~ "Usage: usermod [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --comment COMMENT         new value of the GECOS field\n"
+#~ "  -d, --home HOME_DIR           new home directory for the user account\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP as new primary group\n"
+#~ "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+#~ "  -a, --append                  append the user to the supplemental "
+#~ "GROUPS\n"
+#~ "                                mentioned by the -G option without "
+#~ "removing\n"
+#~ "                                him/her from other groups\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --login NEW_LOGIN         new value of the login name\n"
+#~ "  -L, --lock                    lock the user account\n"
+#~ "  -m, --move-home               move contents of the home directory to "
+#~ "the\n"
+#~ "                                new location (use only with -d)\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "  -s, --shell SHELL             new login shell for the user account\n"
+#~ "  -u, --uid UID                 new UID for the user account\n"
+#~ "  -U, --unlock                  unlock the user account\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "用法：usermod [选项] 登录\n"
+#~ "\n"
+#~ "选项：\n"
+#~ "  -c, --comment 注释\t\tGECOS 字段的新值\n"
+#~ "  -d, --home HOME_DIR\t\t用户的新主目录\n"
+#~ "  -e, --expiredate EXPIRE_DATE\t设定帐户过期的日期为 EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE\t过期 INACTIVE 天数后，设定密码为失效状态\n"
+#~ "  -g, --gid GROUP\t\t强制使用 GROUP 为新主组\n"
+#~ "  -G, --groups GROUPS\t\t新的附加组列表 GROUPS\n"
+#~ "  -a, --append GROUP\t将用户追加至上边 -G 中提到的附加组中，\n"
+#~ "\t\t\t\t\t并不从其它组中删除此用户\n"
+#~ "  -h, --help\t\t\t显示此帮助信息并退出\n"
+#~ "  -l, --login LOGIN\t\t新的登录名称\n"
+#~ "  -L, --lock\t\t\t锁定用户帐号\n"
+#~ "  -m, --move-home\t\t将家目录内容移至新位置 (仅于 -d 一起使用)\n"
+#~ "  -o, --non-unique\t\t允许使用重复的(非唯一的) UID\n"
+#~ "  -p, --password PASSWORD\t将加密过的密码 (PASSWORD) 设为新密码\n"
+#~ "  -s, --shell SHELL\t\t用户帐号的新登录 shell\n"
+#~ "  -u, --uid UID\t\t\t用户帐号的新 UID\n"
+#~ "  -U, --unlock\t\t\t解锁用户帐号\n"
+#~ "%s\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s：没有指定标志\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Usage: vipw [options]\n"
@@ -2638,9 +3136,6 @@
 #~ 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"
 

Modified: upstream/trunk/po/zh_TW.po
===================================================================
--- upstream/trunk/po/zh_TW.po	2011-11-13 17:42:05 UTC (rev 3578)
+++ upstream/trunk/po/zh_TW.po	2011-11-13 18:21:43 UTC (rev 3579)
@@ -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: 2010-08-29 17:53+0200\n"
+"POT-Creation-Date: 2011-11-13 18:42+0100\n"
 "PO-Revision-Date: 2005-06-02 22:20+0800\n"
 "Last-Translator: Asho Yeh <asho at debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -40,6 +40,14 @@
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "配置錯誤 - 未知項目“%s”(請通知管理員)\n"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr ""
+
+#, c-format
+msgid "%s: nscd exited with status %d"
+msgstr ""
+
 msgid "Password: "
 msgstr "密碼："
 
@@ -224,6 +232,11 @@
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "failed to change mailbox owner"
+msgid "%s: failed to allocate memory: %s\n"
+msgstr "改變信箱所有者失敗"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
 msgstr "%s：無法獲取獨有的 gid\n"
 
@@ -308,6 +321,32 @@
 msgstr "“%s”的密碼不正確\n"
 
 #, c-format
+msgid "%s: multiple --root options\n"
+msgstr ""
+
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: invalid chroot path '%s'\n"
+msgstr "%s：無效的住家電話：“%s”\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot access chroot directory %s: %s\n"
+msgstr "%s：無法建立目錄 %s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: unable to chroot to directory %s: %s\n"
+msgstr "%s：無法建立目錄 %s\n"
+
+#, c-format
 msgid ""
 "Invalid ENCRYPT_METHOD value: '%s'.\n"
 "Defaulting to DES.\n"
@@ -336,45 +375,54 @@
 msgid "Unable to determine your tty name."
 msgstr "%s：無法確定您的使用者名稱。\n"
 
-#, c-format
-msgid "malloc(%d) failed\n"
-msgstr "malloc(%d) 失敗\n"
-
 #, fuzzy
 msgid "No"
 msgstr "取消"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: chage [options] [LOGIN]\n"
+"Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
+msgstr "用法：%s [輸入]\n"
+
+msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
+msgstr ""
+
+msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid "  -l, --list                    show account aging information\n"
+msgstr ""
+
+msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
+msgstr ""
+
+msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
+msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"\n"
 msgstr ""
-"用法：chage [選項] 使用者\n"
-"\n"
-"選項：\n"
-"  -d, --lastday LAST_DAY\t設定密碼的最後修改日期為 LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\t設定帳號過期的日期為 EXPIRE\n"
-"  -h, --help\t\t\t顯示這份說明文字然後結束\n"
-"  -I, --inactive INACTIVE\t設定密碼在 INACTIVE 天後失效\n"
-"  -l, --list\t\t\t顯示帳號期限的相關資訊\n"
-"  -m, --mindays MIN_DAYS\t最少必須相隔 MIN_DAYS 天才能改變密碼\n"
-"  -M, --maxdays MAX_DAYS\t最多必須相隔 MIN_DAYS 天才能改變密碼\n"
-"  -W, --warndays WARN_DAYS\t密碼在過期前 WARN_DAYS 天會發出警告\n"
-"\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "請輸入新值，或直接按 ENTER 鍵以使用預設值"
@@ -447,9 +495,9 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s：無法確定您的使用者名稱。\n"
 
-#, c-format
-msgid "%s: PAM authentication failed\n"
-msgstr "%s：PAM 驗証失敗\n"
+#, fuzzy, c-format
+msgid "%s: PAM: %s\n"
+msgstr "passwd：%s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: can't lock files, try again later\n"
@@ -473,10 +521,6 @@
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s：無法打開影子密碼文件\n"
 
-#, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist in %s\n"
 msgstr "%s：使用者 %s 不存在\n"
@@ -489,18 +533,32 @@
 msgid "%s: error changing fields\n"
 msgstr "%s：改變字段時出錯\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
-"\t[-h home_ph] [-o other] [user]\n"
+"Usage: %s [options] [LOGIN]\n"
+"\n"
+"Options:\n"
+msgstr "用法：%s [輸入]\n"
+
+msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
-"用法：%s [-f 全名] [-r 房間號] [-w 工作電話]\n"
-"\t[-h 住家電話] [-o 其它] [使用者]\n"
 
-#, 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"
+msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
+msgstr ""
 
+msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
+msgstr ""
+
+msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
+msgstr ""
+
+msgid "  -u, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
+msgstr ""
+
 msgid "Full Name"
 msgstr "全名"
 
@@ -576,24 +634,24 @@
 msgstr "%s：字段太長\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method            the crypt method (one of %s)\n"
-"  -e, --encrypted               supplied passwords are encrypted\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr "用法：%s [輸入]\n"
+
+#, c-format
+msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
+msgstr ""
+
+msgid "  -e, --encrypted               supplied passwords are encrypted\n"
+msgstr ""
+
+msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
-"%s\n"
 msgstr ""
-"用法：chpasswd [選項]\n"
-"\n"
-"選項：\n"
-"  -e, --encrypted\t所提供的密碼已經過加密\n"
-"  -h, --help\t\t顯示這份說明文字然後結束\n"
-"  -m,  --md5\t\t如果所提供的密碼沒有加密，則使用 MD5 加密法\n"
-"\t\t\t來替代 DES。\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -636,29 +694,6 @@
 msgstr "%s：發現錯誤，忽略更動\n"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "用法：%s [輸入]\n"
-
-#, c-format
-msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr ""
-
-msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr ""
-
-msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-
-msgid ""
-"  -m, --md5                     encrypt the clear text password using\n"
-"                                the MD5 algorithm\n"
-msgstr ""
-
-#, fuzzy, c-format
 msgid "%s: (line %d, user %s) password not changed\n"
 msgstr "%s：使用者 %s 不存在\n"
 
@@ -666,13 +701,7 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s：使用者 %s 不存在\n"
 
-msgid ""
-"Usage: chsh [options] [LOGIN]\n"
-"\n"
-"Options:\n"
-"  -h, --help                    display this help message and exit\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"\n"
+msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
 
 msgid "Login Shell"
@@ -706,9 +735,23 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s：警告：%s 不屬於 %s\n"
 
-msgid "Usage: expiry {-f|-c}\n"
-msgstr "用法：expiry {-f|-c}\n"
+msgid "  -c, --check                   check the user's password expiration\n"
+msgstr ""
 
+msgid ""
+"  -f, --force                   force password change if the user's "
+"password\n"
+"                                is expired\n"
+msgstr ""
+
+#, c-format
+msgid "%s: options %s and %s conflict\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: unexpected argument: %s\n"
+msgstr "%s：無效的數字參數“%s”\n"
+
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 
@@ -735,9 +778,10 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, c-format
-msgid "faillog: Failed to get the entry for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to get the entry for UID %lu\n"
+msgstr "%s：無法建立目錄 %s\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "登入        失敗     最多    最後                     在\n"
@@ -751,31 +795,29 @@
 msgid " [%lds lock]"
 msgstr " [鎖定 %lds]"
 
-#, c-format
-msgid "faillog: Failed to reset fail count for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to reset fail count for UID %lu\n"
+msgstr "%s：無法建立目錄 %s\n"
 
-#, c-format
-msgid "faillog: Failed to set max for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Failed to set max for UID %lu\n"
+msgstr "%s：無效的工作電話：“%s”\n"
 
-#, c-format
-msgid "faillog: Failed to set locktime for UID %lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: Failed to set locktime for UID %lu\n"
+msgstr "%s：無法建立目錄 %s\n"
 
 #, fuzzy, c-format
-msgid "lastlog: Unknown user or range: %s\n"
+msgid "%s: Unknown user or range: %s\n"
 msgstr "未知使用者：%s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot open file %s\n"
-msgid "faillog: Cannot open %s: %s\n"
-msgstr "%s：無法打開檔案 %s\n"
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot get the size of %s: %s\n"
+msgstr "%s：無法將目錄 %s 改名為 %s\n"
 
-#, c-format
-msgid "faillog: Cannot get the size of %s: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
 msgid ""
@@ -790,6 +832,9 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
 
+msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
+msgstr ""
+
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
@@ -916,8 +961,10 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-msgid "Usage: groupdel group\n"
-msgstr "用法：groupdel 群組\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot determine your user name.\n"
+msgid "%s: Cannot setup cleanup service.\n"
+msgstr "%s：無法確定您的使用者名稱。\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot rename directory %s to %s\n"
@@ -1020,16 +1067,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s：未知使用者：%s\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
-msgstr "用法：%s [-r] [-s] [群組 [gshadow]]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group [gshadow]]\n"
+"\n"
+"Options:\n"
+msgstr "用法：%s [輸入]\n"
 
-#, c-format
-msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "用法：%s [-r] [-s] [群組]\n"
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [group]\n"
+"\n"
+"Options:\n"
+msgstr "用法：%s [輸入]\n"
 
-#, c-format
-msgid "%s: -s and -r are incompatibile\n"
+msgid ""
+"  -r, --read-only               display errors and warnings\n"
+"                                but do not change files\n"
+msgstr ""
+
+msgid "  -s, --sort                    sort entries by UID\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
 msgstr "%s：-s 和 -r 是互不相容的\n"
 
 msgid "invalid group file entry"
@@ -1097,16 +1161,6 @@
 msgid "%s: no changes\n"
 msgstr "%s：無改變\n"
 
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpconv\n"
-msgstr "用法：groupdel 群組\n"
-
-#, fuzzy
-#| msgid "Usage: groupdel group\n"
-msgid "Usage: grpunconv\n"
-msgstr "用法：groupdel 群組\n"
-
 #, fuzzy, c-format
 #| msgid "%s: cannot update file %s\n"
 msgid "%s: cannot delete %s\n"
@@ -1121,28 +1175,17 @@
 msgid " groups="
 msgstr " 群組="
 
-#, fuzzy
 msgid ""
-"Usage: lastlog [options]\n"
-"\n"
-"Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-"  -h, --help                    display this help message and exit\n"
+msgstr ""
+
+msgid ""
 "  -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"
-"  -h, --help\t\t顯示這份說明文字然後結束\n"
-"  -t, --time DAYS\t只列出 DAYS 天內的歷史記錄\n"
-"  -u, --user LOGIN\t根據指定的 LOGIN 列出該使用者最後的歷史記錄\n"
-"\n"
 
-#, c-format
-msgid "lastlog: Failed to get the entry for UID %lu\n"
+msgid ""
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
 
 msgid "Username         Port     From             Latest"
@@ -1155,14 +1198,6 @@
 msgstr "**從未登入過**"
 
 #, 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"
 
@@ -1239,6 +1274,11 @@
 msgid "Login incorrect"
 msgstr "登入錯誤"
 
+#, fuzzy, c-format
+#| msgid "%s: line %d: cannot find user %s\n"
+msgid "Cannot find user (%s)\n"
+msgstr "%s：第 %d 行：無法找到使用者 %s\n"
+
 #, c-format
 msgid ""
 "\n"
@@ -1359,43 +1399,59 @@
 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"
+msgstr ""
+
+msgid ""
 "  -d, --delete                  delete the password for the named account\n"
+msgstr ""
+
+msgid ""
 "  -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"
+msgstr ""
+
+msgid "  -k, --keep-tokens             change password only if expired\n"
+msgstr ""
+
+msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
+msgstr ""
+
+msgid ""
 "  -l, --lock                    lock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-"  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid "  -q, --quiet                   quiet mode\n"
+msgstr ""
+
+msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+msgstr ""
+
+msgid ""
 "  -S, --status                  report password status on the named account\n"
+msgstr ""
+
+msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
+msgstr ""
+
+msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+msgstr ""
+
+msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-"\n"
 msgstr ""
-"用法：chage [選項] 使用者\n"
-"\n"
-"選項：\n"
-"  -d, --lastday LAST_DAY\t設定密碼的最後修改日期為 LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\t設定帳號過期的日期為 EXPIRE\n"
-"  -h, --help\t\t\t顯示這份說明文字然後結束\n"
-"  -I, --inactive INACTIVE\t設定密碼在 INACTIVE 天後失效\n"
-"  -l, --list\t\t\t顯示帳號期限的相關資訊\n"
-"  -m, --mindays MIN_DAYS\t最少必須相隔 MIN_DAYS 天才能改變密碼\n"
-"  -M, --maxdays MAX_DAYS\t最多必須相隔 MIN_DAYS 天才能改變密碼\n"
-"  -W, --warndays WARN_DAYS\t密碼在過期前 WARN_DAYS 天會發出警告\n"
-"\n"
 
 msgid "Old password: "
 msgstr "舊密碼："
@@ -1478,19 +1534,24 @@
 msgstr "密碼過期警告"
 
 #, fuzzy, c-format
-#| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgid "Usage: %s [-q] [-r] [passwd]\n"
-msgstr "用法：%s [-q] [-r] [-s] [passwd [shadow]]\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd]\n"
+"\n"
+"Options:\n"
+msgstr "用法：%s [輸入]\n"
 
-#, c-format
-msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "用法：%s [-q] [-r] [-s] [passwd [shadow]]\n"
-
 #, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
-msgid "%s: -s and -r are incompatible\n"
-msgstr "%s：-s 和 -r 是互不相容的\n"
+#| msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [passwd [shadow]]\n"
+"\n"
+"Options:\n"
+msgstr "用法：%s [輸入]\n"
 
+msgid "  -q, --quiet                   report errors only\n"
+msgstr ""
+
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
 msgstr ""
@@ -1573,11 +1634,6 @@
 msgid "%s: cannot sort entries in %s\n"
 msgstr "%s：無法打開檔案 %s\n"
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwconv\n"
-msgstr "用法：id\n"
-
 #, fuzzy, c-format
 #| msgid "%s: can't re-write file\n"
 msgid "%s: can't work with tcb enabled\n"
@@ -1587,11 +1643,6 @@
 msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "Usage: id\n"
-msgid "Usage: pwunconv\n"
-msgstr "用法：id\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "su 到該帳戶被拒。\n"
 
@@ -1645,32 +1696,20 @@
 msgstr ""
 
 #, c-format
-msgid "%s: must be run from a terminal\n"
-msgstr "%s：必須從終端中執行\n"
+msgid ""
+"%s: %s\n"
+"(Ignored)\n"
+msgstr ""
+"%s：%s\n"
+"(忽略)\n"
 
 #, c-format
-msgid "%s: pam_start: error %d\n"
-msgstr "%s：pam_start：錯誤 %d\n"
-
-#, c-format
-msgid "Unknown id: %s\n"
-msgstr "未知 id：%s\n"
-
-#, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "您沒有被授權 su %s\n"
 
 msgid "(Enter your own password)"
 msgstr "(請輸入您自己的密碼)"
 
-#, c-format
-msgid ""
-"%s: %s\n"
-"(Ignored)\n"
-msgstr ""
-"%s：%s\n"
-"(忽略)\n"
-
 #, fuzzy, c-format
 #| msgid "%s: PAM authentication failed\n"
 msgid "%s: Authentication failure\n"
@@ -1681,9 +1720,29 @@
 msgid "%s: You are not authorized to su at that time\n"
 msgstr "您沒有被授權 su %s\n"
 
-msgid "No shell\n"
-msgstr "沒有 shell\n"
+#, fuzzy, c-format
+#| msgid "No password entry for 'root'"
+msgid "No passwd entry for user '%s'\n"
+msgstr "沒有“root”的密碼項目"
 
+#, c-format
+msgid "%s: must be run from a terminal\n"
+msgstr "%s：必須從終端中執行\n"
+
+#, c-format
+msgid "%s: pam_start: error %d\n"
+msgstr "%s：pam_start：錯誤 %d\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: Cannot drop the controlling terminal\n"
+msgstr "%s：無法將目錄 %s 改名為 %s\n"
+
+#, fuzzy, c-format
+#| msgid "Cannot execute %s"
+msgid "Cannot execute %s\n"
+msgstr "無法執行 %s"
+
 msgid "No password file"
 msgstr "沒有密碼檔案"
 
@@ -1728,7 +1787,7 @@
 
 #, fuzzy, c-format
 #| msgid "%s: rename: %s"
-msgid "%s: rename: %s: %s"
+msgid "%s: rename: %s: %s\n"
 msgstr "%s：更名：%s"
 
 #, fuzzy, c-format
@@ -1743,6 +1802,8 @@
 #| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: %s [options] LOGIN\n"
+"       %s -D\n"
+"       %s -D [options]\n"
 "\n"
 "Options:\n"
 msgstr "用法：%s [輸入]\n"
@@ -1860,10 +1921,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: options %s and %s conflict\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
@@ -1924,21 +1981,31 @@
 msgstr ""
 
 msgid ""
-"Usage: userdel [options] LOGIN\n"
-"\n"
-"Options:\n"
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
-"  -h, --help                    display this help message and exit\n"
-"  -r, --remove                  remove home directory and mail spool\n"
-"\n"
 msgstr ""
 
+msgid "  -r, --remove                  remove home directory and mail spool\n"
+msgstr ""
+
 #, fuzzy, c-format
+msgid ""
+"%s: group %s not removed because it is not the primary group of user %s.\n"
+msgstr "%s：不能在 NIS 用戶端上修改使用者“%s”。\n"
+
+#, c-format
+msgid "%s: group %s not removed because it has other members.\n"
+msgstr ""
+
+#, fuzzy, c-format
 msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr "%s：不能刪除使用者的主群組。\n"
 
 #, fuzzy, c-format
+msgid "%s: %s mail spool (%s) not found\n"
+msgstr "%s：無效的主目錄“%s”\n"
+
+#, fuzzy, c-format
 #| msgid "%s: warning: can't remove "
 msgid "%s: warning: can't remove %s: %s\n"
 msgstr "%s：警告：無法刪除"
@@ -1970,10 +2037,6 @@
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s：使用者 %s 是 NIS 使用者\n"
 
-#, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr "%s：使用者 %s 目前已登入\n"
-
 #, fuzzy, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s：無效的主目錄“%s”\n"
@@ -1986,34 +2049,59 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s：刪除目錄 %s 時出錯\n"
 
-#, c-format
+msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
+msgstr ""
+
 msgid ""
-"Usage: usermod [options] LOGIN\n"
-"\n"
-"Options:\n"
-"  -c, --comment COMMENT         new value of the GECOS field\n"
 "  -d, --home HOME_DIR           new home directory for the user account\n"
+msgstr ""
+
+msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+msgstr ""
+
+msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP as new primary group\n"
-"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
+msgstr ""
+
+msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+msgstr ""
+
+msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --login NEW_LOGIN         new value of the login name\n"
-"  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
+msgstr ""
+
+msgid "  -L, --lock                    lock the user account\n"
+msgstr ""
+
+msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
+msgstr ""
+
+msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+msgstr ""
+
+msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-"  -s, --shell SHELL             new login shell for the user account\n"
-"  -u, --uid UID                 new UID for the user account\n"
-"  -U, --unlock                  unlock the user account\n"
-"%s\n"
 msgstr ""
 
+msgid "  -u, --uid UID                 new UID for the user account\n"
+msgstr ""
+
+msgid "  -U, --unlock                  unlock the user account\n"
+msgstr ""
+
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
@@ -2030,19 +2118,20 @@
 msgid "%s: user '%s' already exists in %s\n"
 msgstr "%s：使用者 %s 已存在\n"
 
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: no options\n"
+msgstr "%s：無法打開檔案 %s\n"
+
 #, c-format
-msgid "%s: no flags given\n"
-msgstr "%s：沒有指定標誌\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s：-e 和 -f 參數需要shadow密碼\n"
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr ""
-
-#, c-format
 msgid "%s: UID '%lu' already exists\n"
 msgstr ""
 
@@ -2108,9 +2197,6 @@
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
 
-msgid "  -q, --quiet                   quiet mode\n"
-msgstr ""
-
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
 
@@ -2188,8 +2274,203 @@
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s：無效的主目錄“%s”\n"
 
+#~ msgid "malloc(%d) failed\n"
+#~ msgstr "malloc(%d) 失敗\n"
+
 #, fuzzy
 #~ msgid ""
+#~ "Usage: chage [options] [LOGIN]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -d, --lastday LAST_DAY        set date of last password change to "
+#~ "LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -I, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -l, --list                    show account aging information\n"
+#~ "  -m, --mindays MIN_DAYS        set minimum number of days before "
+#~ "password\n"
+#~ "                                change to MIN_DAYS\n"
+#~ "  -M, --maxdays MAX_DAYS        set maximim number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "用法：chage [選項] 使用者\n"
+#~ "\n"
+#~ "選項：\n"
+#~ "  -d, --lastday LAST_DAY\t設定密碼的最後修改日期為 LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE\t設定帳號過期的日期為 EXPIRE\n"
+#~ "  -h, --help\t\t\t顯示這份說明文字然後結束\n"
+#~ "  -I, --inactive INACTIVE\t設定密碼在 INACTIVE 天後失效\n"
+#~ "  -l, --list\t\t\t顯示帳號期限的相關資訊\n"
+#~ "  -m, --mindays MIN_DAYS\t最少必須相隔 MIN_DAYS 天才能改變密碼\n"
+#~ "  -M, --maxdays MAX_DAYS\t最多必須相隔 MIN_DAYS 天才能改變密碼\n"
+#~ "  -W, --warndays WARN_DAYS\t密碼在過期前 WARN_DAYS 天會發出警告\n"
+#~ "\n"
+
+#~ msgid "%s: PAM authentication failed\n"
+#~ msgstr "%s：PAM 驗証失敗\n"
+
+#~ msgid ""
+#~ "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
+#~ "\t[-h home_ph] [-o other] [user]\n"
+#~ msgstr ""
+#~ "用法：%s [-f 全名] [-r 房間號] [-w 工作電話]\n"
+#~ "\t[-h 住家電話] [-o 其它] [使用者]\n"
+
+#~ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
+#~ msgstr "用法：%s [-f 全名] [-r 房間號] [-w 工作電話] [-h 住家電話]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -c, --crypt-method            the crypt method (one of %s)\n"
+#~ "  -e, --encrypted               supplied passwords are encrypted\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -m, --md5                     encrypt the clear text password using\n"
+#~ "                                the MD5 algorithm\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "用法：chpasswd [選項]\n"
+#~ "\n"
+#~ "選項：\n"
+#~ "  -e, --encrypted\t所提供的密碼已經過加密\n"
+#~ "  -h, --help\t\t顯示這份說明文字然後結束\n"
+#~ "  -m,  --md5\t\t如果所提供的密碼沒有加密，則使用 MD5 加密法\n"
+#~ "\t\t\t來替代 DES。\n"
+
+#~ msgid "Usage: expiry {-f|-c}\n"
+#~ msgstr "用法：expiry {-f|-c}\n"
+
+#, fuzzy
+#~| msgid "%s: cannot open file %s\n"
+#~ msgid "faillog: Cannot open %s: %s\n"
+#~ msgstr "%s：無法打開檔案 %s\n"
+
+#~ msgid "Usage: groupdel group\n"
+#~ msgstr "用法：groupdel 群組\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
+#~ msgstr "用法：%s [-r] [-s] [群組 [gshadow]]\n"
+
+#~ msgid "Usage: %s [-r] [-s] [group]\n"
+#~ msgstr "用法：%s [-r] [-s] [群組]\n"
+
+#~ msgid "%s: -s and -r are incompatibile\n"
+#~ msgstr "%s：-s 和 -r 是互不相容的\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpconv\n"
+#~ msgstr "用法：groupdel 群組\n"
+
+#, fuzzy
+#~| msgid "Usage: groupdel group\n"
+#~ msgid "Usage: grpunconv\n"
+#~ msgstr "用法：groupdel 群組\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: lastlog [options]\n"
+#~ "\n"
+#~ "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"
+#~ "  -u, --user LOGIN              print lastlog record of the specified "
+#~ "LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "用法：lastlog [選項]\n"
+#~ "\n"
+#~ "選項：\n"
+#~ "  -h, --help\t\t顯示這份說明文字然後結束\n"
+#~ "  -t, --time DAYS\t只列出 DAYS 天內的歷史記錄\n"
+#~ "  -u, --user LOGIN\t根據指定的 LOGIN 列出該使用者最後的歷史記錄\n"
+#~ "\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 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 password of the named account\n"
+#~ "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#~ "  -x, --maxdays MAX_DAYS        set maximum number of days before "
+#~ "password\n"
+#~ "                                change to MAX_DAYS\n"
+#~ "\n"
+#~ msgstr ""
+#~ "用法：chage [選項] 使用者\n"
+#~ "\n"
+#~ "選項：\n"
+#~ "  -d, --lastday LAST_DAY\t設定密碼的最後修改日期為 LAST_DAY\n"
+#~ "  -E, --expiredate EXPIRE_DATE\t設定帳號過期的日期為 EXPIRE\n"
+#~ "  -h, --help\t\t\t顯示這份說明文字然後結束\n"
+#~ "  -I, --inactive INACTIVE\t設定密碼在 INACTIVE 天後失效\n"
+#~ "  -l, --list\t\t\t顯示帳號期限的相關資訊\n"
+#~ "  -m, --mindays MIN_DAYS\t最少必須相隔 MIN_DAYS 天才能改變密碼\n"
+#~ "  -M, --maxdays MAX_DAYS\t最多必須相隔 MIN_DAYS 天才能改變密碼\n"
+#~ "  -W, --warndays WARN_DAYS\t密碼在過期前 WARN_DAYS 天會發出警告\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgid "Usage: %s [-q] [-r] [passwd]\n"
+#~ msgstr "用法：%s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#~ msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
+#~ msgstr "用法：%s [-q] [-r] [-s] [passwd [shadow]]\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwconv\n"
+#~ msgstr "用法：id\n"
+
+#, fuzzy
+#~| msgid "Usage: id\n"
+#~ msgid "Usage: pwunconv\n"
+#~ msgstr "用法：id\n"
+
+#~ msgid "Unknown id: %s\n"
+#~ msgstr "未知 id：%s\n"
+
+#~ msgid "No shell\n"
+#~ msgstr "沒有 shell\n"
+
+#~ msgid "%s: user %s is currently logged in\n"
+#~ msgstr "%s：使用者 %s 目前已登入\n"
+
+#~ msgid "%s: no flags given\n"
+#~ msgstr "%s：沒有指定標誌\n"
+
+#, fuzzy
+#~ msgid ""
 #~ "Usage: vipw [options]\n"
 #~ "\n"
 #~ "Options:\n"
@@ -2550,9 +2831,6 @@
 #~ 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"