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

nekral-guest at alioth.debian.org nekral-guest at alioth.debian.org
Sun Nov 25 21:28:27 UTC 2007


Author: nekral-guest
Date: 2007-11-25 21:28:26 +0000 (Sun, 25 Nov 2007)
New Revision: 1465

Added:
   upstream/trunk/man/po/LINGUAS
Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/man/po/de.po
   upstream/trunk/man/po/fr.po
   upstream/trunk/man/po/it.po
   upstream/trunk/man/po/pl.po
   upstream/trunk/man/po/ru.po
   upstream/trunk/man/po/sv.po
Log:
* man/po/LINGUAS: Added missing LINGUAS.
* man/po/de.po, man/po/fr.po, man/po/it.po, man/po/pl.po,
  man/po/ru.po, man/po/sv.po: Updated.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-25 21:06:49 UTC (rev 1464)
+++ upstream/trunk/ChangeLog	2007-11-25 21:28:26 UTC (rev 1465)
@@ -1,5 +1,11 @@
 2007-11-25  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* man/po/LINGUAS: Added missing LINGUAS.
+	* man/po/de.po, man/po/fr.po, man/po/it.po, man/po/pl.po,
+	man/po/ru.po, man/po/sv.po: Updated.
+
+2007-11-25  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* configure.in, man/po/Makefile.in.in, man/po/Makevars,
 	man/po/POTFILES.in, man/Makefile.am: Generate the PO files for the
 	manpages in the man/po directory (instead of man/<lang>). Use a

Added: upstream/trunk/man/po/LINGUAS
===================================================================
--- upstream/trunk/man/po/LINGUAS	                        (rev 0)
+++ upstream/trunk/man/po/LINGUAS	2007-11-25 21:28:26 UTC (rev 1465)
@@ -0,0 +1,6 @@
+de
+fr
+it
+pl
+ru
+sv

Modified: upstream/trunk/man/po/de.po
===================================================================
--- upstream/trunk/man/po/de.po	2007-11-25 21:06:49 UTC (rev 1464)
+++ upstream/trunk/man/po/de.po	2007-11-25 21:28:26 UTC (rev 1465)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow-man-pages\n"
-"POT-Creation-Date: 2007-11-10 23:24+0100\n"
+"POT-Creation-Date: 2007-11-25 20:28+0100\n"
 "PO-Revision-Date: 2007-06-11 10:16+0200\n"
 "Last-Translator: Simon Brandmair <sbrandmair at gmx.net>\n"
 "Language-Team: debian-l10n-german <http://lists.debian.org/debian-l10n-"
@@ -75,7 +75,7 @@
 #: login.access.5.xml:15(title) login.1.xml:36(title) limits.5.xml:16(title)
 #: lastlog.8.xml:24(title) gshadow.5.xml:15(title) grpck.8.xml:25(title)
 #: groups.1.xml:24(title) groupmod.8.xml:25(title) groupmems.8.xml:27(title)
-#: groupdel.8.xml:24(title) groupadd.8.xml:30(title) gpasswd.1.xml:27(title)
+#: groupdel.8.xml:24(title) groupadd.8.xml:30(title) gpasswd.1.xml:32(title)
 #: faillog.8.xml:24(title) faillog.5.xml:15(title) expiry.1.xml:23(title)
 #: chsh.1.xml:27(title) chpasswd.8.xml:24(title) chgpasswd.8.xml:24(title)
 #: chfn.1.xml:27(title) chage.1.xml:26(title)
@@ -110,8 +110,8 @@
 #: useradd.8.xml:48(title) su.1.xml:74(title) pwck.8.xml:96(title)
 #: passwd.1.xml:140(title) login.1.xml:119(title) lastlog.8.xml:36(title)
 #: grpck.8.xml:69(title) groupmod.8.xml:34(title) groupmems.8.xml:42(title)
-#: groupadd.8.xml:39(title) gpasswd.1.xml:58(title) faillog.8.xml:35(title)
-#: chsh.1.xml:38(title) chpasswd.8.xml:46(title) chgpasswd.8.xml:45(title)
+#: groupadd.8.xml:39(title) gpasswd.1.xml:72(title) faillog.8.xml:35(title)
+#: chsh.1.xml:38(title) chpasswd.8.xml:52(title) chgpasswd.8.xml:51(title)
 #: chage.1.xml:36(title)
 msgid "OPTIONS"
 msgstr "OPTIONEN"
@@ -132,17 +132,17 @@
 msgid "Edit group database."
 msgstr "Bearbeitet die Gruppen-Datenbank."
 
-#: vipw.8.xml:64(term) userdel.8.xml:63(term) useradd.8.xml:164(term)
+#: vipw.8.xml:64(term) userdel.8.xml:63(term) useradd.8.xml:165(term)
 #: passwd.1.xml:180(term) lastlog.8.xml:52(term) groupmod.8.xml:60(term)
 #: groupadd.8.xml:74(term) faillog.8.xml:48(term) chsh.1.xml:44(term)
-#: chpasswd.8.xml:59(term) chgpasswd.8.xml:58(term) chage.1.xml:74(term)
+#: chpasswd.8.xml:75(term) chgpasswd.8.xml:74(term) chage.1.xml:74(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
-#: vipw.8.xml:66(para) userdel.8.xml:65(para) useradd.8.xml:166(para)
+#: vipw.8.xml:66(para) userdel.8.xml:65(para) useradd.8.xml:167(para)
 #: passwd.1.xml:182(para) lastlog.8.xml:56(para) groupmod.8.xml:62(para)
 #: groupadd.8.xml:76(para) faillog.8.xml:50(para) chsh.1.xml:46(para)
-#: chpasswd.8.xml:61(para) chgpasswd.8.xml:60(para) chage.1.xml:76(para)
+#: chpasswd.8.xml:77(para) chgpasswd.8.xml:76(para) chage.1.xml:76(para)
 msgid "Display help message and exit."
 msgstr "Zeigt die Hilfe an und beendet das Programm."
 
@@ -154,11 +154,11 @@
 msgid "Edit passwd database."
 msgstr "Bearbeitet die Passwd-Datenbank."
 
-#: vipw.8.xml:76(term) passwd.1.xml:234(term)
+#: vipw.8.xml:76(term) passwd.1.xml:235(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:78(para) passwd.1.xml:238(para)
+#: vipw.8.xml:78(para) passwd.1.xml:239(para)
 msgid "Quiet mode."
 msgstr "Stiller Modus."
 
@@ -170,107 +170,116 @@
 msgid "Edit shadow or gshadow database."
 msgstr "Bearbeitet die Shadow- oder Gshadow-Datenbank."
 
-#: vipw.8.xml:91(title) usermod.8.xml:246(title) userdel.8.xml:89(title)
-#: useradd.8.xml:370(title) suauth.5.xml:139(title) su.1.xml:176(title)
+#: vipw.8.xml:91(title) usermod.8.xml:260(title) userdel.8.xml:89(title)
+#: useradd.8.xml:371(title) suauth.5.xml:139(title) su.1.xml:176(title)
 #: sg.1.xml:43(title) shadow.5.xml:105(title) shadow.3.xml:172(title)
 #: pwconv.8.xml:109(title) pwck.8.xml:145(title) porttime.5.xml:76(title)
-#: passwd.5.xml:87(title) passwd.1.xml:322(title) newusers.8.xml:90(title)
+#: passwd.5.xml:87(title) passwd.1.xml:324(title) newusers.8.xml:96(title)
 #: newgrp.1.xml:54(title) logoutd.8.xml:35(title) login.access.5.xml:66(title)
 #: login.1.xml:198(title) limits.5.xml:110(title) lastlog.8.xml:113(title)
 #: gshadow.5.xml:61(title) grpck.8.xml:87(title) groups.1.xml:46(title)
 #: groupmod.8.xml:92(title) groupmems.8.xml:103(title)
-#: groupdel.8.xml:43(title) groupadd.8.xml:114(title) gpasswd.1.xml:147(title)
+#: groupdel.8.xml:43(title) groupadd.8.xml:114(title) gpasswd.1.xml:178(title)
 #: faillog.8.xml:132(title) faillog.5.xml:38(title) expiry.1.xml:32(title)
-#: chsh.1.xml:85(title) chfn.1.xml:60(title) chage.1.xml:177(title)
+#: chsh.1.xml:85(title) chpasswd.8.xml:248(title) chgpasswd.8.xml:125(title)
+#: chfn.1.xml:60(title) chage.1.xml:177(title)
 msgid "FILES"
 msgstr "DATEIEN"
 
-#: vipw.8.xml:94(filename) usermod.8.xml:249(filename)
-#: userdel.8.xml:92(filename) useradd.8.xml:385(filename)
-#: sg.1.xml:58(filename) pwck.8.xml:148(filename) newgrp.1.xml:69(filename)
-#: gshadow.5.xml:64(filename) grpck.8.xml:90(filename)
-#: groups.1.xml:49(filename) groupmod.8.xml:95(filename)
-#: groupmems.8.xml:106(filename) groupdel.8.xml:46(filename)
-#: groupadd.8.xml:117(filename) gpasswd.1.xml:11(filename)
-#: gpasswd.1.xml:150(filename)
+#: vipw.8.xml:94(filename) usermod.8.xml:263(filename)
+#: userdel.8.xml:92(filename) useradd.8.xml:386(filename)
+#: sg.1.xml:58(filename) pwck.8.xml:148(filename) newusers.8.xml:111(filename)
+#: newgrp.1.xml:69(filename) gshadow.5.xml:64(filename)
+#: grpck.8.xml:90(filename) groups.1.xml:49(filename)
+#: groupmod.8.xml:95(filename) groupmems.8.xml:106(filename)
+#: groupdel.8.xml:46(filename) groupadd.8.xml:117(filename)
+#: gpasswd.1.xml:12(filename) gpasswd.1.xml:181(filename)
+#: chgpasswd.8.xml:128(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
-#: vipw.8.xml:96(para) usermod.8.xml:251(para) userdel.8.xml:94(para)
-#: useradd.8.xml:387(para) sg.1.xml:60(para) pwck.8.xml:150(para)
-#: newgrp.1.xml:71(para) gshadow.5.xml:66(para) grpck.8.xml:92(para)
-#: groups.1.xml:51(para) groupmod.8.xml:97(para) groupmems.8.xml:108(para)
-#: groupdel.8.xml:48(para) groupadd.8.xml:119(para) gpasswd.1.xml:152(para)
+#: vipw.8.xml:96(para) usermod.8.xml:265(para) userdel.8.xml:94(para)
+#: useradd.8.xml:388(para) sg.1.xml:60(para) pwck.8.xml:150(para)
+#: newusers.8.xml:113(para) newgrp.1.xml:71(para) gshadow.5.xml:66(para)
+#: grpck.8.xml:92(para) groups.1.xml:51(para) groupmod.8.xml:97(para)
+#: groupmems.8.xml:108(para) groupdel.8.xml:48(para) groupadd.8.xml:119(para)
+#: gpasswd.1.xml:183(para) chgpasswd.8.xml:130(para)
 msgid "Group account information."
 msgstr "Informationen zu den Gruppenkonten."
 
-#: vipw.8.xml:100(filename) sg.1.xml:64(filename) newgrp.1.xml:75(filename)
-#: gshadow.5.xml:70(filename) grpck.8.xml:96(filename)
-#: groupmod.8.xml:101(filename) groupmems.8.xml:112(filename)
-#: groupdel.8.xml:52(filename) groupadd.8.xml:123(filename)
-#: gpasswd.1.xml:156(filename)
+#: vipw.8.xml:100(filename) sg.1.xml:64(filename) newusers.8.xml:117(filename)
+#: newgrp.1.xml:75(filename) gshadow.5.xml:70(filename)
+#: grpck.8.xml:96(filename) groupmod.8.xml:101(filename)
+#: groupmems.8.xml:112(filename) groupdel.8.xml:52(filename)
+#: groupadd.8.xml:123(filename) gpasswd.1.xml:13(filename)
+#: gpasswd.1.xml:187(filename) chgpasswd.8.xml:134(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
 # type: Plain text
-#: vipw.8.xml:102(para) sg.1.xml:66(para) newgrp.1.xml:77(para)
-#: gshadow.5.xml:72(para) grpck.8.xml:98(para) groupmod.8.xml:103(para)
-#: groupdel.8.xml:54(para) groupadd.8.xml:125(para) gpasswd.1.xml:158(para)
+#: vipw.8.xml:102(para) sg.1.xml:66(para) newusers.8.xml:119(para)
+#: newgrp.1.xml:77(para) gshadow.5.xml:72(para) grpck.8.xml:98(para)
+#: groupmod.8.xml:103(para) groupdel.8.xml:54(para) groupadd.8.xml:125(para)
+#: gpasswd.1.xml:189(para) chgpasswd.8.xml:136(para)
 msgid "Secure group account information."
 msgstr "Verschlüsselte Informationen zu den Gruppenkonten."
 
-#: vipw.8.xml:106(filename) usermod.8.xml:255(filename)
-#: userdel.8.xml:104(filename) useradd.8.xml:373(filename)
+#: vipw.8.xml:106(filename) usermod.8.xml:269(filename)
+#: userdel.8.xml:104(filename) useradd.8.xml:374(filename)
 #: su.1.xml:179(filename) sg.1.xml:46(filename) shadow.5.xml:108(filename)
 #: pwck.8.xml:154(filename) passwd.5.xml:90(filename)
-#: passwd.1.xml:325(filename) newgrp.1.xml:57(filename)
-#: login.1.xml:213(filename) grpck.8.xml:102(filename)
-#: expiry.1.xml:35(filename) chsh.1.xml:88(filename) chfn.1.xml:69(filename)
+#: passwd.1.xml:327(filename) newusers.8.xml:99(filename)
+#: newgrp.1.xml:57(filename) login.1.xml:213(filename)
+#: grpck.8.xml:102(filename) expiry.1.xml:35(filename) chsh.1.xml:88(filename)
+#: chpasswd.8.xml:251(filename) chfn.1.xml:69(filename)
 #: chage.1.xml:181(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
-#: vipw.8.xml:108(para) usermod.8.xml:257(para) userdel.8.xml:106(para)
-#: useradd.8.xml:375(para) su.1.xml:181(para) sg.1.xml:48(para)
+#: vipw.8.xml:108(para) usermod.8.xml:271(para) userdel.8.xml:106(para)
+#: useradd.8.xml:376(para) su.1.xml:181(para) sg.1.xml:48(para)
 #: shadow.5.xml:110(para) pwck.8.xml:156(para) passwd.5.xml:92(para)
-#: passwd.1.xml:327(para) newgrp.1.xml:59(para) login.1.xml:215(para)
-#: grpck.8.xml:104(para) expiry.1.xml:37(para) chsh.1.xml:90(para)
-#: chfn.1.xml:71(para) chage.1.xml:184(para)
+#: passwd.1.xml:329(para) newusers.8.xml:101(para) newgrp.1.xml:59(para)
+#: login.1.xml:215(para) grpck.8.xml:104(para) expiry.1.xml:37(para)
+#: chsh.1.xml:90(para) chpasswd.8.xml:253(para) chfn.1.xml:71(para)
+#: chage.1.xml:184(para)
 msgid "User account information."
 msgstr "Informationen zu den Benutzerkonten."
 
-#: vipw.8.xml:112(filename) usermod.8.xml:261(filename)
-#: userdel.8.xml:110(filename) useradd.8.xml:379(filename)
+#: vipw.8.xml:112(filename) usermod.8.xml:275(filename)
+#: userdel.8.xml:110(filename) useradd.8.xml:380(filename)
 #: su.1.xml:185(filename) sg.1.xml:52(filename) shadow.5.xml:114(filename)
 #: shadow.3.xml:175(filename) pwck.8.xml:160(filename)
-#: passwd.5.xml:96(filename) passwd.1.xml:331(filename)
-#: newgrp.1.xml:63(filename) login.1.xml:219(filename)
-#: expiry.1.xml:41(filename) chage.1.xml:189(filename)
+#: passwd.5.xml:96(filename) passwd.1.xml:333(filename)
+#: newusers.8.xml:105(filename) newgrp.1.xml:63(filename)
+#: login.1.xml:219(filename) expiry.1.xml:41(filename)
+#: chpasswd.8.xml:257(filename) chage.1.xml:189(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
 # type: Plain text
-#: vipw.8.xml:114(para) usermod.8.xml:263(para) userdel.8.xml:112(para)
-#: useradd.8.xml:381(para) su.1.xml:187(para) sg.1.xml:54(para)
+#: vipw.8.xml:114(para) usermod.8.xml:277(para) userdel.8.xml:112(para)
+#: useradd.8.xml:382(para) su.1.xml:187(para) sg.1.xml:54(para)
 #: shadow.5.xml:116(para) shadow.3.xml:177(para) pwck.8.xml:162(para)
-#: passwd.1.xml:333(para) newgrp.1.xml:65(para) login.1.xml:221(para)
-#: expiry.1.xml:43(para) chage.1.xml:192(para)
+#: passwd.1.xml:335(para) newusers.8.xml:107(para) newgrp.1.xml:65(para)
+#: login.1.xml:221(para) expiry.1.xml:43(para) chpasswd.8.xml:259(para)
+#: chage.1.xml:192(para)
 msgid "Secure user account information."
 msgstr "Verschlüsselte Informationen zu den Benutzerkonten."
 
-#: vipw.8.xml:120(title) usermod.8.xml:270(title) userdel.8.xml:191(title)
-#: useradd.8.xml:481(title) suauth.5.xml:168(title) su.1.xml:194(title)
+#: vipw.8.xml:120(title) usermod.8.xml:284(title) userdel.8.xml:191(title)
+#: useradd.8.xml:482(title) suauth.5.xml:168(title) su.1.xml:194(title)
 #: sg.1.xml:73(title) shadow.5.xml:123(title) shadow.3.xml:184(title)
 #: pwconv.8.xml:121(title) pwck.8.xml:169(title) porttime.5.xml:88(title)
-#: passwd.5.xml:105(title) passwd.1.xml:391(title) nologin.8.xml:35(title)
-#: newusers.8.xml:102(title) newgrp.1.xml:84(title)
-#: login.defs.5.xml:256(title) login.access.5.xml:78(title)
+#: passwd.5.xml:105(title) passwd.1.xml:393(title) nologin.8.xml:35(title)
+#: newusers.8.xml:132(title) newgrp.1.xml:84(title)
+#: login.defs.5.xml:412(title) login.access.5.xml:78(title)
 #: login.1.xml:252(title) limits.5.xml:120(title) gshadow.5.xml:79(title)
 #: grpck.8.xml:111(title) groups.1.xml:58(title) groupmod.8.xml:161(title)
 #: groupmems.8.xml:121(title) groupdel.8.xml:100(title)
-#: groupadd.8.xml:197(title) gpasswd.1.xml:165(title) faillog.8.xml:144(title)
+#: groupadd.8.xml:204(title) gpasswd.1.xml:196(title) faillog.8.xml:144(title)
 #: faillog.5.xml:50(title) expiry.1.xml:50(title) chsh.1.xml:109(title)
-#: chpasswd.8.xml:85(title) chgpasswd.8.xml:84(title) chfn.1.xml:78(title)
+#: chpasswd.8.xml:272(title) chgpasswd.8.xml:149(title) chfn.1.xml:78(title)
 #: chage.1.xml:232(title)
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
@@ -296,7 +305,7 @@
 "citerefentry>."
 
 #: usermod.8.xml:5(refentrytitle) usermod.8.xml:10(refname)
-#: usermod.8.xml:16(command) login.defs.5.xml:229(term)
+#: usermod.8.xml:16(command) login.defs.5.xml:385(term)
 msgid "usermod"
 msgstr "usermod"
 
@@ -356,7 +365,7 @@
 "normalerweise mit dem Werkzeug <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> verändert."
 
-#: usermod.8.xml:65(term) useradd.8.xml:91(term)
+#: usermod.8.xml:65(term) useradd.8.xml:92(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -375,7 +384,7 @@
 "in das neue Home-Verzeichnis verschoben. Falls es nicht existiert, wird es "
 "angelegt."
 
-#: usermod.8.xml:79(term) useradd.8.xml:108(term) useradd.8.xml:293(term)
+#: usermod.8.xml:79(term) useradd.8.xml:109(term) useradd.8.xml:294(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -383,7 +392,7 @@
 "<option>-e</option>, <option>--expiredate</"
 "option><replaceable>VERFALLS_DATUM</replaceable>"
 
-#: usermod.8.xml:84(para) useradd.8.xml:113(para)
+#: usermod.8.xml:84(para) useradd.8.xml:114(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>."
@@ -391,7 +400,7 @@
 "Das Datum, an welchem das Benutzerkonto deaktiviert wird. Das Datum muss im "
 "Format <emphasis remap=\"I\">JJJJ-MM-TT</emphasis> angegeben werden."
 
-#: usermod.8.xml:91(term) useradd.8.xml:120(term) useradd.8.xml:302(term)
+#: usermod.8.xml:91(term) useradd.8.xml:121(term) useradd.8.xml:303(term)
 msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -399,7 +408,7 @@
 "<option>-f</option>, <option>--inactive</option><replaceable>INAKTIV</"
 "replaceable>"
 
-#: usermod.8.xml:96(para) useradd.8.xml:125(para)
+#: usermod.8.xml:96(para) useradd.8.xml:126(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 "
@@ -410,7 +419,7 @@
 "Passwort abläuft. Ein Wert von -1 schaltet diese Funktion ab. Der "
 "Standardwert ist -1."
 
-#: usermod.8.xml:105(term) useradd.8.xml:134(term) useradd.8.xml:314(term)
+#: usermod.8.xml:105(term) useradd.8.xml:135(term) useradd.8.xml:315(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
@@ -426,7 +435,7 @@
 "Der Gruppenname muss existieren. Die Gruppenzahl muss auf eine bereits "
 "bestehende Gruppe verweisen. Die Standardgruppennummer ist 1."
 
-#: usermod.8.xml:118(term) useradd.8.xml:148(term)
+#: usermod.8.xml:118(term) useradd.8.xml:149(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -493,12 +502,19 @@
 "abgeschaltet wird. Sie können diese Option nicht mit <option>-p</option> "
 "oder <option>-U</option> verwenden."
 
-#: usermod.8.xml:164(term) useradd.8.xml:217(term) groupmod.8.xml:78(term)
+#: usermod.8.xml:161(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:170(term) useradd.8.xml:218(term) groupmod.8.xml:78(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:168(para)
+#: usermod.8.xml:174(para)
 msgid ""
 "When used with the <option>-u</option> option, this option allows to change "
 "the user ID to a non-unique value."
@@ -507,7 +523,7 @@
 "Option der Wert der Benutzer-ID auf einen nicht eindeutigen Wert gesetzt "
 "werden."
 
-#: usermod.8.xml:175(term) useradd.8.xml:225(term)
+#: usermod.8.xml:181(term) useradd.8.xml:226(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -515,7 +531,7 @@
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORT</"
 "replaceable>"
 
-#: usermod.8.xml:180(para)
+#: usermod.8.xml:186(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
@@ -523,14 +539,14 @@
 "Das verschlüsselte Passwort, wie es von <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> zurückgegeben wird."
 
-#: usermod.8.xml:188(term) useradd.8.xml:238(term) useradd.8.xml:327(term)
+#: usermod.8.xml:194(term) useradd.8.xml:239(term) useradd.8.xml:328(term)
 #: su.1.xml:108(term) chsh.1.xml:50(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 
-#: usermod.8.xml:193(para) chsh.1.xml:54(para)
+#: usermod.8.xml:199(para) chsh.1.xml:54(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."
@@ -538,13 +554,13 @@
 "Der Name der neuen Login-Shell des Benutzers. Falls dieses Feld leer "
 "gelassen wird, verwendet das System die Standard-Login-Shell."
 
-#: usermod.8.xml:200(term) useradd.8.xml:251(term)
+#: usermod.8.xml:206(term) useradd.8.xml:252(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: usermod.8.xml:205(para)
+#: usermod.8.xml:211(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. Values "
@@ -561,11 +577,11 @@
 "Benutzer-ID geändert. Dateien, die sich außerhalb des Home-Verzeichnisses "
 "befinden, müssen von Hand geändert werden."
 
-#: usermod.8.xml:218(term)
+#: usermod.8.xml:224(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:222(para)
+#: usermod.8.xml:228(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</"
@@ -575,15 +591,24 @@
 "können diese Option nicht mit <option>-p</option> oder <option>-U</option> "
 "verwenden."
 
-#: usermod.8.xml:233(title) userdel.8.xml:170(title) useradd.8.xml:350(title)
-#: su.1.xml:168(title) shadow.3.xml:164(title) passwd.1.xml:311(title)
+#: usermod.8.xml:233(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 <replaceable>EXPIRE</"
+"replaceable> value from <filename>/etc/default/useradd</filename>)."
+msgstr ""
+
+#: usermod.8.xml:247(title) userdel.8.xml:170(title) useradd.8.xml:351(title)
+#: su.1.xml:168(title) shadow.3.xml:164(title) passwd.1.xml:313(title)
 #: newusers.8.xml:82(title) login.1.xml:164(title) lastlog.8.xml:125(title)
-#: groupdel.8.xml:36(title) groupadd.8.xml:138(title) faillog.8.xml:121(title)
-#: chpasswd.8.xml:77(title) chgpasswd.8.xml:76(title)
+#: groupdel.8.xml:36(title) groupadd.8.xml:138(title) gpasswd.1.xml:166(title)
+#: faillog.8.xml:121(title) chpasswd.8.xml:118(title)
+#: chgpasswd.8.xml:117(title)
 msgid "CAVEATS"
 msgstr "WARNUNGEN"
 
-#: usermod.8.xml:234(para)
+#: usermod.8.xml:248(para)
 msgid ""
 "<command>usermod</command> will not allow you to change the name of a user "
 "who is logged in. You must make certain that the named user is not executing "
@@ -602,7 +627,7 @@
 "per Hand verändern. Sie müssen auch Änderungen im Zusammenhang mit NIS auf "
 "dem NIS-Server vornehmen."
 
-#: usermod.8.xml:271(para)
+#: usermod.8.xml:285(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -641,7 +666,7 @@
 "manvolnum></citerefentry>."
 
 #: userdel.8.xml:5(refentrytitle) userdel.8.xml:10(refname)
-#: userdel.8.xml:15(command) login.defs.5.xml:221(term)
+#: userdel.8.xml:15(command) login.defs.5.xml:377(term)
 msgid "userdel"
 msgstr "userdel"
 
@@ -726,43 +751,45 @@
 "Die Maildatei wird durch die Variable <emphasis>MAIL_DIR</emphasis> in der "
 "Datei <filename>login.defs</filename> definiert."
 
-#: userdel.8.xml:98(filename) useradd.8.xml:403(filename)
-#: pwconv.8.xml:112(filename) newusers.8.xml:93(filename)
+#: userdel.8.xml:98(filename) useradd.8.xml:404(filename)
+#: pwconv.8.xml:112(filename) newusers.8.xml:123(filename)
 #: login.access.5.xml:69(filename) groupadd.8.xml:129(filename)
-#: chsh.1.xml:100(filename) chfn.1.xml:63(filename)
+#: chsh.1.xml:100(filename) chpasswd.8.xml:263(filename)
+#: chgpasswd.8.xml:140(filename) chfn.1.xml:63(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
 # SB: Translation for "shadow password suite"?
-#: userdel.8.xml:100(para) useradd.8.xml:405(para) pwconv.8.xml:114(para)
-#: newusers.8.xml:95(para) login.access.5.xml:71(para)
-#: groupadd.8.xml:131(para) chsh.1.xml:102(para) chfn.1.xml:65(para)
+#: userdel.8.xml:100(para) useradd.8.xml:406(para) pwconv.8.xml:114(para)
+#: newusers.8.xml:125(para) login.access.5.xml:71(para)
+#: groupadd.8.xml:131(para) chsh.1.xml:102(para) chpasswd.8.xml:265(para)
+#: chgpasswd.8.xml:142(para) chfn.1.xml:65(para)
 msgid "Shadow password suite configuration."
 msgstr "Konfiguration des Shadow-Passwort-Systems"
 
-#: userdel.8.xml:119(title) useradd.8.xml:412(title) pwck.8.xml:186(title)
-#: passwd.1.xml:340(title) grpck.8.xml:129(title) groupmod.8.xml:110(title)
-#: groupdel.8.xml:61(title) groupadd.8.xml:152(title) chage.1.xml:199(title)
+#: userdel.8.xml:119(title) useradd.8.xml:413(title) pwck.8.xml:186(title)
+#: passwd.1.xml:342(title) grpck.8.xml:129(title) groupmod.8.xml:110(title)
+#: groupdel.8.xml:61(title) groupadd.8.xml:159(title) chage.1.xml:199(title)
 msgid "EXIT VALUES"
 msgstr "RÜCKGABEWERTE"
 
-#: userdel.8.xml:124(replaceable) useradd.8.xml:417(replaceable)
-#: pwck.8.xml:191(replaceable) passwd.1.xml:345(replaceable)
+#: userdel.8.xml:124(replaceable) useradd.8.xml:418(replaceable)
+#: pwck.8.xml:191(replaceable) passwd.1.xml:347(replaceable)
 #: grpck.8.xml:134(replaceable) groupmod.8.xml:115(replaceable)
-#: groupdel.8.xml:66(replaceable) groupadd.8.xml:157(replaceable)
+#: groupdel.8.xml:66(replaceable) groupadd.8.xml:164(replaceable)
 #: chage.1.xml:204(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:126(para) useradd.8.xml:419(para) pwck.8.xml:193(para)
-#: passwd.1.xml:347(para) grpck.8.xml:136(para) groupmod.8.xml:117(para)
-#: groupdel.8.xml:68(para) groupadd.8.xml:159(para) chage.1.xml:206(para)
+#: userdel.8.xml:126(para) useradd.8.xml:420(para) pwck.8.xml:193(para)
+#: passwd.1.xml:349(para) grpck.8.xml:136(para) groupmod.8.xml:117(para)
+#: groupdel.8.xml:68(para) groupadd.8.xml:166(para) chage.1.xml:206(para)
 msgid "success"
 msgstr "Erfolg"
 
-#: userdel.8.xml:130(replaceable) useradd.8.xml:423(replaceable)
+#: userdel.8.xml:130(replaceable) useradd.8.xml:424(replaceable)
 #: su.1.xml:6(manvolnum) sg.1.xml:6(manvolnum) pwck.8.xml:197(replaceable)
-#: passwd.1.xml:6(manvolnum) passwd.1.xml:351(replaceable)
+#: passwd.1.xml:6(manvolnum) passwd.1.xml:353(replaceable)
 #: newgrp.1.xml:6(manvolnum) login.1.xml:6(manvolnum)
 #: grpck.8.xml:140(replaceable) groups.1.xml:6(manvolnum)
 #: gpasswd.1.xml:6(manvolnum) expiry.1.xml:6(manvolnum)
@@ -771,26 +798,26 @@
 msgid "1"
 msgstr "1"
 
-#: userdel.8.xml:132(para) useradd.8.xml:425(para)
+#: userdel.8.xml:132(para) useradd.8.xml:426(para)
 msgid "can't update password file"
 msgstr "kann die Passwortdatei nicht aktualisieren"
 
-#: userdel.8.xml:136(replaceable) useradd.8.xml:429(replaceable)
-#: pwck.8.xml:203(replaceable) passwd.1.xml:357(replaceable)
+#: userdel.8.xml:136(replaceable) useradd.8.xml:430(replaceable)
+#: pwck.8.xml:203(replaceable) passwd.1.xml:359(replaceable)
 #: grpck.8.xml:146(replaceable) groupmod.8.xml:121(replaceable)
-#: groupdel.8.xml:72(replaceable) groupadd.8.xml:163(replaceable)
+#: groupdel.8.xml:72(replaceable) groupadd.8.xml:170(replaceable)
 #: chage.1.xml:216(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:138(para) useradd.8.xml:431(para) pwck.8.xml:199(para)
+#: userdel.8.xml:138(para) useradd.8.xml:432(para) pwck.8.xml:199(para)
 #: grpck.8.xml:142(para) groupmod.8.xml:123(para) groupdel.8.xml:74(para)
-#: groupadd.8.xml:165(para) chage.1.xml:218(para)
+#: groupadd.8.xml:172(para) chage.1.xml:218(para)
 msgid "invalid command syntax"
 msgstr "unzulässige Syntax für diesen Befehl"
 
-#: userdel.8.xml:142(replaceable) useradd.8.xml:447(replaceable)
-#: passwd.1.xml:381(replaceable) groupmod.8.xml:139(replaceable)
+#: userdel.8.xml:142(replaceable) useradd.8.xml:448(replaceable)
+#: passwd.1.xml:383(replaceable) groupmod.8.xml:139(replaceable)
 #: groupdel.8.xml:78(replaceable)
 msgid "6"
 msgstr "6"
@@ -803,18 +830,18 @@
 msgid "user currently logged in"
 msgstr "Benutzer ist im Moment angemeldet"
 
-#: userdel.8.xml:154(replaceable) useradd.8.xml:459(replaceable)
+#: userdel.8.xml:154(replaceable) useradd.8.xml:460(replaceable)
 #: groupmod.8.xml:151(replaceable) groupdel.8.xml:90(replaceable)
-#: groupadd.8.xml:187(replaceable)
+#: groupadd.8.xml:194(replaceable)
 msgid "10"
 msgstr "10"
 
-#: userdel.8.xml:156(para) useradd.8.xml:461(para) groupmod.8.xml:153(para)
-#: groupdel.8.xml:92(para) groupadd.8.xml:189(para)
+#: userdel.8.xml:156(para) useradd.8.xml:462(para) groupmod.8.xml:153(para)
+#: groupdel.8.xml:92(para) groupadd.8.xml:196(para)
 msgid "can't update group file"
 msgstr "kann Gruppendatei nicht aktualisieren"
 
-#: userdel.8.xml:160(replaceable) useradd.8.xml:465(replaceable)
+#: userdel.8.xml:160(replaceable) useradd.8.xml:466(replaceable)
 msgid "12"
 msgstr "12"
 
@@ -903,7 +930,7 @@
 
 #: useradd.8.xml:5(refentrytitle) useradd.8.xml:10(refname)
 #: useradd.8.xml:15(command) useradd.8.xml:22(command)
-#: useradd.8.xml:26(command) login.defs.5.xml:210(term)
+#: useradd.8.xml:26(command) login.defs.5.xml:366(term)
 msgid "useradd"
 msgstr "useradd"
 
@@ -913,7 +940,7 @@
 "erstellt einen neuen Benutzer oder aktualisiert die Standardwerte für neue "
 "Benutzer"
 
-#: useradd.8.xml:23(arg) useradd.8.xml:27(arg) useradd.8.xml:82(option)
+#: useradd.8.xml:23(arg) useradd.8.xml:27(arg) useradd.8.xml:83(option)
 msgid "-D"
 msgstr "-D"
 
@@ -949,7 +976,7 @@
 "des Logins und wird im Moment im Feld für den vollen Namen des Benutzers "
 "gespeichert."
 
-#: useradd.8.xml:66(term) useradd.8.xml:278(term)
+#: useradd.8.xml:66(term) useradd.8.xml:279(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
@@ -958,11 +985,13 @@
 "replaceable>"
 
 #: useradd.8.xml:71(para)
+#, fuzzy
 msgid ""
-"The default base directory for the system if <option>-d</option> dir 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."
+"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 ""
 "Das standardmäßige Wurzelverzeichnis des Systems, wenn nicht eines mit "
 "<option>-d</option> festgelegt wurde. Der Name des Home-Verzeichnisses "
@@ -970,12 +999,12 @@
 "dem Kontonamen. Wenn die Option <option>-m</option> nicht verwendet wird, "
 "muss <replaceable>WURZEL_VERZ</replaceable> existieren."
 
-#: useradd.8.xml:85(para)
+#: useradd.8.xml:86(para)
 #, fuzzy
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr "Die Standardwerte verändern"
 
-#: useradd.8.xml:96(para)
+#: useradd.8.xml:97(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 "
@@ -991,7 +1020,7 @@
 "Verzeichnis <replaceable>HOME_VERZ</replaceable> muss nicht vorhanden sein, "
 "sondern wird gegebenenfalls angelegt."
 
-#: useradd.8.xml:139(para)
+#: useradd.8.xml:140(para)
 msgid ""
 "The group name or number of the user's initial login group. The group name "
 "must exist. A group number must refer to an already existing group. The "
@@ -1003,7 +1032,7 @@
 "Gruppe verweisen. Die Standardgruppenzahl ist 1 oder ergibt sich aus "
 "<filename>/etc/default/useradd</filename>."
 
-#: useradd.8.xml:153(para)
+#: useradd.8.xml:154(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. "
@@ -1017,11 +1046,11 @@
 "Option <option>-g</option> bestimmt wurde. Standardmäßig ist der Benutzer "
 "nur Mitglied der Ausgangsgruppe."
 
-#: useradd.8.xml:170(term)
+#: useradd.8.xml:171(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:174(para)
+#: useradd.8.xml:175(para)
 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 "
@@ -1044,7 +1073,7 @@
 "Standardmäßig wird das Verzeichnis nicht erstellt und auch keine Dateien "
 "kopiert."
 
-#: useradd.8.xml:190(term)
+#: useradd.8.xml:191(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -1052,7 +1081,7 @@
 "<option>-K</option>, <option>--key</option><replaceable>SCHLÜSSEL</"
 "replaceable>=<replaceable>WERT</replaceable>"
 
-#: useradd.8.xml:195(para)
+#: useradd.8.xml:196(para)
 msgid ""
 "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS "
 "and others). <placeholder-1/> Example: <option>-K </"
@@ -1074,7 +1103,7 @@
 "replaceable>=<replaceable>100</replaceable><option> -K </"
 "option><replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: useradd.8.xml:209(para)
+#: useradd.8.xml:210(para)
 msgid ""
 "Note: <option>-K </option><replaceable>UID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
@@ -1084,13 +1113,13 @@
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable> funktioniert noch nicht."
 
-#: useradd.8.xml:221(para)
+#: useradd.8.xml:222(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:230(para)
+#: useradd.8.xml:231(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
@@ -1100,7 +1129,7 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> zurückgegeben wird. "
 "Standardmäßig ist das Konto abgeschaltet."
 
-#: useradd.8.xml:243(para)
+#: useradd.8.xml:244(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."
@@ -1108,7 +1137,7 @@
 "Der Name der Login-Shell des Benutzers. Standardmäßig wird dieses Feld leer "
 "gelassen, das System verwendet dann die Standard-Login-Shell."
 
-#: useradd.8.xml:256(para)
+#: useradd.8.xml:257(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -1122,11 +1151,11 @@
 "größer als jeder andere Wert eines Benutzers verwendet. Typischerweise sind "
 "Werte zwischen 0 und 999 für Systemkonten reserviert."
 
-#: useradd.8.xml:268(title)
+#: useradd.8.xml:269(title)
 msgid "Changing the default values"
 msgstr "Die Standardwerte verändern"
 
-#: useradd.8.xml:269(para)
+#: useradd.8.xml:270(para)
 #, fuzzy
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
@@ -1139,7 +1168,7 @@
 "über die Kommandozeile angepasst. Die gültigen Optionen sind:"
 
 # SB: English version must be BASE_DIR
-#: useradd.8.xml:283(para)
+#: useradd.8.xml:284(para)
 #, fuzzy
 msgid ""
 "The path prefix for a new user's home directory. The user's name will be "
@@ -1152,11 +1181,11 @@
 "den Namen des Home-Verzeichnisses zu erhalten, falls nicht die Option "
 "<option>-d</option> verwendet wird."
 
-#: useradd.8.xml:298(para)
+#: useradd.8.xml:299(para)
 msgid "The date on which the user account is disabled."
 msgstr "Das Datum, an dem des Benutzerkonto abgeschaltet wird."
 
-#: useradd.8.xml:307(para)
+#: useradd.8.xml:308(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
@@ -1164,7 +1193,7 @@
 "Die Anzahl von Tagen, für die ein Passwort abgelaufen ist, bis das Konto "
 "deaktiviert wird."
 
-#: useradd.8.xml:319(para)
+#: useradd.8.xml:320(para)
 msgid ""
 "The group name or ID for a new user's initial group. The named group must "
 "exist, and a numerical group ID must have an existing entry."
@@ -1173,15 +1202,15 @@
 "Gruppenname muss existieren. Die Gruppenzahl muss auf eine bereits "
 "bestehende Gruppe verweisen."
 
-#: useradd.8.xml:332(para)
+#: useradd.8.xml:333(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
-#: useradd.8.xml:343(title)
+#: useradd.8.xml:344(title)
 msgid "NOTES"
 msgstr "ANMERKUNGEN"
 
-#: useradd.8.xml:344(para)
+#: useradd.8.xml:345(para)
 msgid ""
 "The system administrator is responsible for placing the default user files "
 "in the <filename>/etc/skel/</filename> directory."
@@ -1189,25 +1218,27 @@
 "Der Systemadministrator ist dafür verantwortlich, im Verzeichnis <filename>/"
 "etc/skel/</filename> die standardmäßigen Benutzerdateien anzulegen."
 
-#: useradd.8.xml:351(para)
+#: useradd.8.xml:352(para)
+#, fuzzy
 msgid ""
-"You may not add a user to a NIS group. This must be performed on the NIS "
-"server."
+"You may not add a user to a NIS or LDAP group. This must be performed on the "
+"corresponding server."
 msgstr ""
 "Sie dürfen einen Benutzer nicht einer NIS-Gruppe hinzufügen. Dies muss auf "
 "dem NIS-Server durchgeführt werden."
 
-#: useradd.8.xml:356(para)
+#: useradd.8.xml:357(para)
+#, fuzzy
 msgid ""
 "Similarly, if the username already exists in an external user database such "
-"as NIS, <command>useradd</command> will deny the user account creation "
-"request."
+"as NIS or LDAP, <command>useradd</command> will deny the user account "
+"creation request."
 msgstr ""
 "Ebenso wird <command>useradd</command> ablehnen, ein neues Benutzerkonto zu "
 "erstellen, wenn der Benutzername schon in einer externen Benutzerdatenbank "
 "wie z.B. NIS vorhanden ist."
 
-#: useradd.8.xml:362(para)
+#: useradd.8.xml:363(para)
 msgid ""
 "Usernames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
@@ -1217,73 +1248,73 @@
 "beginnen. Sie dürfen nur Kleinbuchstaben, Unterstriche, Gedankenstriche oder "
 "Dollarzeichen enthalten. Als regulärer Ausdruck: [a-z_][a-z0-9_-]*[$]"
 
-#: useradd.8.xml:391(filename)
+#: useradd.8.xml:392(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
 # type: Plain text
-#: useradd.8.xml:393(para)
+#: useradd.8.xml:394(para)
 msgid "Default values for account creation."
 msgstr "Standardwerte für die Erstellung eines Kontos."
 
-#: useradd.8.xml:397(filename)
+#: useradd.8.xml:398(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
-#: useradd.8.xml:399(para)
+#: useradd.8.xml:400(para)
 msgid "Directory containing default files."
 msgstr "Verzeichnis, das die Standarddateien enthält."
 
-#: useradd.8.xml:435(replaceable) shadow.3.xml:6(manvolnum)
-#: pwck.8.xml:209(replaceable) passwd.1.xml:363(replaceable)
+#: useradd.8.xml:436(replaceable) shadow.3.xml:6(manvolnum)
+#: pwck.8.xml:209(replaceable) passwd.1.xml:365(replaceable)
 #: grpck.8.xml:152(replaceable) groupmod.8.xml:127(replaceable)
-#: groupadd.8.xml:169(replaceable)
+#: groupadd.8.xml:176(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:437(para) passwd.1.xml:383(para) groupmod.8.xml:129(para)
-#: groupadd.8.xml:171(para)
+#: useradd.8.xml:438(para) passwd.1.xml:385(para) groupmod.8.xml:129(para)
+#: groupadd.8.xml:178(para)
 msgid "invalid argument to option"
 msgstr "ungültiges Argument für Option"
 
-#: useradd.8.xml:441(replaceable) pwck.8.xml:215(replaceable)
-#: passwd.1.xml:369(replaceable) grpck.8.xml:158(replaceable)
-#: groupmod.8.xml:133(replaceable) groupadd.8.xml:175(replaceable)
+#: useradd.8.xml:442(replaceable) pwck.8.xml:215(replaceable)
+#: passwd.1.xml:371(replaceable) grpck.8.xml:158(replaceable)
+#: groupmod.8.xml:133(replaceable) groupadd.8.xml:182(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:443(para)
+#: useradd.8.xml:444(para)
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr "UID ist schon vergeben (und kein <option>-o</option>)"
 
-#: useradd.8.xml:449(para) groupmod.8.xml:135(para) groupmod.8.xml:141(para)
+#: useradd.8.xml:450(para) groupmod.8.xml:135(para) groupmod.8.xml:141(para)
 #: groupdel.8.xml:80(para)
 msgid "specified group doesn't exist"
 msgstr "angegebene Gruppe ist nicht vorhanden"
 
-#: useradd.8.xml:453(replaceable) groupmod.8.xml:145(replaceable)
-#: groupadd.8.xml:181(replaceable)
+#: useradd.8.xml:454(replaceable) groupmod.8.xml:145(replaceable)
+#: groupadd.8.xml:188(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:455(para)
+#: useradd.8.xml:456(para)
 msgid "username already in use"
 msgstr "Benutzername ist schon vergeben"
 
-#: useradd.8.xml:467(para)
+#: useradd.8.xml:468(para)
 msgid "can't create home directory"
 msgstr "Home-Verzeichnis kann nicht erstellt werden"
 
-#: useradd.8.xml:471(replaceable)
+#: useradd.8.xml:472(replaceable)
 msgid "13"
 msgstr "13"
 
 # SB: translation of 'mail spool'?
-#: useradd.8.xml:473(para)
+#: useradd.8.xml:474(para)
 msgid "can't create mail spool"
 msgstr "Mail-Datei kann nicht erstellen werden"
 
-#: useradd.8.xml:413(para)
+#: useradd.8.xml:414(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1291,7 +1322,7 @@
 "Der Befehl <command>useradd</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: useradd.8.xml:482(para)
+#: useradd.8.xml:483(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1335,7 +1366,7 @@
 
 #: suauth.5.xml:6(manvolnum) shadow.5.xml:6(manvolnum)
 #: pwck.8.xml:221(replaceable) porttime.5.xml:6(manvolnum)
-#: passwd.5.xml:6(manvolnum) passwd.1.xml:375(replaceable)
+#: passwd.5.xml:6(manvolnum) passwd.1.xml:377(replaceable)
 #: login.defs.5.xml:6(manvolnum) login.access.5.xml:6(manvolnum)
 #: limits.5.xml:6(manvolnum) gshadow.5.xml:6(manvolnum)
 #: grpck.8.xml:164(replaceable) faillog.5.xml:6(manvolnum)
@@ -1542,7 +1573,7 @@
 "      #\n"
 "    "
 
-#: suauth.5.xml:149(title) pwconv.8.xml:98(title) login.defs.5.xml:239(title)
+#: suauth.5.xml:149(title) pwconv.8.xml:98(title) login.defs.5.xml:395(title)
 msgid "BUGS"
 msgstr "BUGS"
 
@@ -2315,7 +2346,7 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 #: pwconv.8.xml:5(refentrytitle) pwconv.8.xml:10(refname)
-#: pwconv.8.xml:19(command) login.defs.5.xml:204(term)
+#: pwconv.8.xml:19(command) login.defs.5.xml:360(term)
 msgid "pwconv"
 msgstr "pwconv"
 
@@ -2497,7 +2528,7 @@
 msgstr "passwd"
 
 #: pwck.8.xml:31(arg) pwck.8.xml:114(option) login.1.xml:148(option)
-#: grpck.8.xml:16(arg) gpasswd.1.xml:93(option)
+#: grpck.8.xml:16(arg) gpasswd.1.xml:112(option)
 msgid "-r"
 msgstr "-r"
 
@@ -3179,15 +3210,17 @@
 msgstr "<option>-l</option>, <option>--lock</option>"
 
 #: passwd.1.xml:215(para)
+#, fuzzy
 msgid ""
 "Lock the named account. This option disables an account by changing the "
-"password to a value which matches no possible encrypted value."
+"password to a value which matches no possible encrypted value, and by "
+"setting the account expiry field to 1."
 msgstr ""
 "Sperrt das bezeichnete Konto. Die Option schaltet ein Konto ab, indem es ein "
 "Passwort zuweist, das mit keinem möglichen verschlüsselten Wert "
 "übereinstimmen kann."
 
-#: passwd.1.xml:222(term) chage.1.xml:109(term)
+#: passwd.1.xml:223(term) chage.1.xml:109(term)
 msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -3195,7 +3228,7 @@
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_TAGE</"
 "replaceable>"
 
-#: passwd.1.xml:226(para) chage.1.xml:113(para)
+#: passwd.1.xml:227(para) chage.1.xml:113(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -3206,7 +3239,7 @@
 "von Null in diesem Feld bedeutet, dass der Benutzer sein Passwort jederzeit "
 "ändern darf."
 
-#: passwd.1.xml:244(term)
+#: passwd.1.xml:245(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -3214,16 +3247,16 @@
 "<option>-r</option>, <option>--repository</"
 "option><replaceable>PASSWORTDEPOT</replaceable>"
 
-#: passwd.1.xml:248(para)
+#: passwd.1.xml:249(para)
 #, fuzzy
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr "Ändert das Passwort im Depot <replaceable>PASSWORTDEPOT</replaceable>."
 
-#: passwd.1.xml:254(term)
+#: passwd.1.xml:255(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
-#: passwd.1.xml:258(para)
+#: passwd.1.xml:259(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 "
@@ -3240,21 +3273,22 @@
 "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:271(term)
+#: passwd.1.xml:272(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
-#: passwd.1.xml:275(para)
+#: passwd.1.xml:276(para)
+#, fuzzy
 msgid ""
 "Unlock the named account. This option re-enables an account by changing the "
 "password back to its previous value (to value before using <option>-l</"
-"option> option)."
+"option> option), and by resetting the account expiry field."
 msgstr ""
 "Entsperrt das bezeichnete Konto. Diese Option reaktiviert ein Konto wieder, "
 "indem das Passwort auf seinen alten Wert, den es hatte, bevor die Option "
 "<option>-l</option> verwendet wurde, zurückgesetzt wird."
 
-#: passwd.1.xml:283(term)
+#: passwd.1.xml:285(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -3262,7 +3296,7 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_TAGE</"
 "replaceable>"
 
-#: passwd.1.xml:287(para)
+#: passwd.1.xml:289(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 "
@@ -3274,7 +3308,7 @@
 "replaceable> bezeichnet die Anzahl der Tage, für die ein Benutzer vor "
 "Verfall seines Passworts gewarnt wird."
 
-#: passwd.1.xml:296(term)
+#: passwd.1.xml:298(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -3282,7 +3316,7 @@
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_TAGE</"
 "replaceable>"
 
-#: passwd.1.xml:300(para)
+#: passwd.1.xml:302(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -3290,7 +3324,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:312(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Not all options may be supported. Password complexity checking may vary from "
 "site to site. The user is urged to select a password as complex as he or she "
@@ -3304,28 +3338,28 @@
 "ändern, wenn auf dem System NIS aktiviert ist, sie aber nicht am NIS-Server "
 "angemeldet sind."
 
-#: passwd.1.xml:353(para) chage.1.xml:212(para)
+#: passwd.1.xml:355(para) chage.1.xml:212(para)
 msgid "permission denied"
 msgstr "Berechtigung verweigert"
 
-#: passwd.1.xml:359(para)
+#: passwd.1.xml:361(para)
 msgid "invalid combination of options"
 msgstr "ungültige Kombination von Optionen"
 
-#: passwd.1.xml:365(para)
+#: passwd.1.xml:367(para)
 msgid "unexpected failure, nothing done"
 msgstr "unerwarteter Fehler, nichts wurde verändert"
 
-#: passwd.1.xml:371(para)
+#: passwd.1.xml:373(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr "unerwarteter Fehler, die Datei <filename>passwd</filename> fehlt"
 
-#: passwd.1.xml:377(para)
+#: passwd.1.xml:379(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 "Datei <filename>passwd</filename> wird benutzt, bitte nochmal versuchen"
 
-#: passwd.1.xml:341(para)
+#: passwd.1.xml:343(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -3333,7 +3367,7 @@
 "Der Befehl <command>passwd</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: passwd.1.xml:392(para)
+#: passwd.1.xml:394(para)
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -3395,7 +3429,7 @@
 msgstr "Der Befehl <command>nologin</command> tauchte erstmal in BSD 4.4 auf."
 
 #: newusers.8.xml:5(refentrytitle) newusers.8.xml:10(refname)
-#: newusers.8.xml:16(command) login.defs.5.xml:196(term)
+#: newusers.8.xml:16(command) login.defs.5.xml:352(term)
 msgid "newusers"
 msgstr "newusers"
 
@@ -3482,8 +3516,15 @@
 "Die Eingabedatei muss geschützt werden, da sie unverschlüsselte Passwörter "
 "enthält."
 
-#: newusers.8.xml:103(para)
+#: newusers.8.xml:87(para) chpasswd.8.xml:123(para)
 msgid ""
+"PAM is not used to update the passwords. Only <filename>/etc/passwd</"
+"filename> and <filename>/etc/shadow</filename> are updated, and the various "
+"checks or options provided by PAM modules are not used."
+msgstr ""
+
+#: newusers.8.xml:133(para)
+msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
@@ -3507,7 +3548,7 @@
 
 #: newgrp.1.xml:17(replaceable) grpck.8.xml:18(replaceable)
 #: groupdel.8.xml:18(replaceable) groupadd.8.xml:24(replaceable)
-#: gpasswd.1.xml:21(replaceable)
+#: gpasswd.1.xml:26(replaceable)
 msgid "group"
 msgstr "Gruppe"
 
@@ -3565,12 +3606,14 @@
 "filename> relevant."
 
 #: newgrp.1.xml:85(para)
+#, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"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>, <citerefentry><refentrytitle>gshadow</"
@@ -3579,12 +3622,13 @@
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<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>, <citerefentry><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
 #: logoutd.8.xml:5(refentrytitle) logoutd.8.xml:10(refname)
 #: logoutd.8.xml:16(command)
@@ -3661,15 +3705,17 @@
 "der Zeile sein."
 
 #: login.defs.5.xml:31(para)
+#, fuzzy
 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 \"yes\" or \"no\". An undefined boolean parameter or one "
-"with a value other than these will be given a \"no\" value. Numbers (both "
+"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 \"0\") or hexadecimal values (precede the value with \"0x\"). The "
-"maximum value of the regular and long numeric parameters is machine-"
-"dependent."
+"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 ""
 "Die Parameterwerte können aus vier Typen bestehen: Zeichenketten, Boolesh, "
 "Zahlen und lange Zahlen. Eine Zeichenkette kann aus jedem druckbaren Zeichen "
@@ -3680,17 +3726,19 @@
 "maximale Größe der normalen und langen Zahlenparameter hängt von der "
 "Maschine ab."
 
-#: login.defs.5.xml:42(para)
+#: login.defs.5.xml:46(para)
 msgid "The following configuration items are provided:"
 msgstr "Die folgenden Konfigurationsmöglichkeiten werden angeboten:"
 
-#: login.defs.5.xml:46(term)
-msgid "CHFN_AUTH (boolean)"
+#: login.defs.5.xml:50(term)
+#, fuzzy
+msgid "<option>CHFN_AUTH</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: login.defs.5.xml:48(para)
+#: login.defs.5.xml:52(para)
+#, fuzzy
 msgid ""
-"If <emphasis remap=\"I\">yes</emphasis>, the <command>chfn</command> and "
+"If <replaceable>yes</replaceable>, the <command>chfn</command> and "
 "<command>chsh</command> programs will require authentication before making "
 "any changes, unless run by the superuser."
 msgstr ""
@@ -3698,22 +3746,25 @@
 "<command>chfn</command> und <command>chsh</command> Authentifizierung, bevor "
 "sie Veränderungen vornehmen, sofern sie nicht von Root ausgeführt werden."
 
-#: login.defs.5.xml:57(term)
-msgid "CHFN_RESTRICT (string)"
+#: login.defs.5.xml:61(term)
+#, fuzzy
+msgid "<option>CHFN_RESTRICT</option> (string)"
 msgstr "CHFN_RESTRICT (Zeichenkette)"
 
-#: login.defs.5.xml:59(para)
+#: login.defs.5.xml:63(para)
+#, fuzzy
 msgid ""
 "This parameter specifies which values in the <emphasis remap=\"I\">gecos</"
 "emphasis> field of the <filename>/etc/passwd</filename> file may be changed "
 "by regular users using the <command>chfn</command> program. It can be any "
-"combination of letters <emphasis remap=\"I\">f</emphasis> ,<emphasis remap="
-"\"I\">r</emphasis>, <emphasis remap=\"I\">w</emphasis>, <emphasis remap=\"I"
-"\">h</emphasis>, for Full name, Room number, Work phone, and Home phone, "
-"respectively. For backward compatibility, \"yes\" is equivalent to \"rwh\" "
-"and \"no\" is equivalent to \"frwh\". If not specified, only the superuser "
-"can make any changes. The most restrictive setting is better achieved by not "
-"installing <filename>chfn</filename> SUID."
+"combination of letters <replaceable>f</replaceable>, <replaceable>r</"
+"replaceable>, <replaceable>w</replaceable>, <replaceable>h</replaceable>, "
+"for Full name, Room number, Work phone, and Home phone, respectively. For "
+"backward compatibility, <replaceable>yes</replaceable> is equivalent to "
+"<replaceable>rwh</replaceable> and <replaceable>no</replaceable> is "
+"equivalent to <replaceable>frwh</replaceable>. If not specified, only the "
+"superuser can make any changes. The most restrictive setting is better "
+"achieved by not installing <command>chfn</command> SUID."
 msgstr ""
 "Der Parameter bestimmt, welcher Wert in dem <emphasis remap=\"I\">gecos</"
 "emphasis>-Feld von <filename>/etc/passwd</filename> von gewöhnlichen "
@@ -3728,15 +3779,59 @@
 "Einschränkung erreicht man, wenn <filename>chfn</filename> nicht mit SUID-"
 "Rechten ausgestattet wird."
 
-#: login.defs.5.xml:76(term)
-msgid "GID_MAX (number)"
+#: login.defs.5.xml:83(term) chpasswd.8.xml:175(term)
+msgid "<option>ENCRYPT_METHOD</option> (string)"
+msgstr ""
+
+#: login.defs.5.xml:85(para) chpasswd.8.xml:177(para)
+msgid ""
+"This defines the system default encryption algorithm for encrypting "
+"passwords (if no algorithm are specified on the command line)."
+msgstr ""
+
+#: login.defs.5.xml:94(para) chpasswd.8.xml:186(para)
+msgid "<replaceable>DES</replaceable> (default)"
+msgstr ""
+
+#: login.defs.5.xml:97(replaceable) chpasswd.8.xml:189(replaceable)
+msgid "MD5"
+msgstr ""
+
+#: login.defs.5.xml:100(replaceable) chpasswd.8.xml:192(replaceable)
+msgid "SHA256"
+msgstr ""
+
+#: login.defs.5.xml:103(replaceable) chpasswd.8.xml:195(replaceable)
+msgid "SHA512"
+msgstr ""
+
+#: login.defs.5.xml:90(para) chpasswd.8.xml:182(para)
+msgid "It can take one of these values: <placeholder-1/>"
+msgstr ""
+
+#: login.defs.5.xml:107(para) chpasswd.8.xml:199(para)
+msgid ""
+"Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option> variable."
+msgstr ""
+
+#: login.defs.5.xml:111(para) login.defs.5.xml:192(para)
+#: chpasswd.8.xml:168(para) chpasswd.8.xml:203(para)
+msgid ""
+"Note: if you use PAM, it is recommended to set this variable consistently "
+"with the PAM modules configuration."
+msgstr ""
+
+#: login.defs.5.xml:118(term)
+#, fuzzy
+msgid "<option>GID_MAX</option> (number)"
 msgstr "GID_MAX (Zahl)"
 
-#: login.defs.5.xml:77(term)
-msgid "GID_MIN (number)"
+#: login.defs.5.xml:119(term)
+#, fuzzy
+msgid "<option>GID_MIN</option> (number)"
 msgstr "GID_MIN (Zahl)"
 
-#: login.defs.5.xml:79(para)
+#: login.defs.5.xml:121(para)
 msgid ""
 "Range of group IDs to choose from for the <command>useradd</command> and "
 "<command>groupadd</command> programs."
@@ -3744,11 +3839,12 @@
 "Ein Bereich von Gruppen-IDs, aus denen die Programme <command>useradd</"
 "command> und <command>groupadd</command> auswählen dürfen."
 
-#: login.defs.5.xml:87(term)
-msgid "MAIL_DIR (string)"
+#: login.defs.5.xml:129(term)
+#, fuzzy
+msgid "<option>MAIL_DIR</option> (string)"
 msgstr "MAIL_DIR (Zeichenkette)"
 
-#: login.defs.5.xml:89(para)
+#: login.defs.5.xml:131(para)
 msgid ""
 "The mail spool directory. This is needed to manipulate the mailbox when its "
 "corresponding user account is modified or deleted. If not specified, a "
@@ -3759,11 +3855,74 @@
 "gelöscht wurde. Falls nicht angegeben, wird ein Standard verwendet, der beim "
 "Kompilieren festgelegt wurde."
 
-#: login.defs.5.xml:97(term)
-msgid "PASS_MAX_DAYS (number)"
+#: login.defs.5.xml:139(term)
+msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:141(para)
+msgid ""
+"Maximum members per group entry. When the maximum is reached, a new group "
+"entry (line) is started in <filename>/etc/group</filename> (with the same "
+"name, same password, and same GID)."
+msgstr ""
+
+#: login.defs.5.xml:147(para)
+msgid ""
+"The default value is 0, meaning that there are no limits in the number of "
+"members in a group."
+msgstr ""
+
+#. Note: on HP, split groups have the same ID, but different
+#. 	             names.
+#: login.defs.5.xml:153(para)
+msgid ""
+"This feature (split group) permits to limit the length of lines in the group "
+"file. This is useful to make sure that lines for NIS groups are not larger "
+"than 1024 characters."
+msgstr ""
+
+#: login.defs.5.xml:158(para)
+msgid "If you need to enforce such limit, you can use 25."
+msgstr ""
+
+#: login.defs.5.xml:161(para)
+msgid ""
+"Note: split groups may not be supported by all tools (even in the Shadow "
+"toolsuite. You should not use this variable unless you really need it."
+msgstr ""
+
+#: login.defs.5.xml:169(term) chpasswd.8.xml:145(term)
+msgid "<option>MD5_CRYPT_ENAB</option> (boolean)"
+msgstr ""
+
+#: login.defs.5.xml:171(para) chpasswd.8.xml:147(para)
+msgid ""
+"Indicate if passwords must be encrypted using the MD5-based algorithm. If "
+"set to <replaceable>yes</replaceable>, new passwords will be encrypted using "
+"the MD5-based algorithm compatible with the one used by recent releases of "
+"FreeBSD. It supports passwords of unlimited length and longer salt strings. "
+"Set to <replaceable>no</replaceable> if you need to copy encrypted passwords "
+"to other systems which don't understand the new algorithm. Default is "
+"<replaceable>no</replaceable>."
+msgstr ""
+
+#: login.defs.5.xml:183(para)
+msgid ""
+"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"or by any command line option used to configure the encryption algorithm."
+msgstr ""
+
+#: login.defs.5.xml:188(para) chpasswd.8.xml:164(para)
+msgid ""
+"This variable is deprecated. You should use <option>ENCRYPT_METHOD</option>."
+msgstr ""
+
+#: login.defs.5.xml:199(term)
+#, fuzzy
+msgid "<option>PASS_MAX_DAYS</option> (number)"
 msgstr "PASS_MAX_DAYS (Zahl)"
 
-#: login.defs.5.xml:99(para)
+#: login.defs.5.xml:201(para)
 msgid ""
 "The maximum number of days a password may be used. If the password is older "
 "than this, a password change will be forced. If not specified, -1 will be "
@@ -3774,11 +3933,12 @@
 "nicht angegeben, wird -1 angenommen (was zur Folge hat, dass diese "
 "Beschränkung abgeschalten ist)."
 
-#: login.defs.5.xml:108(term)
-msgid "PASS_MIN_DAYS (number)"
+#: login.defs.5.xml:210(term)
+#, fuzzy
+msgid "<option>PASS_MIN_DAYS</option> (number)"
 msgstr "PASS_MIN_DAYS (Zahl)"
 
-#: login.defs.5.xml:110(para)
+#: login.defs.5.xml:212(para)
 msgid ""
 "The minimum number of days allowed between password changes. Any password "
 "changes attempted sooner than this will be rejected. If not specified, -1 "
@@ -3789,11 +3949,12 @@
 "nicht angegeben, wird -1 angenommen (was zur Folge hat, dass diese "
 "Beschränkung abgeschalten ist)."
 
-#: login.defs.5.xml:119(term)
-msgid "PASS_WARN_AGE (number)"
+#: login.defs.5.xml:221(term)
+#, fuzzy
+msgid "<option>PASS_WARN_AGE</option> (number)"
 msgstr "PASS_WARN_AGE (Zahl)"
 
-#: login.defs.5.xml:121(para)
+#: login.defs.5.xml:223(para)
 msgid ""
 "The number of days warning given before a password expires. A zero means "
 "warning is given only upon the day of expiration, a negative value means no "
@@ -3804,36 +3965,84 @@
 "ausgegeben wird. Ein negativer Wert bedeutet, dass keine Warnung erfolgt. "
 "Falls nicht angegeben, wird keine Warnung ausgegeben."
 
-#: login.defs.5.xml:131(para)
+#: login.defs.5.xml:233(para)
+#, fuzzy
 msgid ""
-"PASS_MAX_DAYS, PASS_MIN_DAYS and PASS_WARN_AGE are only used at the time of "
-"account creation. Any changes to these settings won't affect existing "
-"accounts."
+"<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 ""
 "PASS_MAX_DAYS, PASS_MIN_DAYS und PASS_WARN_AGE werden nur bei der Erstellung "
 "des Kontos verwendet. Änderungen dieser Wert berühren bestehende Konten "
 "nicht."
 
-#: login.defs.5.xml:138(term)
-msgid "UID_MAX (number)"
+#: login.defs.5.xml:241(term) chpasswd.8.xml:210(term)
+msgid "<option>SHA_CRYPT_MIN_ROUNDS</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:242(term) chpasswd.8.xml:211(term)
+msgid "<option>SHA_CRYPT_MAX_ROUNDS</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:244(para) chpasswd.8.xml:213(para)
+msgid ""
+"When <option>ENCRYPT_METHOD</option> is set to <replaceable>SHA256</"
+"replaceable> or <replaceable>SHA512</replaceable>, this defines the number "
+"of SHA rounds used by the encryption algorithm by default (when the number "
+"of rounds is not specified on the command line)."
+msgstr ""
+
+#: login.defs.5.xml:251(para) chpasswd.8.xml:220(para)
+msgid ""
+"With a lot of rounds, it is more difficult to brute forcing the password. "
+"But note also that more CPU resources will be needed to authenticate users."
+msgstr ""
+
+#: login.defs.5.xml:256(para) chpasswd.8.xml:225(para)
+msgid ""
+"If not specified, the libc will choose the default number of rounds (5000)."
+msgstr ""
+
+#: login.defs.5.xml:260(para) chpasswd.8.xml:229(para)
+msgid "The values must be inside the 1000-999999999 range."
+msgstr ""
+
+#: login.defs.5.xml:263(para) chpasswd.8.xml:232(para)
+msgid ""
+"If only one of the <option>SHA_CRYPT_MIN_ROUNDS</option> or "
+"<option>SHA_CRYPT_MAX_ROUNDS</option> values is set, then this value will be "
+"used."
+msgstr ""
+
+#: login.defs.5.xml:268(para) chpasswd.8.xml:237(para)
+msgid ""
+"If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</"
+"option>, the highest value will be used."
+msgstr ""
+
+#: login.defs.5.xml:276(term)
+#, fuzzy
+msgid "<option>UID_MAX</option> (number)"
 msgstr "UID_MAX (Zahl)"
 
-#: login.defs.5.xml:139(term)
-msgid "UID_MIN (number)"
+#: login.defs.5.xml:277(term)
+#, fuzzy
+msgid "<option>UID_MIN</option> (number)"
 msgstr "UID_MIN (Zahl)"
 
-#: login.defs.5.xml:141(para)
+#: login.defs.5.xml:279(para)
 msgid ""
 "Range of user IDs to choose from for the <command>useradd</command> program."
 msgstr ""
 "Der Bereich der Benutzer-IDs, der dem Programm <command>useradd</command> "
 "zur Verfügung steht."
 
-#: login.defs.5.xml:148(term)
-msgid "UMASK (number)"
+#: login.defs.5.xml:286(term)
+#, fuzzy
+msgid "<option>UMASK</option> (number)"
 msgstr "UMASK (Zahl)"
 
-#: login.defs.5.xml:150(para)
+#: login.defs.5.xml:288(para)
 msgid ""
 "The permission mask is initialized to this value. If not specified, the "
 "permission mask will be initialized to 022."
@@ -3842,11 +4051,12 @@
 "nicht angegeben, wird die Maske der Berechtigungen anfänglich auf 022 "
 "gesetzt."
 
-#: login.defs.5.xml:157(term)
-msgid "USERDEL_CMD (string)"
+#: login.defs.5.xml:295(term)
+#, fuzzy
+msgid "<option>USERDEL_CMD</option> (string)"
 msgstr "USERDEL_CMD (Zeichenkette)"
 
-#: login.defs.5.xml:159(para)
+#: login.defs.5.xml:297(para)
 msgid ""
 "If defined, this command is run when removing a user. It should remove any "
 "at/cron/print jobs etc. owned by the user to be removed (passed as the first "
@@ -3856,11 +4066,11 @@
 "wird. Damit können At-, Cron- und Druckaufträge des entfernten Benutzers "
 "(wird als erstes Argument angegeben) gelöscht werden."
 
-#: login.defs.5.xml:170(title)
+#: login.defs.5.xml:308(title)
 msgid "CROSS REFERENCE"
 msgstr "QUERVERWEIS"
 
-#: login.defs.5.xml:171(para)
+#: login.defs.5.xml:309(para)
 msgid ""
 "The following cross reference shows which programs in the shadow password "
 "suite use which parameters."
@@ -3868,42 +4078,62 @@
 "Der folgende Querverweis zeigt, welche Programm aus der Shadow-Passwort-"
 "Suite welche Parameter verwenden."
 
-#: login.defs.5.xml:178(term) chfn.1.xml:5(refentrytitle)
+#: login.defs.5.xml:316(term) chfn.1.xml:5(refentrytitle)
 #: chfn.1.xml:10(refname) chfn.1.xml:16(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:180(para)
+#: login.defs.5.xml:318(para)
 msgid "CHFN_AUTH CHFN_RESTRICT"
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
-#: login.defs.5.xml:184(term) chsh.1.xml:5(refentrytitle)
+#: login.defs.5.xml:322(term) chgpasswd.8.xml:5(refentrytitle)
+#: chgpasswd.8.xml:10(refname) chgpasswd.8.xml:16(command)
+msgid "chgpasswd"
+msgstr "chgpasswd"
+
+#: login.defs.5.xml:324(para)
+msgid ""
+"MD5_CRYPT_ENAB ENCRYPT_METHOD SHA_CRYPT_MIN_ROUNDS SHA_CRYPT_MAX_ROUNDS "
+"MAX_MEMBERS_PER_GROUP"
+msgstr ""
+
+#: login.defs.5.xml:331(term) chpasswd.8.xml:5(refentrytitle)
+#: chpasswd.8.xml:10(refname) chpasswd.8.xml:16(command)
+msgid "chpasswd"
+msgstr "chpasswd"
+
+#: login.defs.5.xml:333(para)
+msgid "MD5_CRYPT_ENAB ENCRYPT_METHOD SHA_CRYPT_MIN_ROUNDS SHA_CRYPT_MAX_ROUNDS"
+msgstr ""
+
+#: login.defs.5.xml:340(term) chsh.1.xml:5(refentrytitle)
 #: chsh.1.xml:10(refname) chsh.1.xml:16(command)
 msgid "chsh"
 msgstr "chsh"
 
-#: login.defs.5.xml:186(para)
+#: login.defs.5.xml:342(para)
 msgid "CHFN_AUTH"
 msgstr "CHFN_AUTH"
 
-#: login.defs.5.xml:190(term) groupadd.8.xml:5(refentrytitle)
+#: login.defs.5.xml:346(term) groupadd.8.xml:5(refentrytitle)
 #: groupadd.8.xml:10(refname) groupadd.8.xml:16(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:192(para)
+#: login.defs.5.xml:348(para)
 msgid "GID_MAX GID_MIN"
 msgstr "GID_MAX GID_MIN"
 
-#: login.defs.5.xml:198(para)
+#: login.defs.5.xml:354(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 
-#: login.defs.5.xml:206(para)
+#: login.defs.5.xml:362(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 
-#: login.defs.5.xml:212(para)
+#: login.defs.5.xml:368(para)
 msgid ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
@@ -3911,15 +4141,15 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:223(para)
+#: login.defs.5.xml:379(para)
 msgid "MAIL_DIR USERDEL_CMD"
 msgstr "MAIL_DIR USERDEL_CMD"
 
-#: login.defs.5.xml:231(para)
+#: login.defs.5.xml:387(para)
 msgid "MAIL_DIR"
 msgstr "MAIL_DIR"
 
-#: login.defs.5.xml:240(para)
+#: login.defs.5.xml:396(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 "
@@ -3940,7 +4170,7 @@
 "citerefentry> verwendet. Sie sollten daher in den entsprechenden "
 "Konfigurationsdateien für PAM nachsehen."
 
-#: login.defs.5.xml:257(para)
+#: login.defs.5.xml:413(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4907,8 +5137,8 @@
 msgid "display current group names"
 msgstr "zeigt die aktuell verwendeten Gruppennamen an"
 
-#: groups.1.xml:18(replaceable) gpasswd.1.xml:67(replaceable)
-#: gpasswd.1.xml:80(replaceable) chfn.1.xml:22(replaceable)
+#: groups.1.xml:18(replaceable) gpasswd.1.xml:86(replaceable)
+#: gpasswd.1.xml:99(replaceable) chfn.1.xml:22(replaceable)
 msgid "user"
 msgstr "Benutzer"
 
@@ -5142,7 +5372,7 @@
 "Die Optionen, die vom Befehl <command>groupmems</command> unterstützt "
 "werden, sind:"
 
-#: groupmems.8.xml:49(option) gpasswd.1.xml:67(option)
+#: groupmems.8.xml:49(option) gpasswd.1.xml:86(option)
 msgid "-a"
 msgstr "-a"
 
@@ -5150,7 +5380,7 @@
 msgid "Add a new user to the group membership list."
 msgstr "Fügt einen neuen Benutzer der Mitgliederliste der Gruppe hinzu."
 
-#: groupmems.8.xml:55(option) gpasswd.1.xml:80(option)
+#: groupmems.8.xml:55(option) gpasswd.1.xml:99(option)
 msgid "-d"
 msgstr "-d"
 
@@ -5437,27 +5667,37 @@
 "beginnen. Sie dürfen nur Kleinbuchstaben, Unterstriche, Gedankenstriche oder "
 "Dollarzeichen enthalten. Als regulärer Ausdruck: [a-z_][a-z0-9_-]*[$]"
 
-#: groupadd.8.xml:143(para)
+#: groupadd.8.xml:144(para)
+msgid "Groupnames may only be up to 16 characters long."
+msgstr "Gruppennamen dürfen nur bis zu 16 Zeichen lang sein."
+
+#: groupadd.8.xml:147(para)
+#, fuzzy
 msgid ""
-"If the groupname already exists in an external group database such as NIS, "
-"<command>groupadd</command> will deny the group creation request."
+"You may not add a NIS or LDAP group. This must be performed on the "
+"corresponding server."
 msgstr ""
+"Sie dürfen einen Benutzer nicht einer NIS-Gruppe hinzufügen. Dies muss auf "
+"dem NIS-Server durchgeführt werden."
+
+#: groupadd.8.xml:151(para)
+#, fuzzy
+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 ""
 "Falls der Gruppenname bereits in einer externen Datenbank (wie etwa NIS) "
 "vergeben ist, wird <command>groupadd</command> die Gruppe nicht erstellen."
 
-#: groupadd.8.xml:148(para)
-msgid "Groupnames may only be up to 16 characters long."
-msgstr "Gruppennamen dürfen nur bis zu 16 Zeichen lang sein."
-
-#: groupadd.8.xml:177(para)
+#: groupadd.8.xml:184(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:183(para)
+#: groupadd.8.xml:190(para)
 msgid "group name not unique"
 msgstr "Gruppenname nicht eindeutig"
 
-#: groupadd.8.xml:153(para)
+#: groupadd.8.xml:160(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5465,7 +5705,7 @@
 "Der Befehl <command>groupadd</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: groupadd.8.xml:198(para)
+#: groupadd.8.xml:205(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -5500,28 +5740,43 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 #: gpasswd.1.xml:5(refentrytitle) gpasswd.1.xml:10(refname)
-#: gpasswd.1.xml:16(command)
+#: gpasswd.1.xml:21(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
+#: gpasswd.1.xml:13(phrase)
+#, fuzzy
+msgid "and <placeholder-1/> files"
+msgstr "-a <placeholder-1/>"
+
+#: gpasswd.1.xml:15(phrase)
+msgid "file"
+msgstr ""
+
 #: gpasswd.1.xml:11(refpurpose)
-msgid "administer the <placeholder-1/> file"
-msgstr "verwaltet die Datei <placeholder-1/>"
+#, fuzzy
+msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
+msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:18(replaceable)
+#: gpasswd.1.xml:23(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "Optionen"
 
-#: gpasswd.1.xml:28(para)
+#: gpasswd.1.xml:33(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:41(para)
 #, fuzzy
 msgid ""
-"The <command>gpasswd</command> command is used to administer the <filename>/"
-"etc/group</filename> file (and <filename>/etc/gshadow</filename> file if "
-"compiled with SHADOWGRP defined). Every group can have administrators, "
-"members and a password. System administrator can use the <option>-A</option> "
-"option to define group administrator(s) and the <option>-M</option> option "
-"to define members and has all rights of group administrators and members."
+"System administrator can use the <option>-A</option> option to define group "
+"administrator(s) and the <option>-M</option> option to define members and "
+"has all rights of group administrators and members."
 msgstr ""
 "Mit <command>gpasswd</command> kann die Datei <filename>/etc/group</"
 "filename> (und die Datei <filename>/etc/gshadow</filename>, falls bei der "
@@ -5531,14 +5786,20 @@
 "festlegen. Mit der Option <option>-M</option> legt er die Mitglieder fest. "
 "Er besitzt alle Rechte, die Administratoren und Mitglieder haben können."
 
-#: gpasswd.1.xml:37(para)
+#: gpasswd.1.xml:46(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:53(para)
 #, fuzzy
 msgid ""
-"<command>gpasswd</command> called by a group administrator with a group name "
-"only prompts for the group password. If a password is set the members can "
-"still <citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry> without a password, and non-members must supply "
-"the password."
+"If a password is set the members can still "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry> without a password, and non-members must supply the password."
 msgstr ""
 "Wenn <command>gpasswd</command> vom Gruppenadministrator aufgerufen wird und "
 "der einzige Parameter der Gruppenname ist, wird nur nach einem neuem "
@@ -5547,11 +5808,11 @@
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> ausführen. Alle "
 "anderen Benutzer benötigen dazu das Passwort."
 
-#: gpasswd.1.xml:47(title)
+#: gpasswd.1.xml:61(title)
 msgid "Notes about group passwords"
 msgstr "Hinweise zu Gruppenpasswörtern"
 
-#: gpasswd.1.xml:48(para)
+#: gpasswd.1.xml:62(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 "
@@ -5561,19 +5822,29 @@
 "Personen das Passwort kennen. Dennoch sind sie eine sinnvolle Einrichtung, "
 "um die Zusammenarbeit zwischen Benutzern zu erleichtern."
 
-#: gpasswd.1.xml:59(para)
+#: gpasswd.1.xml:73(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
-"options cannot be combined. The options which apply to the <command>gpasswd</"
-"command> command are:"
+"options cannot be combined."
 msgstr ""
 " Die Optionen <option>-r</option>, <option>-h</option> und <option>-f</"
 "option> können nur verwendet werden, wenn <command>login</command> von Root "
 "ausgeführt wird."
 
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:77(para)
+msgid "The options cannot be combined."
+msgstr ""
+
+#: gpasswd.1.xml:80(para)
 #, fuzzy
+msgid "The options which apply to the <command>gpasswd</command> command are:"
+msgstr ""
+"Die Optionen, die vom Befehl <command>passwd</command> unterstützt werden, "
+"sind:"
+
+#: gpasswd.1.xml:89(para)
+#, fuzzy
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
@@ -5581,7 +5852,7 @@
 "Der Gruppenname wird vom Namen <replaceable>GRUPPE</replaceable> auf "
 "<replaceable>NEUE_GRUPPE</replaceable> geändert."
 
-#: gpasswd.1.xml:83(para)
+#: gpasswd.1.xml:102(para)
 #, fuzzy
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
@@ -5590,60 +5861,70 @@
 "Der Gruppenname wird vom Namen <replaceable>GRUPPE</replaceable> auf "
 "<replaceable>NEUE_GRUPPE</replaceable> geändert."
 
-#: gpasswd.1.xml:96(para)
+#: gpasswd.1.xml:115(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:108(option)
+#: gpasswd.1.xml:127(option)
 #, fuzzy
 msgid "-R"
 msgstr "-"
 
-#: gpasswd.1.xml:111(para)
+#: gpasswd.1.xml:130(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:122(term)
+#: gpasswd.1.xml:141(term)
 #, fuzzy
 msgid "<option>-A</option><replaceable>user</replaceable>,..."
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:126(para)
+#: gpasswd.1.xml:145(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr "Liste der Administratoren der Gruppe, durch Kommas getrennt"
 
-#: gpasswd.1.xml:134(term)
+#: gpasswd.1.xml:153(term)
 #, fuzzy
 msgid "<option>-M</option><replaceable>user</replaceable>,..."
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:138(para)
+#: gpasswd.1.xml:157(para)
 #, fuzzy
 msgid "Set the list of group members."
 msgstr "Liste der Mitglieder der Gruppe, durch Kommas getrennt"
 
-#: gpasswd.1.xml:166(para)
+#: gpasswd.1.xml:167(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:197(para)
+#, fuzzy
+msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</"
+"citerefentry>, <citerefentry><refentrytitle>groupadd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>grpck</"
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</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 ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
@@ -5952,11 +6233,6 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chpasswd.8.xml:5(refentrytitle) chpasswd.8.xml:10(refname)
-#: chpasswd.8.xml:16(command)
-msgid "chpasswd"
-msgstr "chpasswd"
-
 #: chpasswd.8.xml:11(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "aktualisiert Passwörter im Batch-Modus"
@@ -5980,9 +6256,11 @@
 "\">Passwort</emphasis>"
 
 #: chpasswd.8.xml:34(para)
+#, fuzzy
 msgid ""
-"By default the supplied password must be in clear-text. Default encryption "
-"algorithm is DES. Also the password age will be updated, if present."
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chpasswd</command>. Also the password age will be updated, if "
+"present."
 msgstr ""
 "Das Passwort muss standardmäßig im Klartext angegeben werden. Die "
 "Standardalgorithmus zur Verschlüsselung ist DES. Soweit vorhanden, wird auch "
@@ -5990,31 +6268,54 @@
 
 #: chpasswd.8.xml:39(para) chgpasswd.8.xml:38(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."
+msgstr ""
+
+#: chpasswd.8.xml:45(para) chgpasswd.8.xml:44(para)
+msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
 msgstr ""
 "Dieser Befehl ist für den Einsatz in großen Umgebungen vorgesehen, wo viele "
 "Konten gleichzeitig erstellt werden müssen."
 
-#: chpasswd.8.xml:47(para)
+#: chpasswd.8.xml:53(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:53(term) chgpasswd.8.xml:52(term)
+#: chpasswd.8.xml:59(term) chgpasswd.8.xml:58(term)
+#, fuzzy
+msgid "<option>-c</option>, <option>--crypt-method</option>"
+msgstr "<option>-e</option>, <option>--encrypted</option>"
+
+#: chpasswd.8.xml:61(para) chgpasswd.8.xml:60(para)
+msgid "Use the specified method to encrypt the passwords."
+msgstr ""
+
+#: chpasswd.8.xml:62(para) chgpasswd.8.xml:61(para)
+msgid ""
+"The available methods are DES, MD5, and SHA256 or SHA512 if compiled with "
+"the ENCRYPTMETHOD_SELECT flag."
+msgstr ""
+
+#: chpasswd.8.xml:69(term) chgpasswd.8.xml:68(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: chpasswd.8.xml:55(para) chgpasswd.8.xml:54(para)
+#: chpasswd.8.xml:71(para) chgpasswd.8.xml:70(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Passwörter werden verschlüsselt angegeben."
 
-#: chpasswd.8.xml:65(term) chgpasswd.8.xml:64(term)
+#: chpasswd.8.xml:81(term) chgpasswd.8.xml:80(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
-#: chpasswd.8.xml:67(para) chgpasswd.8.xml:66(para)
+#: chpasswd.8.xml:83(para) chgpasswd.8.xml:82(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -6022,33 +6323,77 @@
 "Verwendet zur Verschlüsselung MD5 anstelle von DES, wenn die Passwörter "
 "unverschlüsselt angegeben werden."
 
-#: chpasswd.8.xml:78(para) chgpasswd.8.xml:77(para)
+#: chpasswd.8.xml:90(term) chgpasswd.8.xml:89(term)
+#, fuzzy
+msgid "<option>-s</option>, <option>--sha-rounds</option>"
+msgstr "<option>-s</option>, <option>--shadow</option>"
+
+#: chpasswd.8.xml:92(para) chgpasswd.8.xml:91(para)
+msgid "Use the specified number of rounds to encrypt the passwords."
+msgstr ""
+
+#: chpasswd.8.xml:95(para) chgpasswd.8.xml:94(para)
 msgid ""
+"The value 0 means that the system will choose the default number of rounds "
+"for the crypt method (5000)."
+msgstr ""
+
+#: chpasswd.8.xml:99(para) chgpasswd.8.xml:98(para)
+msgid ""
+"A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
+msgstr ""
+
+#: chpasswd.8.xml:103(para) chgpasswd.8.xml:102(para)
+msgid "You can only use this option with the SHA256 or SHA512 crypt method."
+msgstr ""
+
+#: chpasswd.8.xml:107(para) chgpasswd.8.xml:106(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 ""
+
+#: chpasswd.8.xml:119(para) chgpasswd.8.xml:118(para)
+msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
 msgstr ""
 "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:86(para)
+#: chpasswd.8.xml:132(title)
+msgid "CONFIGURATION"
+msgstr ""
+
+#: chpasswd.8.xml:133(para)
 msgid ""
+"The following configuration variables in <filename>/etc/login.defs</"
+"filename> change the behavior of this tool:"
+msgstr ""
+
+#: chpasswd.8.xml:159(para)
+msgid ""
+"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"or by any command line option."
+msgstr ""
+
+#: chpasswd.8.xml:273(para)
+#, fuzzy
+msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>newusers</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<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>."
 
-#: chgpasswd.8.xml:5(refentrytitle) chgpasswd.8.xml:10(refname)
-#: chgpasswd.8.xml:16(command)
-msgid "chgpasswd"
-msgstr "chgpasswd"
-
 #: chgpasswd.8.xml:11(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "aktualisiert Gruppenpasswörter im Batch-Modus"
@@ -6072,29 +6417,35 @@
 "emphasis>"
 
 #: chgpasswd.8.xml:34(para)
+#, fuzzy
 msgid ""
-"By default the supplied password must be in clear-text. Default encryption "
-"algorithm is DES."
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chgpasswd</command>."
 msgstr ""
 "Das Passwort muss standardmäßig im Klartext angegeben werden. Die "
 "Standardalgorithmus zur Verschlüsselung ist DES."
 
-#: chgpasswd.8.xml:46(para)
+#: chgpasswd.8.xml:52(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:85(para)
+#: chgpasswd.8.xml:150(para)
+#, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
 
 # SB: Translation of chfn.1 based on Josef Spillner's (josef at ggzgamingzone.org) from 2003. Mention somewhere else as well?
 # Übersetzung von "real user name"?
@@ -6422,6 +6773,52 @@
 msgstr "Simon Brandmair (sbrandmair at gmx.net), 2005, 2007."
 
 #~ msgid ""
+#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+
+#~ msgid "administer the <placeholder-1/> file"
+#~ msgstr "verwaltet die Datei <placeholder-1/>"
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid ""
 #~ "The name of the new user's login shell. The named program will be used "
 #~ "for all future new user accounts."
 #~ msgstr ""

Modified: upstream/trunk/man/po/fr.po
===================================================================
--- upstream/trunk/man/po/fr.po	2007-11-25 21:06:49 UTC (rev 1464)
+++ upstream/trunk/man/po/fr.po	2007-11-25 21:28:26 UTC (rev 1465)
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow-man-pages 4.0.18\n"
-"POT-Creation-Date: 2007-11-10 23:24+0100\n"
+"POT-Creation-Date: 2007-11-25 20:28+0100\n"
 "PO-Revision-Date: 2007-11-16 14:26+0100\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon at wanadoo.fr>\n"
 "Language-Team: Debian French Team <debian-l10n-french at lists.debian.org>\n"
@@ -85,7 +85,7 @@
 #: login.access.5.xml:15(title) login.1.xml:36(title) limits.5.xml:16(title)
 #: lastlog.8.xml:24(title) gshadow.5.xml:15(title) grpck.8.xml:25(title)
 #: groups.1.xml:24(title) groupmod.8.xml:25(title) groupmems.8.xml:27(title)
-#: groupdel.8.xml:24(title) groupadd.8.xml:30(title) gpasswd.1.xml:27(title)
+#: groupdel.8.xml:24(title) groupadd.8.xml:30(title) gpasswd.1.xml:32(title)
 #: faillog.8.xml:24(title) faillog.5.xml:15(title) expiry.1.xml:23(title)
 #: chsh.1.xml:27(title) chpasswd.8.xml:24(title) chgpasswd.8.xml:24(title)
 #: chfn.1.xml:27(title) chage.1.xml:26(title)
@@ -122,8 +122,8 @@
 #: useradd.8.xml:48(title) su.1.xml:74(title) pwck.8.xml:96(title)
 #: passwd.1.xml:140(title) login.1.xml:119(title) lastlog.8.xml:36(title)
 #: grpck.8.xml:69(title) groupmod.8.xml:34(title) groupmems.8.xml:42(title)
-#: groupadd.8.xml:39(title) gpasswd.1.xml:58(title) faillog.8.xml:35(title)
-#: chsh.1.xml:38(title) chpasswd.8.xml:46(title) chgpasswd.8.xml:45(title)
+#: groupadd.8.xml:39(title) gpasswd.1.xml:72(title) faillog.8.xml:35(title)
+#: chsh.1.xml:38(title) chpasswd.8.xml:52(title) chgpasswd.8.xml:51(title)
 #: chage.1.xml:36(title)
 msgid "OPTIONS"
 msgstr "OPTIONS"
@@ -144,17 +144,17 @@
 msgid "Edit group database."
 msgstr "Éditer la base de données de groupes."
 
-#: vipw.8.xml:64(term) userdel.8.xml:63(term) useradd.8.xml:164(term)
+#: vipw.8.xml:64(term) userdel.8.xml:63(term) useradd.8.xml:165(term)
 #: passwd.1.xml:180(term) lastlog.8.xml:52(term) groupmod.8.xml:60(term)
 #: groupadd.8.xml:74(term) faillog.8.xml:48(term) chsh.1.xml:44(term)
-#: chpasswd.8.xml:59(term) chgpasswd.8.xml:58(term) chage.1.xml:74(term)
+#: chpasswd.8.xml:75(term) chgpasswd.8.xml:74(term) chage.1.xml:74(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
-#: vipw.8.xml:66(para) userdel.8.xml:65(para) useradd.8.xml:166(para)
+#: vipw.8.xml:66(para) userdel.8.xml:65(para) useradd.8.xml:167(para)
 #: passwd.1.xml:182(para) lastlog.8.xml:56(para) groupmod.8.xml:62(para)
 #: groupadd.8.xml:76(para) faillog.8.xml:50(para) chsh.1.xml:46(para)
-#: chpasswd.8.xml:61(para) chgpasswd.8.xml:60(para) chage.1.xml:76(para)
+#: chpasswd.8.xml:77(para) chgpasswd.8.xml:76(para) chage.1.xml:76(para)
 msgid "Display help message and exit."
 msgstr "Afficher un message d'aide et quitter."
 
@@ -166,11 +166,11 @@
 msgid "Edit passwd database."
 msgstr "Éditer la base de données de mots de passe."
 
-#: vipw.8.xml:76(term) passwd.1.xml:234(term)
+#: vipw.8.xml:76(term) passwd.1.xml:235(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:78(para) passwd.1.xml:238(para)
+#: vipw.8.xml:78(para) passwd.1.xml:239(para)
 msgid "Quiet mode."
 msgstr "Mode silencieux."
 
@@ -182,105 +182,114 @@
 msgid "Edit shadow or gshadow database."
 msgstr "Éditer les bases de données shadow ou gshadow."
 
-#: vipw.8.xml:91(title) usermod.8.xml:246(title) userdel.8.xml:89(title)
-#: useradd.8.xml:370(title) suauth.5.xml:139(title) su.1.xml:176(title)
+#: vipw.8.xml:91(title) usermod.8.xml:260(title) userdel.8.xml:89(title)
+#: useradd.8.xml:371(title) suauth.5.xml:139(title) su.1.xml:176(title)
 #: sg.1.xml:43(title) shadow.5.xml:105(title) shadow.3.xml:172(title)
 #: pwconv.8.xml:109(title) pwck.8.xml:145(title) porttime.5.xml:76(title)
-#: passwd.5.xml:87(title) passwd.1.xml:322(title) newusers.8.xml:90(title)
+#: passwd.5.xml:87(title) passwd.1.xml:324(title) newusers.8.xml:96(title)
 #: newgrp.1.xml:54(title) logoutd.8.xml:35(title) login.access.5.xml:66(title)
 #: login.1.xml:198(title) limits.5.xml:110(title) lastlog.8.xml:113(title)
 #: gshadow.5.xml:61(title) grpck.8.xml:87(title) groups.1.xml:46(title)
 #: groupmod.8.xml:92(title) groupmems.8.xml:103(title)
-#: groupdel.8.xml:43(title) groupadd.8.xml:114(title) gpasswd.1.xml:147(title)
+#: groupdel.8.xml:43(title) groupadd.8.xml:114(title) gpasswd.1.xml:178(title)
 #: faillog.8.xml:132(title) faillog.5.xml:38(title) expiry.1.xml:32(title)
-#: chsh.1.xml:85(title) chfn.1.xml:60(title) chage.1.xml:177(title)
+#: chsh.1.xml:85(title) chpasswd.8.xml:248(title) chgpasswd.8.xml:125(title)
+#: chfn.1.xml:60(title) chage.1.xml:177(title)
 msgid "FILES"
 msgstr "FICHIERS"
 
-#: vipw.8.xml:94(filename) usermod.8.xml:249(filename)
-#: userdel.8.xml:92(filename) useradd.8.xml:385(filename)
-#: sg.1.xml:58(filename) pwck.8.xml:148(filename) newgrp.1.xml:69(filename)
-#: gshadow.5.xml:64(filename) grpck.8.xml:90(filename)
-#: groups.1.xml:49(filename) groupmod.8.xml:95(filename)
-#: groupmems.8.xml:106(filename) groupdel.8.xml:46(filename)
-#: groupadd.8.xml:117(filename) gpasswd.1.xml:11(filename)
-#: gpasswd.1.xml:150(filename)
+#: vipw.8.xml:94(filename) usermod.8.xml:263(filename)
+#: userdel.8.xml:92(filename) useradd.8.xml:386(filename)
+#: sg.1.xml:58(filename) pwck.8.xml:148(filename) newusers.8.xml:111(filename)
+#: newgrp.1.xml:69(filename) gshadow.5.xml:64(filename)
+#: grpck.8.xml:90(filename) groups.1.xml:49(filename)
+#: groupmod.8.xml:95(filename) groupmems.8.xml:106(filename)
+#: groupdel.8.xml:46(filename) groupadd.8.xml:117(filename)
+#: gpasswd.1.xml:12(filename) gpasswd.1.xml:181(filename)
+#: chgpasswd.8.xml:128(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
-#: vipw.8.xml:96(para) usermod.8.xml:251(para) userdel.8.xml:94(para)
-#: useradd.8.xml:387(para) sg.1.xml:60(para) pwck.8.xml:150(para)
-#: newgrp.1.xml:71(para) gshadow.5.xml:66(para) grpck.8.xml:92(para)
-#: groups.1.xml:51(para) groupmod.8.xml:97(para) groupmems.8.xml:108(para)
-#: groupdel.8.xml:48(para) groupadd.8.xml:119(para) gpasswd.1.xml:152(para)
+#: vipw.8.xml:96(para) usermod.8.xml:265(para) userdel.8.xml:94(para)
+#: useradd.8.xml:388(para) sg.1.xml:60(para) pwck.8.xml:150(para)
+#: newusers.8.xml:113(para) newgrp.1.xml:71(para) gshadow.5.xml:66(para)
+#: grpck.8.xml:92(para) groups.1.xml:51(para) groupmod.8.xml:97(para)
+#: groupmems.8.xml:108(para) groupdel.8.xml:48(para) groupadd.8.xml:119(para)
+#: gpasswd.1.xml:183(para) chgpasswd.8.xml:130(para)
 msgid "Group account information."
 msgstr "Informations sur les groupes."
 
-#: vipw.8.xml:100(filename) sg.1.xml:64(filename) newgrp.1.xml:75(filename)
-#: gshadow.5.xml:70(filename) grpck.8.xml:96(filename)
-#: groupmod.8.xml:101(filename) groupmems.8.xml:112(filename)
-#: groupdel.8.xml:52(filename) groupadd.8.xml:123(filename)
-#: gpasswd.1.xml:156(filename)
+#: vipw.8.xml:100(filename) sg.1.xml:64(filename) newusers.8.xml:117(filename)
+#: newgrp.1.xml:75(filename) gshadow.5.xml:70(filename)
+#: grpck.8.xml:96(filename) groupmod.8.xml:101(filename)
+#: groupmems.8.xml:112(filename) groupdel.8.xml:52(filename)
+#: groupadd.8.xml:123(filename) gpasswd.1.xml:13(filename)
+#: gpasswd.1.xml:187(filename) chgpasswd.8.xml:134(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
-#: vipw.8.xml:102(para) sg.1.xml:66(para) newgrp.1.xml:77(para)
-#: gshadow.5.xml:72(para) grpck.8.xml:98(para) groupmod.8.xml:103(para)
-#: groupdel.8.xml:54(para) groupadd.8.xml:125(para) gpasswd.1.xml:158(para)
+#: vipw.8.xml:102(para) sg.1.xml:66(para) newusers.8.xml:119(para)
+#: newgrp.1.xml:77(para) gshadow.5.xml:72(para) grpck.8.xml:98(para)
+#: groupmod.8.xml:103(para) groupdel.8.xml:54(para) groupadd.8.xml:125(para)
+#: gpasswd.1.xml:189(para) chgpasswd.8.xml:136(para)
 msgid "Secure group account information."
 msgstr "Informations sécurisées sur les groupes."
 
-#: vipw.8.xml:106(filename) usermod.8.xml:255(filename)
-#: userdel.8.xml:104(filename) useradd.8.xml:373(filename)
+#: vipw.8.xml:106(filename) usermod.8.xml:269(filename)
+#: userdel.8.xml:104(filename) useradd.8.xml:374(filename)
 #: su.1.xml:179(filename) sg.1.xml:46(filename) shadow.5.xml:108(filename)
 #: pwck.8.xml:154(filename) passwd.5.xml:90(filename)
-#: passwd.1.xml:325(filename) newgrp.1.xml:57(filename)
-#: login.1.xml:213(filename) grpck.8.xml:102(filename)
-#: expiry.1.xml:35(filename) chsh.1.xml:88(filename) chfn.1.xml:69(filename)
+#: passwd.1.xml:327(filename) newusers.8.xml:99(filename)
+#: newgrp.1.xml:57(filename) login.1.xml:213(filename)
+#: grpck.8.xml:102(filename) expiry.1.xml:35(filename) chsh.1.xml:88(filename)
+#: chpasswd.8.xml:251(filename) chfn.1.xml:69(filename)
 #: chage.1.xml:181(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
-#: vipw.8.xml:108(para) usermod.8.xml:257(para) userdel.8.xml:106(para)
-#: useradd.8.xml:375(para) su.1.xml:181(para) sg.1.xml:48(para)
+#: vipw.8.xml:108(para) usermod.8.xml:271(para) userdel.8.xml:106(para)
+#: useradd.8.xml:376(para) su.1.xml:181(para) sg.1.xml:48(para)
 #: shadow.5.xml:110(para) pwck.8.xml:156(para) passwd.5.xml:92(para)
-#: passwd.1.xml:327(para) newgrp.1.xml:59(para) login.1.xml:215(para)
-#: grpck.8.xml:104(para) expiry.1.xml:37(para) chsh.1.xml:90(para)
-#: chfn.1.xml:71(para) chage.1.xml:184(para)
+#: passwd.1.xml:329(para) newusers.8.xml:101(para) newgrp.1.xml:59(para)
+#: login.1.xml:215(para) grpck.8.xml:104(para) expiry.1.xml:37(para)
+#: chsh.1.xml:90(para) chpasswd.8.xml:253(para) chfn.1.xml:71(para)
+#: chage.1.xml:184(para)
 msgid "User account information."
 msgstr "Informations sur les comptes des utilisateurs."
 
-#: vipw.8.xml:112(filename) usermod.8.xml:261(filename)
-#: userdel.8.xml:110(filename) useradd.8.xml:379(filename)
+#: vipw.8.xml:112(filename) usermod.8.xml:275(filename)
+#: userdel.8.xml:110(filename) useradd.8.xml:380(filename)
 #: su.1.xml:185(filename) sg.1.xml:52(filename) shadow.5.xml:114(filename)
 #: shadow.3.xml:175(filename) pwck.8.xml:160(filename)
-#: passwd.5.xml:96(filename) passwd.1.xml:331(filename)
-#: newgrp.1.xml:63(filename) login.1.xml:219(filename)
-#: expiry.1.xml:41(filename) chage.1.xml:189(filename)
+#: passwd.5.xml:96(filename) passwd.1.xml:333(filename)
+#: newusers.8.xml:105(filename) newgrp.1.xml:63(filename)
+#: login.1.xml:219(filename) expiry.1.xml:41(filename)
+#: chpasswd.8.xml:257(filename) chage.1.xml:189(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
-#: vipw.8.xml:114(para) usermod.8.xml:263(para) userdel.8.xml:112(para)
-#: useradd.8.xml:381(para) su.1.xml:187(para) sg.1.xml:54(para)
+#: vipw.8.xml:114(para) usermod.8.xml:277(para) userdel.8.xml:112(para)
+#: useradd.8.xml:382(para) su.1.xml:187(para) sg.1.xml:54(para)
 #: shadow.5.xml:116(para) shadow.3.xml:177(para) pwck.8.xml:162(para)
-#: passwd.1.xml:333(para) newgrp.1.xml:65(para) login.1.xml:221(para)
-#: expiry.1.xml:43(para) chage.1.xml:192(para)
+#: passwd.1.xml:335(para) newusers.8.xml:107(para) newgrp.1.xml:65(para)
+#: login.1.xml:221(para) expiry.1.xml:43(para) chpasswd.8.xml:259(para)
+#: chage.1.xml:192(para)
 msgid "Secure user account information."
 msgstr "Informations sécurisées sur les comptes utilisateurs."
 
-#: vipw.8.xml:120(title) usermod.8.xml:270(title) userdel.8.xml:191(title)
-#: useradd.8.xml:481(title) suauth.5.xml:168(title) su.1.xml:194(title)
+#: vipw.8.xml:120(title) usermod.8.xml:284(title) userdel.8.xml:191(title)
+#: useradd.8.xml:482(title) suauth.5.xml:168(title) su.1.xml:194(title)
 #: sg.1.xml:73(title) shadow.5.xml:123(title) shadow.3.xml:184(title)
 #: pwconv.8.xml:121(title) pwck.8.xml:169(title) porttime.5.xml:88(title)
-#: passwd.5.xml:105(title) passwd.1.xml:391(title) nologin.8.xml:35(title)
-#: newusers.8.xml:102(title) newgrp.1.xml:84(title)
-#: login.defs.5.xml:256(title) login.access.5.xml:78(title)
+#: passwd.5.xml:105(title) passwd.1.xml:393(title) nologin.8.xml:35(title)
+#: newusers.8.xml:132(title) newgrp.1.xml:84(title)
+#: login.defs.5.xml:412(title) login.access.5.xml:78(title)
 #: login.1.xml:252(title) limits.5.xml:120(title) gshadow.5.xml:79(title)
 #: grpck.8.xml:111(title) groups.1.xml:58(title) groupmod.8.xml:161(title)
 #: groupmems.8.xml:121(title) groupdel.8.xml:100(title)
-#: groupadd.8.xml:197(title) gpasswd.1.xml:165(title) faillog.8.xml:144(title)
+#: groupadd.8.xml:204(title) gpasswd.1.xml:196(title) faillog.8.xml:144(title)
 #: faillog.5.xml:50(title) expiry.1.xml:50(title) chsh.1.xml:109(title)
-#: chpasswd.8.xml:85(title) chgpasswd.8.xml:84(title) chfn.1.xml:78(title)
+#: chpasswd.8.xml:272(title) chgpasswd.8.xml:149(title) chfn.1.xml:78(title)
 #: chage.1.xml:232(title)
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
@@ -306,7 +315,7 @@
 "citerefentry>."
 
 #: usermod.8.xml:5(refentrytitle) usermod.8.xml:10(refname)
-#: usermod.8.xml:16(command) login.defs.5.xml:229(term)
+#: usermod.8.xml:16(command) login.defs.5.xml:385(term)
 msgid "usermod"
 msgstr "usermod"
 
@@ -366,7 +375,7 @@
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: usermod.8.xml:65(term) useradd.8.xml:91(term)
+#: usermod.8.xml:65(term) useradd.8.xml:92(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -384,7 +393,7 @@
 "option> est fournie, le contenu du répertoire personnel actuel sera déplacé "
 "dans le nouveau répertoire personnel, qui sera créé si nécessaire."
 
-#: usermod.8.xml:79(term) useradd.8.xml:108(term) useradd.8.xml:293(term)
+#: usermod.8.xml:79(term) useradd.8.xml:109(term) useradd.8.xml:294(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -392,7 +401,7 @@
 "<option>-e</option>, <option>--expiredate</option> "
 "<replaceable>DATE_FIN_VALIDITÉ</replaceable>"
 
-#: usermod.8.xml:84(para) useradd.8.xml:113(para)
+#: usermod.8.xml:84(para) useradd.8.xml:114(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>."
@@ -400,7 +409,7 @@
 "Date à laquelle le compte utilisateur sera désactivé. La date est indiquée "
 "dans le format <emphasis remap=\"I\">AAAA-MM-JJ</emphasis>."
 
-#: usermod.8.xml:91(term) useradd.8.xml:120(term) useradd.8.xml:302(term)
+#: usermod.8.xml:91(term) useradd.8.xml:121(term) useradd.8.xml:303(term)
 msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -408,7 +417,7 @@
 "<option>-f</option>, <option>--inactive</option> "
 "<replaceable>DURÉE_INACTIVITÉ</replaceable>"
 
-#: usermod.8.xml:96(para) useradd.8.xml:125(para)
+#: usermod.8.xml:96(para) useradd.8.xml:126(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 "
@@ -419,7 +428,7 @@
 "que le mot de passe a dépassé sa fin de validité, et une valeur de -1 "
 "désactive cette fonctionnalité. La valeur par défaut est de -1."
 
-#: usermod.8.xml:105(term) useradd.8.xml:134(term) useradd.8.xml:314(term)
+#: usermod.8.xml:105(term) useradd.8.xml:135(term) useradd.8.xml:315(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
@@ -435,7 +444,7 @@
 "l'utilisateur. Le nom du groupe doit exister. Un numéro de groupe doit se "
 "référer à un groupe déjà existant. Le numéro de groupe par défaut est de 1."
 
-#: usermod.8.xml:118(term) useradd.8.xml:148(term)
+#: usermod.8.xml:118(term) useradd.8.xml:149(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -501,11 +510,18 @@
 "pouvez pas utiliser cette option avec <option>-p</option> ou <option>-U</"
 "option>."
 
-#: usermod.8.xml:164(term) useradd.8.xml:217(term) groupmod.8.xml:78(term)
+#: usermod.8.xml:161(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:170(term) useradd.8.xml:218(term) groupmod.8.xml:78(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
-#: usermod.8.xml:168(para)
+#: usermod.8.xml:174(para)
 msgid ""
 "When used with the <option>-u</option> option, this option allows to change "
 "the user ID to a non-unique value."
@@ -513,7 +529,7 @@
 "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:175(term) useradd.8.xml:225(term)
+#: usermod.8.xml:181(term) useradd.8.xml:226(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -521,7 +537,7 @@
 "<option>-p</option>, <option>--password</option> <replaceable>MOT_DE_PASSE</"
 "replaceable>"
 
-#: usermod.8.xml:180(para)
+#: usermod.8.xml:186(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
@@ -529,7 +545,7 @@
 "Mot de passe chiffré, comme renvoyé par <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
 
-#: usermod.8.xml:188(term) useradd.8.xml:238(term) useradd.8.xml:327(term)
+#: usermod.8.xml:194(term) useradd.8.xml:239(term) useradd.8.xml:328(term)
 #: su.1.xml:108(term) chsh.1.xml:50(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
@@ -537,7 +553,7 @@
 "<option>-s</option>, <option>--shell</option> <replaceable>INTERPRÉTEUR</"
 "replaceable>"
 
-#: usermod.8.xml:193(para) chsh.1.xml:54(para)
+#: usermod.8.xml:199(para) chsh.1.xml:54(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."
@@ -546,13 +562,13 @@
 "l'utilisateur. Si ce champ est vide, le système sélectionnera l'interpréteur "
 "de commandes initial par défaut."
 
-#: usermod.8.xml:200(term) useradd.8.xml:251(term)
+#: usermod.8.xml:206(term) useradd.8.xml:252(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option> <replaceable>UID</replaceable>"
 
-#: usermod.8.xml:205(para)
+#: usermod.8.xml:211(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. Values "
@@ -570,11 +586,11 @@
 "même les fichiers situés à l'extérieur du répertoire personnel de "
 "l'utilisateur."
 
-#: usermod.8.xml:218(term)
+#: usermod.8.xml:224(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:222(para)
+#: usermod.8.xml:228(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</"
@@ -584,15 +600,24 @@
 "devant le mot de passe chiffré. Vous ne pouvez pas utiliser cette option "
 "avec <option>-p</option> ou <option>-L</option>."
 
-#: usermod.8.xml:233(title) userdel.8.xml:170(title) useradd.8.xml:350(title)
-#: su.1.xml:168(title) shadow.3.xml:164(title) passwd.1.xml:311(title)
+#: usermod.8.xml:233(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 <replaceable>EXPIRE</"
+"replaceable> value from <filename>/etc/default/useradd</filename>)."
+msgstr ""
+
+#: usermod.8.xml:247(title) userdel.8.xml:170(title) useradd.8.xml:351(title)
+#: su.1.xml:168(title) shadow.3.xml:164(title) passwd.1.xml:313(title)
 #: newusers.8.xml:82(title) login.1.xml:164(title) lastlog.8.xml:125(title)
-#: groupdel.8.xml:36(title) groupadd.8.xml:138(title) faillog.8.xml:121(title)
-#: chpasswd.8.xml:77(title) chgpasswd.8.xml:76(title)
+#: groupdel.8.xml:36(title) groupadd.8.xml:138(title) gpasswd.1.xml:166(title)
+#: faillog.8.xml:121(title) chpasswd.8.xml:118(title)
+#: chgpasswd.8.xml:117(title)
 msgid "CAVEATS"
 msgstr "AVERTISSEMENTS"
 
-#: usermod.8.xml:234(para)
+#: usermod.8.xml:248(para)
 msgid ""
 "<command>usermod</command> will not allow you to change the name of a user "
 "who is logged in. You must make certain that the named user is not executing "
@@ -611,7 +636,7 @@
 "Vous devez effectuer toutes les modifications impliquant NIS sur le serveur "
 "NIS."
 
-#: usermod.8.xml:271(para)
+#: usermod.8.xml:285(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -650,7 +675,7 @@
 "manvolnum></citerefentry>."
 
 #: userdel.8.xml:5(refentrytitle) userdel.8.xml:10(refname)
-#: userdel.8.xml:15(command) login.defs.5.xml:221(term)
+#: userdel.8.xml:15(command) login.defs.5.xml:377(term)
 msgid "userdel"
 msgstr "userdel"
 
@@ -732,43 +757,45 @@
 "Le répertoire d'attente des courriels est défini par la variable "
 "<emphasis>MAIL_DIR</emphasis> du fichier <filename>login.defs</filename>."
 
-#: userdel.8.xml:98(filename) useradd.8.xml:403(filename)
-#: pwconv.8.xml:112(filename) newusers.8.xml:93(filename)
+#: userdel.8.xml:98(filename) useradd.8.xml:404(filename)
+#: pwconv.8.xml:112(filename) newusers.8.xml:123(filename)
 #: login.access.5.xml:69(filename) groupadd.8.xml:129(filename)
-#: chsh.1.xml:100(filename) chfn.1.xml:63(filename)
+#: chsh.1.xml:100(filename) chpasswd.8.xml:263(filename)
+#: chgpasswd.8.xml:140(filename) chfn.1.xml:63(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:100(para) useradd.8.xml:405(para) pwconv.8.xml:114(para)
-#: newusers.8.xml:95(para) login.access.5.xml:71(para)
-#: groupadd.8.xml:131(para) chsh.1.xml:102(para) chfn.1.xml:65(para)
+#: userdel.8.xml:100(para) useradd.8.xml:406(para) pwconv.8.xml:114(para)
+#: newusers.8.xml:125(para) login.access.5.xml:71(para)
+#: groupadd.8.xml:131(para) chsh.1.xml:102(para) chpasswd.8.xml:265(para)
+#: chgpasswd.8.xml:142(para) chfn.1.xml:65(para)
 msgid "Shadow password suite configuration."
 msgstr ""
 "Configuration de la suite des mots de passe cachés « shadow password »."
 
-#: userdel.8.xml:119(title) useradd.8.xml:412(title) pwck.8.xml:186(title)
-#: passwd.1.xml:340(title) grpck.8.xml:129(title) groupmod.8.xml:110(title)
-#: groupdel.8.xml:61(title) groupadd.8.xml:152(title) chage.1.xml:199(title)
+#: userdel.8.xml:119(title) useradd.8.xml:413(title) pwck.8.xml:186(title)
+#: passwd.1.xml:342(title) grpck.8.xml:129(title) groupmod.8.xml:110(title)
+#: groupdel.8.xml:61(title) groupadd.8.xml:159(title) chage.1.xml:199(title)
 msgid "EXIT VALUES"
 msgstr "VALEURS DE RETOUR"
 
-#: userdel.8.xml:124(replaceable) useradd.8.xml:417(replaceable)
-#: pwck.8.xml:191(replaceable) passwd.1.xml:345(replaceable)
+#: userdel.8.xml:124(replaceable) useradd.8.xml:418(replaceable)
+#: pwck.8.xml:191(replaceable) passwd.1.xml:347(replaceable)
 #: grpck.8.xml:134(replaceable) groupmod.8.xml:115(replaceable)
-#: groupdel.8.xml:66(replaceable) groupadd.8.xml:157(replaceable)
+#: groupdel.8.xml:66(replaceable) groupadd.8.xml:164(replaceable)
 #: chage.1.xml:204(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:126(para) useradd.8.xml:419(para) pwck.8.xml:193(para)
-#: passwd.1.xml:347(para) grpck.8.xml:136(para) groupmod.8.xml:117(para)
-#: groupdel.8.xml:68(para) groupadd.8.xml:159(para) chage.1.xml:206(para)
+#: userdel.8.xml:126(para) useradd.8.xml:420(para) pwck.8.xml:193(para)
+#: passwd.1.xml:349(para) grpck.8.xml:136(para) groupmod.8.xml:117(para)
+#: groupdel.8.xml:68(para) groupadd.8.xml:166(para) chage.1.xml:206(para)
 msgid "success"
 msgstr "succès"
 
-#: userdel.8.xml:130(replaceable) useradd.8.xml:423(replaceable)
+#: userdel.8.xml:130(replaceable) useradd.8.xml:424(replaceable)
 #: su.1.xml:6(manvolnum) sg.1.xml:6(manvolnum) pwck.8.xml:197(replaceable)
-#: passwd.1.xml:6(manvolnum) passwd.1.xml:351(replaceable)
+#: passwd.1.xml:6(manvolnum) passwd.1.xml:353(replaceable)
 #: newgrp.1.xml:6(manvolnum) login.1.xml:6(manvolnum)
 #: grpck.8.xml:140(replaceable) groups.1.xml:6(manvolnum)
 #: gpasswd.1.xml:6(manvolnum) expiry.1.xml:6(manvolnum)
@@ -777,26 +804,26 @@
 msgid "1"
 msgstr "1"
 
-#: userdel.8.xml:132(para) useradd.8.xml:425(para)
+#: userdel.8.xml:132(para) useradd.8.xml:426(para)
 msgid "can't update password file"
 msgstr "impossible de mettre à jour le fichier des mots de passe"
 
-#: userdel.8.xml:136(replaceable) useradd.8.xml:429(replaceable)
-#: pwck.8.xml:203(replaceable) passwd.1.xml:357(replaceable)
+#: userdel.8.xml:136(replaceable) useradd.8.xml:430(replaceable)
+#: pwck.8.xml:203(replaceable) passwd.1.xml:359(replaceable)
 #: grpck.8.xml:146(replaceable) groupmod.8.xml:121(replaceable)
-#: groupdel.8.xml:72(replaceable) groupadd.8.xml:163(replaceable)
+#: groupdel.8.xml:72(replaceable) groupadd.8.xml:170(replaceable)
 #: chage.1.xml:216(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:138(para) useradd.8.xml:431(para) pwck.8.xml:199(para)
+#: userdel.8.xml:138(para) useradd.8.xml:432(para) pwck.8.xml:199(para)
 #: grpck.8.xml:142(para) groupmod.8.xml:123(para) groupdel.8.xml:74(para)
-#: groupadd.8.xml:165(para) chage.1.xml:218(para)
+#: groupadd.8.xml:172(para) chage.1.xml:218(para)
 msgid "invalid command syntax"
 msgstr "erreur de syntaxe"
 
-#: userdel.8.xml:142(replaceable) useradd.8.xml:447(replaceable)
-#: passwd.1.xml:381(replaceable) groupmod.8.xml:139(replaceable)
+#: userdel.8.xml:142(replaceable) useradd.8.xml:448(replaceable)
+#: passwd.1.xml:383(replaceable) groupmod.8.xml:139(replaceable)
 #: groupdel.8.xml:78(replaceable)
 msgid "6"
 msgstr "6"
@@ -809,18 +836,18 @@
 msgid "user currently logged in"
 msgstr "l'utilisateur est actuellement connecté"
 
-#: userdel.8.xml:154(replaceable) useradd.8.xml:459(replaceable)
+#: userdel.8.xml:154(replaceable) useradd.8.xml:460(replaceable)
 #: groupmod.8.xml:151(replaceable) groupdel.8.xml:90(replaceable)
-#: groupadd.8.xml:187(replaceable)
+#: groupadd.8.xml:194(replaceable)
 msgid "10"
 msgstr "10"
 
-#: userdel.8.xml:156(para) useradd.8.xml:461(para) groupmod.8.xml:153(para)
-#: groupdel.8.xml:92(para) groupadd.8.xml:189(para)
+#: userdel.8.xml:156(para) useradd.8.xml:462(para) groupmod.8.xml:153(para)
+#: groupdel.8.xml:92(para) groupadd.8.xml:196(para)
 msgid "can't update group file"
 msgstr "impossible de mettre à jour le fichier des groupes"
 
-#: userdel.8.xml:160(replaceable) useradd.8.xml:465(replaceable)
+#: userdel.8.xml:160(replaceable) useradd.8.xml:466(replaceable)
 msgid "12"
 msgstr "12"
 
@@ -910,7 +937,7 @@
 
 #: useradd.8.xml:5(refentrytitle) useradd.8.xml:10(refname)
 #: useradd.8.xml:15(command) useradd.8.xml:22(command)
-#: useradd.8.xml:26(command) login.defs.5.xml:210(term)
+#: useradd.8.xml:26(command) login.defs.5.xml:366(term)
 msgid "useradd"
 msgstr "useradd"
 
@@ -920,7 +947,7 @@
 "créer un nouvel utilisateur ou modifier les informations par défaut "
 "appliquées aux nouveaux utilisateurs"
 
-#: useradd.8.xml:23(arg) useradd.8.xml:27(arg) useradd.8.xml:82(option)
+#: useradd.8.xml:23(arg) useradd.8.xml:27(arg) useradd.8.xml:83(option)
 msgid "-D"
 msgstr "-D"
 
@@ -955,7 +982,7 @@
 "elle est actuellement utilisée comme champ pour le nom complet de "
 "l'utilisateur."
 
-#: useradd.8.xml:66(term) useradd.8.xml:278(term)
+#: useradd.8.xml:66(term) useradd.8.xml:279(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
@@ -964,11 +991,13 @@
 "replaceable>"
 
 #: useradd.8.xml:71(para)
+#, fuzzy
 msgid ""
-"The default base directory for the system if <option>-d</option> dir 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."
+"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 ""
 "Répertoire de base par défaut du système si l'option <option>-d</option> rép "
 "n'est pas spécifiée. <replaceable>RÉP_BASE</replaceable> est concaténé avec "
@@ -976,12 +1005,12 @@
 "<option>-m</option> n'est pas utilisée, <replaceable>RÉP_BASE</replaceable> "
 "doit exister."
 
-#: useradd.8.xml:85(para)
+#: useradd.8.xml:86(para)
 #, fuzzy
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr "Modifier les valeurs par défaut"
 
-#: useradd.8.xml:96(para)
+#: useradd.8.xml:97(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 "
@@ -998,7 +1027,7 @@
 "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:139(para)
+#: useradd.8.xml:140(para)
 msgid ""
 "The group name or number of the user's initial login group. The group name "
 "must exist. A group number must refer to an already existing group. The "
@@ -1010,7 +1039,7 @@
 "existant. Le numéro de groupe par défaut est de 1, ou la valeur indiquée "
 "dans <filename>/etc/default/useradd</filename>."
 
-#: useradd.8.xml:153(para)
+#: useradd.8.xml:154(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. "
@@ -1024,11 +1053,11 @@
 "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:170(term)
+#: useradd.8.xml:171(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:174(para)
+#: useradd.8.xml:175(para)
 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 "
@@ -1051,7 +1080,7 @@
 "avec l'option <option>-m</option>. Le comportement par défaut est de ne pas "
 "créer le répertoire, et de ne copier aucun fichier."
 
-#: useradd.8.xml:190(term)
+#: useradd.8.xml:191(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -1059,7 +1088,7 @@
 "<option>-K</option>, <option>--key</option> <replaceable>CLÉ</"
 "replaceable>=<replaceable>VALEUR</replaceable>"
 
-#: useradd.8.xml:195(para)
+#: useradd.8.xml:196(para)
 msgid ""
 "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS "
 "and others). <placeholder-1/> Example: <option>-K </"
@@ -1082,7 +1111,7 @@
 "replaceable>=<replaceable>100</replaceable> <option>-K</option> "
 "<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: useradd.8.xml:209(para)
+#: useradd.8.xml:210(para)
 msgid ""
 "Note: <option>-K </option><replaceable>UID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
@@ -1092,13 +1121,13 @@
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable> ne fonctionne pas pour l'instant."
 
-#: useradd.8.xml:221(para)
+#: useradd.8.xml:222(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:230(para)
+#: useradd.8.xml:231(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
@@ -1108,7 +1137,7 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>. Le comportement par défaut est de désactiver le compte."
 
-#: useradd.8.xml:243(para)
+#: useradd.8.xml:244(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."
@@ -1117,7 +1146,7 @@
 "shell »). Le comportement par défaut est de laisser ce champ vide. Le "
 "système sélectionnera alors l'interpréteur par défaut."
 
-#: useradd.8.xml:256(para)
+#: useradd.8.xml:257(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -1133,11 +1162,11 @@
 "comprises entre 0 et 999 sont généralement réservées pour les comptes "
 "systèmes."
 
-#: useradd.8.xml:268(title)
+#: useradd.8.xml:269(title)
 msgid "Changing the default values"
 msgstr "Modifier les valeurs par défaut"
 
-#: useradd.8.xml:269(para)
+#: useradd.8.xml:270(para)
 #, fuzzy
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
@@ -1149,7 +1178,7 @@
 "command> affichera soit les valeurs actuelles par défaut, soit mettra à jour "
 "les valeurs par défaut via la ligne de commande. Les options valables sont :"
 
-#: useradd.8.xml:283(para)
+#: useradd.8.xml:284(para)
 #, fuzzy
 msgid ""
 "The path prefix for a new user's home directory. The user's name will be "
@@ -1162,11 +1191,11 @@
 "replaceable> pour créer le nom du nouveau répertoire si l'option <option>-d</"
 "option> n'est pas utilisée pendant la création d'un nouveau compte."
 
-#: useradd.8.xml:298(para)
+#: useradd.8.xml:299(para)
 msgid "The date on which the user account is disabled."
 msgstr "Date à laquelle le compte utilisateur sera désactivé."
 
-#: useradd.8.xml:307(para)
+#: useradd.8.xml:308(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
@@ -1174,7 +1203,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:319(para)
+#: useradd.8.xml:320(para)
 msgid ""
 "The group name or ID for a new user's initial group. The named group must "
 "exist, and a numerical group ID must have an existing entry."
@@ -1183,15 +1212,15 @@
 "utilisateur. Le groupe spécifié doit exister, et un identifiant de groupe "
 "numérique doit déjà exister."
 
-#: useradd.8.xml:332(para)
+#: useradd.8.xml:333(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
-#: useradd.8.xml:343(title)
+#: useradd.8.xml:344(title)
 msgid "NOTES"
 msgstr "NOTES"
 
-#: useradd.8.xml:344(para)
+#: useradd.8.xml:345(para)
 msgid ""
 "The system administrator is responsible for placing the default user files "
 "in the <filename>/etc/skel/</filename> directory."
@@ -1199,26 +1228,28 @@
 "L'administrateur système doit se charger de placer les fichiers par défaut "
 "dans le répertoire <filename>/etc/skel</filename>."
 
-#: useradd.8.xml:351(para)
+#: useradd.8.xml:352(para)
+#, fuzzy
 msgid ""
-"You may not add a user to a NIS group. This must be performed on the NIS "
-"server."
+"You may not add a user to a NIS or LDAP group. This must be performed on the "
+"corresponding server."
 msgstr ""
 "Vous ne pouvez pas ajouter d'utilisateur à un groupe NIS. Cela doit être "
 "effectué sur le serveur NIS."
 
-#: useradd.8.xml:356(para)
+#: useradd.8.xml:357(para)
+#, fuzzy
 msgid ""
 "Similarly, if the username already exists in an external user database such "
-"as NIS, <command>useradd</command> will deny the user account creation "
-"request."
+"as NIS or LDAP, <command>useradd</command> will deny the user account "
+"creation request."
 msgstr ""
 "De la même façon, si le nom de l'utilisateur existe dans une base de données "
 "externe, telle que NIS, <command>useradd</command> refusera de créer le "
 "compte d'utilisateur."
 
 # NOTE: digits
-#: useradd.8.xml:362(para)
+#: useradd.8.xml:363(para)
 msgid ""
 "Usernames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
@@ -1229,71 +1260,71 @@
 "des « underscore », des tirets ou un dollar peuvent suivre. Soit, sous la "
 "forme d'une expression rationnelle : [a-z_][a-z0-9_-]*[$]"
 
-#: useradd.8.xml:391(filename)
+#: useradd.8.xml:392(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
-#: useradd.8.xml:393(para)
+#: useradd.8.xml:394(para)
 msgid "Default values for account creation."
 msgstr "Valeurs par défaut pour la création de comptes."
 
-#: useradd.8.xml:397(filename)
+#: useradd.8.xml:398(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
-#: useradd.8.xml:399(para)
+#: useradd.8.xml:400(para)
 msgid "Directory containing default files."
 msgstr "Répertoire contenant les fichiers par défaut."
 
-#: useradd.8.xml:435(replaceable) shadow.3.xml:6(manvolnum)
-#: pwck.8.xml:209(replaceable) passwd.1.xml:363(replaceable)
+#: useradd.8.xml:436(replaceable) shadow.3.xml:6(manvolnum)
+#: pwck.8.xml:209(replaceable) passwd.1.xml:365(replaceable)
 #: grpck.8.xml:152(replaceable) groupmod.8.xml:127(replaceable)
-#: groupadd.8.xml:169(replaceable)
+#: groupadd.8.xml:176(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:437(para) passwd.1.xml:383(para) groupmod.8.xml:129(para)
-#: groupadd.8.xml:171(para)
+#: useradd.8.xml:438(para) passwd.1.xml:385(para) groupmod.8.xml:129(para)
+#: groupadd.8.xml:178(para)
 msgid "invalid argument to option"
 msgstr "paramètre non valable pour l'option"
 
-#: useradd.8.xml:441(replaceable) pwck.8.xml:215(replaceable)
-#: passwd.1.xml:369(replaceable) grpck.8.xml:158(replaceable)
-#: groupmod.8.xml:133(replaceable) groupadd.8.xml:175(replaceable)
+#: useradd.8.xml:442(replaceable) pwck.8.xml:215(replaceable)
+#: passwd.1.xml:371(replaceable) grpck.8.xml:158(replaceable)
+#: groupmod.8.xml:133(replaceable) groupadd.8.xml:182(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:443(para)
+#: useradd.8.xml:444(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:449(para) groupmod.8.xml:135(para) groupmod.8.xml:141(para)
+#: useradd.8.xml:450(para) groupmod.8.xml:135(para) groupmod.8.xml:141(para)
 #: groupdel.8.xml:80(para)
 msgid "specified group doesn't exist"
 msgstr "le groupe spécifié n'existe pas"
 
-#: useradd.8.xml:453(replaceable) groupmod.8.xml:145(replaceable)
-#: groupadd.8.xml:181(replaceable)
+#: useradd.8.xml:454(replaceable) groupmod.8.xml:145(replaceable)
+#: groupadd.8.xml:188(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:455(para)
+#: useradd.8.xml:456(para)
 msgid "username already in use"
 msgstr "nom d'utilisateur déjà utilisé"
 
-#: useradd.8.xml:467(para)
+#: useradd.8.xml:468(para)
 msgid "can't create home directory"
 msgstr "impossible de créer le répertoire personnel"
 
-#: useradd.8.xml:471(replaceable)
+#: useradd.8.xml:472(replaceable)
 msgid "13"
 msgstr "13"
 
-#: useradd.8.xml:473(para)
+#: useradd.8.xml:474(para)
 msgid "can't create mail spool"
 msgstr "impossible de créer le répertoire d'attente des courriels"
 
-#: useradd.8.xml:413(para)
+#: useradd.8.xml:414(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1301,7 +1332,7 @@
 "La commande <command>useradd</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: useradd.8.xml:482(para)
+#: useradd.8.xml:483(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1345,7 +1376,7 @@
 
 #: suauth.5.xml:6(manvolnum) shadow.5.xml:6(manvolnum)
 #: pwck.8.xml:221(replaceable) porttime.5.xml:6(manvolnum)
-#: passwd.5.xml:6(manvolnum) passwd.1.xml:375(replaceable)
+#: passwd.5.xml:6(manvolnum) passwd.1.xml:377(replaceable)
 #: login.defs.5.xml:6(manvolnum) login.access.5.xml:6(manvolnum)
 #: limits.5.xml:6(manvolnum) gshadow.5.xml:6(manvolnum)
 #: grpck.8.xml:164(replaceable) faillog.5.xml:6(manvolnum)
@@ -1547,7 +1578,7 @@
 "      #\n"
 "    "
 
-#: suauth.5.xml:149(title) pwconv.8.xml:98(title) login.defs.5.xml:239(title)
+#: suauth.5.xml:149(title) pwconv.8.xml:98(title) login.defs.5.xml:395(title)
 msgid "BUGS"
 msgstr "BOGUES"
 
@@ -2337,7 +2368,7 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 #: pwconv.8.xml:5(refentrytitle) pwconv.8.xml:10(refname)
-#: pwconv.8.xml:19(command) login.defs.5.xml:204(term)
+#: pwconv.8.xml:19(command) login.defs.5.xml:360(term)
 msgid "pwconv"
 msgstr "pwconv"
 
@@ -2523,7 +2554,7 @@
 msgstr "passwd"
 
 #: pwck.8.xml:31(arg) pwck.8.xml:114(option) login.1.xml:148(option)
-#: grpck.8.xml:16(arg) gpasswd.1.xml:93(option)
+#: grpck.8.xml:16(arg) gpasswd.1.xml:112(option)
 msgid "-r"
 msgstr "-r"
 
@@ -3209,15 +3240,17 @@
 msgstr "<option>-l</option>, <option>--lock</option>"
 
 #: passwd.1.xml:215(para)
+#, fuzzy
 msgid ""
 "Lock the named account. This option disables an account by changing the "
-"password to a value which matches no possible encrypted value."
+"password to a value which matches no possible encrypted value, and by "
+"setting the account expiry field to 1."
 msgstr ""
 "Verrouille le compte indiqué. Cette option désactive un compte en modifiant "
 "son mot de passe pour une valeur qui ne peut pas correspondre à un mot de "
 "passe chiffré possible."
 
-#: passwd.1.xml:222(term) chage.1.xml:109(term)
+#: passwd.1.xml:223(term) chage.1.xml:109(term)
 msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -3225,7 +3258,7 @@
 "<option>-m</option>, <option>--mindays</option> <replaceable>JOURS_MIN</"
 "replaceable>"
 
-#: passwd.1.xml:226(para) chage.1.xml:113(para)
+#: passwd.1.xml:227(para) chage.1.xml:113(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -3235,7 +3268,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:244(term)
+#: passwd.1.xml:245(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -3243,17 +3276,17 @@
 "<option>-r</option>, <option>--repository</option> <replaceable>REPOSITORY</"
 "replaceable>"
 
-#: passwd.1.xml:248(para)
+#: passwd.1.xml:249(para)
 #, fuzzy
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr ""
 "Change le mot de passe de la base <replaceable>REPOSITORY</replaceable>"
 
-#: passwd.1.xml:254(term)
+#: passwd.1.xml:255(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
-#: passwd.1.xml:258(para)
+#: passwd.1.xml:259(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 "
@@ -3270,22 +3303,23 @@
 "maximum de validité, la durée d'avertissement, et la durée d'inactivité "
 "autorisée pour le mot de passe. Les durées sont exprimées en jours."
 
-#: passwd.1.xml:271(term)
+#: passwd.1.xml:272(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
 # NOTE: to "the" value
-#: passwd.1.xml:275(para)
+#: passwd.1.xml:276(para)
+#, fuzzy
 msgid ""
 "Unlock the named account. This option re-enables an account by changing the "
 "password back to its previous value (to value before using <option>-l</"
-"option> option)."
+"option> option), and by resetting the account expiry field."
 msgstr ""
 "Déverrouille le compte indiqué. Cette option réactive un compte en changeant "
 "un mot de passe à sa valeur précédente (la valeur présente avant "
 "l'utilisation de l'option <option>-l</option>)."
 
-#: passwd.1.xml:283(term)
+#: passwd.1.xml:285(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -3293,7 +3327,7 @@
 "<option>-w</option>, <option>--warndays</option> "
 "<replaceable>DURÉE_AVERTISSEMENT</replaceable>"
 
-#: passwd.1.xml:287(para)
+#: passwd.1.xml:289(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 "
@@ -3306,7 +3340,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:296(term)
+#: passwd.1.xml:298(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -3314,7 +3348,7 @@
 "<option>-x</option>, <option>--maxdays</option> <replaceable>JOURS_MAX</"
 "replaceable>"
 
-#: passwd.1.xml:300(para)
+#: passwd.1.xml:302(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -3323,7 +3357,7 @@
 "valable. Après <replaceable>JOURS_MAX</replaceable>, le mot de passe devra "
 "être modifié."
 
-#: passwd.1.xml:312(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Not all options may be supported. Password complexity checking may vary from "
 "site to site. The user is urged to select a password as complex as he or she "
@@ -3337,29 +3371,29 @@
 "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:353(para) chage.1.xml:212(para)
+#: passwd.1.xml:355(para) chage.1.xml:212(para)
 msgid "permission denied"
 msgstr "permission refusée"
 
-#: passwd.1.xml:359(para)
+#: passwd.1.xml:361(para)
 msgid "invalid combination of options"
 msgstr "combinaison d'options non valable"
 
-#: passwd.1.xml:365(para)
+#: passwd.1.xml:367(para)
 msgid "unexpected failure, nothing done"
 msgstr "échec inattendu, rien n'a été fait"
 
-#: passwd.1.xml:371(para)
+#: passwd.1.xml:373(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr "échec inattendu, le fichier <filename>passwd</filename> est manquant"
 
-#: passwd.1.xml:377(para)
+#: passwd.1.xml:379(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:341(para)
+#: passwd.1.xml:343(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -3367,7 +3401,7 @@
 "La commande <command>passwd</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: passwd.1.xml:392(para)
+#: passwd.1.xml:394(para)
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -3430,7 +3464,7 @@
 msgstr "La commande <command>nologin</command> est apparue avec BSD 4.4."
 
 #: newusers.8.xml:5(refentrytitle) newusers.8.xml:10(refname)
-#: newusers.8.xml:16(command) login.defs.5.xml:196(term)
+#: newusers.8.xml:16(command) login.defs.5.xml:352(term)
 msgid "newusers"
 msgstr "newusers"
 
@@ -3513,8 +3547,15 @@
 "Le fichier d'entrée doit être correctement protégé puisqu'il contient des "
 "mots de passe en clair."
 
-#: newusers.8.xml:103(para)
+#: newusers.8.xml:87(para) chpasswd.8.xml:123(para)
 msgid ""
+"PAM is not used to update the passwords. Only <filename>/etc/passwd</"
+"filename> and <filename>/etc/shadow</filename> are updated, and the various "
+"checks or options provided by PAM modules are not used."
+msgstr ""
+
+#: newusers.8.xml:133(para)
+msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
@@ -3538,7 +3579,7 @@
 
 #: newgrp.1.xml:17(replaceable) grpck.8.xml:18(replaceable)
 #: groupdel.8.xml:18(replaceable) groupadd.8.xml:24(replaceable)
-#: gpasswd.1.xml:21(replaceable)
+#: gpasswd.1.xml:26(replaceable)
 msgid "group"
 msgstr "groupe"
 
@@ -3603,21 +3644,23 @@
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"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>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"<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>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gshadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 #: logoutd.8.xml:5(refentrytitle) logoutd.8.xml:10(refname)
 #: logoutd.8.xml:16(command)
@@ -3690,15 +3733,17 @@
 "caractère non blanc de la ligne."
 
 #: login.defs.5.xml:31(para)
+#, fuzzy
 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 \"yes\" or \"no\". An undefined boolean parameter or one "
-"with a value other than these will be given a \"no\" value. Numbers (both "
+"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 \"0\") or hexadecimal values (precede the value with \"0x\"). The "
-"maximum value of the regular and long numeric parameters is machine-"
-"dependent."
+"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 ""
 "Les valeurs des paramètres sont de quatre types : chaînes de caractères, "
 "booléens, nombres et nombres longs. Une chaîne de caractères est constituée "
@@ -3709,17 +3754,19 @@
 "« 0 »), ou encore hexadécimal (en précédant la valeur de « 0x »). La valeur "
 "maximale des paramètres numériques normaux ou longs dépend de la machine."
 
-#: login.defs.5.xml:42(para)
+#: login.defs.5.xml:46(para)
 msgid "The following configuration items are provided:"
 msgstr "Les paramètres de configuration suivants sont fournis :"
 
-#: login.defs.5.xml:46(term)
-msgid "CHFN_AUTH (boolean)"
+#: login.defs.5.xml:50(term)
+#, fuzzy
+msgid "<option>CHFN_AUTH</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: login.defs.5.xml:48(para)
+#: login.defs.5.xml:52(para)
+#, fuzzy
 msgid ""
-"If <emphasis remap=\"I\">yes</emphasis>, the <command>chfn</command> and "
+"If <replaceable>yes</replaceable>, the <command>chfn</command> and "
 "<command>chsh</command> programs will require authentication before making "
 "any changes, unless run by the superuser."
 msgstr ""
@@ -3728,22 +3775,25 @@
 "authentification avant de procéder à tout changement, à moins qu'ils ne "
 "soient exécutés par le superutilisateur."
 
-#: login.defs.5.xml:57(term)
-msgid "CHFN_RESTRICT (string)"
+#: login.defs.5.xml:61(term)
+#, fuzzy
+msgid "<option>CHFN_RESTRICT</option> (string)"
 msgstr "CHFN_RESTRICT (chaîne)"
 
-#: login.defs.5.xml:59(para)
+#: login.defs.5.xml:63(para)
+#, fuzzy
 msgid ""
 "This parameter specifies which values in the <emphasis remap=\"I\">gecos</"
 "emphasis> field of the <filename>/etc/passwd</filename> file may be changed "
 "by regular users using the <command>chfn</command> program. It can be any "
-"combination of letters <emphasis remap=\"I\">f</emphasis> ,<emphasis remap="
-"\"I\">r</emphasis>, <emphasis remap=\"I\">w</emphasis>, <emphasis remap=\"I"
-"\">h</emphasis>, for Full name, Room number, Work phone, and Home phone, "
-"respectively. For backward compatibility, \"yes\" is equivalent to \"rwh\" "
-"and \"no\" is equivalent to \"frwh\". If not specified, only the superuser "
-"can make any changes. The most restrictive setting is better achieved by not "
-"installing <filename>chfn</filename> SUID."
+"combination of letters <replaceable>f</replaceable>, <replaceable>r</"
+"replaceable>, <replaceable>w</replaceable>, <replaceable>h</replaceable>, "
+"for Full name, Room number, Work phone, and Home phone, respectively. For "
+"backward compatibility, <replaceable>yes</replaceable> is equivalent to "
+"<replaceable>rwh</replaceable> and <replaceable>no</replaceable> is "
+"equivalent to <replaceable>frwh</replaceable>. If not specified, only the "
+"superuser can make any changes. The most restrictive setting is better "
+"achieved by not installing <command>chfn</command> SUID."
 msgstr ""
 "Ce paramètre spécifie quelles valeurs du champ <emphasis remap=\"I\">gecos</"
 "emphasis> du fichier <filename>passwd</filename> peuvent être modifiées par "
@@ -3759,15 +3809,59 @@
 "encore plus restrictive, il sera préférable de ne pas installer "
 "<command>chfn</command> avec l'indicateur SUID positionné."
 
-#: login.defs.5.xml:76(term)
-msgid "GID_MAX (number)"
+#: login.defs.5.xml:83(term) chpasswd.8.xml:175(term)
+msgid "<option>ENCRYPT_METHOD</option> (string)"
+msgstr ""
+
+#: login.defs.5.xml:85(para) chpasswd.8.xml:177(para)
+msgid ""
+"This defines the system default encryption algorithm for encrypting "
+"passwords (if no algorithm are specified on the command line)."
+msgstr ""
+
+#: login.defs.5.xml:94(para) chpasswd.8.xml:186(para)
+msgid "<replaceable>DES</replaceable> (default)"
+msgstr ""
+
+#: login.defs.5.xml:97(replaceable) chpasswd.8.xml:189(replaceable)
+msgid "MD5"
+msgstr ""
+
+#: login.defs.5.xml:100(replaceable) chpasswd.8.xml:192(replaceable)
+msgid "SHA256"
+msgstr ""
+
+#: login.defs.5.xml:103(replaceable) chpasswd.8.xml:195(replaceable)
+msgid "SHA512"
+msgstr ""
+
+#: login.defs.5.xml:90(para) chpasswd.8.xml:182(para)
+msgid "It can take one of these values: <placeholder-1/>"
+msgstr ""
+
+#: login.defs.5.xml:107(para) chpasswd.8.xml:199(para)
+msgid ""
+"Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option> variable."
+msgstr ""
+
+#: login.defs.5.xml:111(para) login.defs.5.xml:192(para)
+#: chpasswd.8.xml:168(para) chpasswd.8.xml:203(para)
+msgid ""
+"Note: if you use PAM, it is recommended to set this variable consistently "
+"with the PAM modules configuration."
+msgstr ""
+
+#: login.defs.5.xml:118(term)
+#, fuzzy
+msgid "<option>GID_MAX</option> (number)"
 msgstr "GID_MAX (nombre)"
 
-#: login.defs.5.xml:77(term)
-msgid "GID_MIN (number)"
+#: login.defs.5.xml:119(term)
+#, fuzzy
+msgid "<option>GID_MIN</option> (number)"
 msgstr "GID_MIN (nombre)"
 
-#: login.defs.5.xml:79(para)
+#: login.defs.5.xml:121(para)
 msgid ""
 "Range of group IDs to choose from for the <command>useradd</command> and "
 "<command>groupadd</command> programs."
@@ -3775,11 +3869,12 @@
 "Plage d'identifiants numérique de groupe que les commandes <command>useradd</"
 "command> et <command>groupadd</command> peuvent utiliser."
 
-#: login.defs.5.xml:87(term)
-msgid "MAIL_DIR (string)"
+#: login.defs.5.xml:129(term)
+#, fuzzy
+msgid "<option>MAIL_DIR</option> (string)"
 msgstr "MAIL_DIR (chaîne)"
 
-#: login.defs.5.xml:89(para)
+#: login.defs.5.xml:131(para)
 msgid ""
 "The mail spool directory. This is needed to manipulate the mailbox when its "
 "corresponding user account is modified or deleted. If not specified, a "
@@ -3790,11 +3885,74 @@
 "utilisateur est modifié ou supprimé. S'il n'est pas spécifié, une valeur par "
 "défaut définie à la compilation est utilisée."
 
-#: login.defs.5.xml:97(term)
-msgid "PASS_MAX_DAYS (number)"
+#: login.defs.5.xml:139(term)
+msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:141(para)
+msgid ""
+"Maximum members per group entry. When the maximum is reached, a new group "
+"entry (line) is started in <filename>/etc/group</filename> (with the same "
+"name, same password, and same GID)."
+msgstr ""
+
+#: login.defs.5.xml:147(para)
+msgid ""
+"The default value is 0, meaning that there are no limits in the number of "
+"members in a group."
+msgstr ""
+
+#. Note: on HP, split groups have the same ID, but different
+#. 	             names.
+#: login.defs.5.xml:153(para)
+msgid ""
+"This feature (split group) permits to limit the length of lines in the group "
+"file. This is useful to make sure that lines for NIS groups are not larger "
+"than 1024 characters."
+msgstr ""
+
+#: login.defs.5.xml:158(para)
+msgid "If you need to enforce such limit, you can use 25."
+msgstr ""
+
+#: login.defs.5.xml:161(para)
+msgid ""
+"Note: split groups may not be supported by all tools (even in the Shadow "
+"toolsuite. You should not use this variable unless you really need it."
+msgstr ""
+
+#: login.defs.5.xml:169(term) chpasswd.8.xml:145(term)
+msgid "<option>MD5_CRYPT_ENAB</option> (boolean)"
+msgstr ""
+
+#: login.defs.5.xml:171(para) chpasswd.8.xml:147(para)
+msgid ""
+"Indicate if passwords must be encrypted using the MD5-based algorithm. If "
+"set to <replaceable>yes</replaceable>, new passwords will be encrypted using "
+"the MD5-based algorithm compatible with the one used by recent releases of "
+"FreeBSD. It supports passwords of unlimited length and longer salt strings. "
+"Set to <replaceable>no</replaceable> if you need to copy encrypted passwords "
+"to other systems which don't understand the new algorithm. Default is "
+"<replaceable>no</replaceable>."
+msgstr ""
+
+#: login.defs.5.xml:183(para)
+msgid ""
+"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"or by any command line option used to configure the encryption algorithm."
+msgstr ""
+
+#: login.defs.5.xml:188(para) chpasswd.8.xml:164(para)
+msgid ""
+"This variable is deprecated. You should use <option>ENCRYPT_METHOD</option>."
+msgstr ""
+
+#: login.defs.5.xml:199(term)
+#, fuzzy
+msgid "<option>PASS_MAX_DAYS</option> (number)"
 msgstr "PASS_MAX_DAYS (nombre)"
 
-#: login.defs.5.xml:99(para)
+#: login.defs.5.xml:201(para)
 msgid ""
 "The maximum number of days a password may be used. If the password is older "
 "than this, a password change will be forced. If not specified, -1 will be "
@@ -3804,11 +3962,12 @@
 "une modification du mot de passe est obligatoire. S'il n'est pas précisé, la "
 "valeur de -1 est utilisée (ce qui enlève toute restriction)."
 
-#: login.defs.5.xml:108(term)
-msgid "PASS_MIN_DAYS (number)"
+#: login.defs.5.xml:210(term)
+#, fuzzy
+msgid "<option>PASS_MIN_DAYS</option> (number)"
 msgstr "PASS_MIN_DAYS (nombre)"
 
-#: login.defs.5.xml:110(para)
+#: login.defs.5.xml:212(para)
 msgid ""
 "The minimum number of days allowed between password changes. Any password "
 "changes attempted sooner than this will be rejected. If not specified, -1 "
@@ -3819,11 +3978,12 @@
 "rejetée. S'il n'est pas précisé, la valeur de -1 est utilisée (ce qui enlève "
 "toute restriction)."
 
-#: login.defs.5.xml:119(term)
-msgid "PASS_WARN_AGE (number)"
+#: login.defs.5.xml:221(term)
+#, fuzzy
+msgid "<option>PASS_WARN_AGE</option> (number)"
 msgstr "PASS_WARN_AGE (nombre)"
 
-#: login.defs.5.xml:121(para)
+#: login.defs.5.xml:223(para)
 msgid ""
 "The number of days warning given before a password expires. A zero means "
 "warning is given only upon the day of expiration, a negative value means no "
@@ -3834,36 +3994,84 @@
 "signifie qu'aucun avertissement n'est donné. S'il n'est pas précisé, aucun "
 "avertissement n'est donné."
 
-#: login.defs.5.xml:131(para)
+#: login.defs.5.xml:233(para)
+#, fuzzy
 msgid ""
-"PASS_MAX_DAYS, PASS_MIN_DAYS and PASS_WARN_AGE are only used at the time of "
-"account creation. Any changes to these settings won't affect existing "
-"accounts."
+"<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 ""
 "Les paramètres PASS_MAX_DAYS, PASS_MIN_DAYS et PASS_WARN_AGE ne sont "
 "utilisés qu'au moment de la création d'un compte. Les changements "
 "n'affecteront pas les comptes existants."
 
-#: login.defs.5.xml:138(term)
-msgid "UID_MAX (number)"
+#: login.defs.5.xml:241(term) chpasswd.8.xml:210(term)
+msgid "<option>SHA_CRYPT_MIN_ROUNDS</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:242(term) chpasswd.8.xml:211(term)
+msgid "<option>SHA_CRYPT_MAX_ROUNDS</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:244(para) chpasswd.8.xml:213(para)
+msgid ""
+"When <option>ENCRYPT_METHOD</option> is set to <replaceable>SHA256</"
+"replaceable> or <replaceable>SHA512</replaceable>, this defines the number "
+"of SHA rounds used by the encryption algorithm by default (when the number "
+"of rounds is not specified on the command line)."
+msgstr ""
+
+#: login.defs.5.xml:251(para) chpasswd.8.xml:220(para)
+msgid ""
+"With a lot of rounds, it is more difficult to brute forcing the password. "
+"But note also that more CPU resources will be needed to authenticate users."
+msgstr ""
+
+#: login.defs.5.xml:256(para) chpasswd.8.xml:225(para)
+msgid ""
+"If not specified, the libc will choose the default number of rounds (5000)."
+msgstr ""
+
+#: login.defs.5.xml:260(para) chpasswd.8.xml:229(para)
+msgid "The values must be inside the 1000-999999999 range."
+msgstr ""
+
+#: login.defs.5.xml:263(para) chpasswd.8.xml:232(para)
+msgid ""
+"If only one of the <option>SHA_CRYPT_MIN_ROUNDS</option> or "
+"<option>SHA_CRYPT_MAX_ROUNDS</option> values is set, then this value will be "
+"used."
+msgstr ""
+
+#: login.defs.5.xml:268(para) chpasswd.8.xml:237(para)
+msgid ""
+"If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</"
+"option>, the highest value will be used."
+msgstr ""
+
+#: login.defs.5.xml:276(term)
+#, fuzzy
+msgid "<option>UID_MAX</option> (number)"
 msgstr "UID_MAX (nombre)"
 
-#: login.defs.5.xml:139(term)
-msgid "UID_MIN (number)"
+#: login.defs.5.xml:277(term)
+#, fuzzy
+msgid "<option>UID_MIN</option> (number)"
 msgstr "UID_MIN (nombre)"
 
-#: login.defs.5.xml:141(para)
+#: login.defs.5.xml:279(para)
 msgid ""
 "Range of user IDs to choose from for the <command>useradd</command> program."
 msgstr ""
 "Plage d'identifiants numériques d'utilisateur que <command>useradd</command> "
 "peut utiliser."
 
-#: login.defs.5.xml:148(term)
-msgid "UMASK (number)"
+#: login.defs.5.xml:286(term)
+#, fuzzy
+msgid "<option>UMASK</option> (number)"
 msgstr "UMASK (nombre)"
 
-#: login.defs.5.xml:150(para)
+#: login.defs.5.xml:288(para)
 msgid ""
 "The permission mask is initialized to this value. If not specified, the "
 "permission mask will be initialized to 022."
@@ -3871,11 +4079,12 @@
 "Valeur d'initialisation du masque de permissions. S'il n'est pas précisé, le "
 "masque des permissions sera initialisé à 022."
 
-#: login.defs.5.xml:157(term)
-msgid "USERDEL_CMD (string)"
+#: login.defs.5.xml:295(term)
+#, fuzzy
+msgid "<option>USERDEL_CMD</option> (string)"
 msgstr "USERDEL_CMD (chaîne)"
 
-#: login.defs.5.xml:159(para)
+#: login.defs.5.xml:297(para)
 msgid ""
 "If defined, this command is run when removing a user. It should remove any "
 "at/cron/print jobs etc. owned by the user to be removed (passed as the first "
@@ -3886,11 +4095,11 @@
 "périodiques cron ou at, tous les travaux d'impression, etc. de l'utilisateur "
 "(qui sera fourni comme premier paramètre)."
 
-#: login.defs.5.xml:170(title)
+#: login.defs.5.xml:308(title)
 msgid "CROSS REFERENCE"
 msgstr "RÉFÉRENCES CROISÉES"
 
-#: login.defs.5.xml:171(para)
+#: login.defs.5.xml:309(para)
 msgid ""
 "The following cross reference shows which programs in the shadow password "
 "suite use which parameters."
@@ -3898,42 +4107,62 @@
 "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:178(term) chfn.1.xml:5(refentrytitle)
+#: login.defs.5.xml:316(term) chfn.1.xml:5(refentrytitle)
 #: chfn.1.xml:10(refname) chfn.1.xml:16(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:180(para)
+#: login.defs.5.xml:318(para)
 msgid "CHFN_AUTH CHFN_RESTRICT"
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
-#: login.defs.5.xml:184(term) chsh.1.xml:5(refentrytitle)
+#: login.defs.5.xml:322(term) chgpasswd.8.xml:5(refentrytitle)
+#: chgpasswd.8.xml:10(refname) chgpasswd.8.xml:16(command)
+msgid "chgpasswd"
+msgstr "chgpasswd"
+
+#: login.defs.5.xml:324(para)
+msgid ""
+"MD5_CRYPT_ENAB ENCRYPT_METHOD SHA_CRYPT_MIN_ROUNDS SHA_CRYPT_MAX_ROUNDS "
+"MAX_MEMBERS_PER_GROUP"
+msgstr ""
+
+#: login.defs.5.xml:331(term) chpasswd.8.xml:5(refentrytitle)
+#: chpasswd.8.xml:10(refname) chpasswd.8.xml:16(command)
+msgid "chpasswd"
+msgstr "chpasswd"
+
+#: login.defs.5.xml:333(para)
+msgid "MD5_CRYPT_ENAB ENCRYPT_METHOD SHA_CRYPT_MIN_ROUNDS SHA_CRYPT_MAX_ROUNDS"
+msgstr ""
+
+#: login.defs.5.xml:340(term) chsh.1.xml:5(refentrytitle)
 #: chsh.1.xml:10(refname) chsh.1.xml:16(command)
 msgid "chsh"
 msgstr "chsh"
 
-#: login.defs.5.xml:186(para)
+#: login.defs.5.xml:342(para)
 msgid "CHFN_AUTH"
 msgstr "CHFN_AUTH"
 
-#: login.defs.5.xml:190(term) groupadd.8.xml:5(refentrytitle)
+#: login.defs.5.xml:346(term) groupadd.8.xml:5(refentrytitle)
 #: groupadd.8.xml:10(refname) groupadd.8.xml:16(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:192(para)
+#: login.defs.5.xml:348(para)
 msgid "GID_MAX GID_MIN"
 msgstr "GID_MAX GID_MIN"
 
-#: login.defs.5.xml:198(para)
+#: login.defs.5.xml:354(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 
-#: login.defs.5.xml:206(para)
+#: login.defs.5.xml:362(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 
-#: login.defs.5.xml:212(para)
+#: login.defs.5.xml:368(para)
 msgid ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
@@ -3941,15 +4170,15 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:223(para)
+#: login.defs.5.xml:379(para)
 msgid "MAIL_DIR USERDEL_CMD"
 msgstr "MAIL_DIR USERDEL_CMD"
 
-#: login.defs.5.xml:231(para)
+#: login.defs.5.xml:387(para)
 msgid "MAIL_DIR"
 msgstr "MAIL_DIR"
 
-#: login.defs.5.xml:240(para)
+#: login.defs.5.xml:396(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 "
@@ -3970,7 +4199,7 @@
 "citerefentry>. Veuillez plutôt vous référer aux fichiers de configuration de "
 "PAM correspondant."
 
-#: login.defs.5.xml:257(para)
+#: login.defs.5.xml:413(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4953,8 +5182,8 @@
 msgid "display current group names"
 msgstr "Afficher la liste des groupes auxquels appartient l'utilisateur"
 
-#: groups.1.xml:18(replaceable) gpasswd.1.xml:67(replaceable)
-#: gpasswd.1.xml:80(replaceable) chfn.1.xml:22(replaceable)
+#: groups.1.xml:18(replaceable) gpasswd.1.xml:86(replaceable)
+#: gpasswd.1.xml:99(replaceable) chfn.1.xml:22(replaceable)
 msgid "user"
 msgstr "utilisateur"
 
@@ -5190,7 +5419,7 @@
 msgstr ""
 "Les options disponibles pour la commande <command>groupmems</command> sont :"
 
-#: groupmems.8.xml:49(option) gpasswd.1.xml:67(option)
+#: groupmems.8.xml:49(option) gpasswd.1.xml:86(option)
 msgid "-a"
 msgstr "-a"
 
@@ -5198,7 +5427,7 @@
 msgid "Add a new user to the group membership list."
 msgstr "Ajouter un nouvel utilisateur à la liste des membres du groupe."
 
-#: groupmems.8.xml:55(option) gpasswd.1.xml:80(option)
+#: groupmems.8.xml:55(option) gpasswd.1.xml:99(option)
 msgid "-d"
 msgstr "-d"
 
@@ -5487,27 +5716,37 @@
 "« underscore », des tirets ou un dollar peuvent suivre. Soit, sous la forme "
 "d'une expression rationnelle : [a-z_][a-z0-9_-]*[$]"
 
-#: groupadd.8.xml:143(para)
+#: groupadd.8.xml:144(para)
+msgid "Groupnames may only be up to 16 characters long."
+msgstr "Les noms de groupe sont limités à 16 caractères."
+
+#: groupadd.8.xml:147(para)
+#, fuzzy
 msgid ""
-"If the groupname already exists in an external group database such as NIS, "
-"<command>groupadd</command> will deny the group creation request."
+"You may not add a NIS or LDAP group. This must be performed on the "
+"corresponding server."
 msgstr ""
+"Vous ne pouvez pas ajouter d'utilisateur à un groupe NIS. Cela doit être "
+"effectué sur le serveur NIS."
+
+#: groupadd.8.xml:151(para)
+#, fuzzy
+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 ""
 "Si le nom du groupe existe dans une base de données externe, telle que NIS, "
 "<command>groupadd</command> refusera de créer le groupe."
 
-#: groupadd.8.xml:148(para)
-msgid "Groupnames may only be up to 16 characters long."
-msgstr "Les noms de groupe sont limités à 16 caractères."
-
-#: groupadd.8.xml:177(para)
+#: groupadd.8.xml:184(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:183(para)
+#: groupadd.8.xml:190(para)
 msgid "group name not unique"
 msgstr "nom de groupe déjà utilisé"
 
-#: groupadd.8.xml:153(para)
+#: groupadd.8.xml:160(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5515,7 +5754,7 @@
 "La commande <command>groupadd</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: groupadd.8.xml:198(para)
+#: groupadd.8.xml:205(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -5550,28 +5789,43 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 #: gpasswd.1.xml:5(refentrytitle) gpasswd.1.xml:10(refname)
-#: gpasswd.1.xml:16(command)
+#: gpasswd.1.xml:21(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
+#: gpasswd.1.xml:13(phrase)
+#, fuzzy
+msgid "and <placeholder-1/> files"
+msgstr "-a <placeholder-1/>"
+
+#: gpasswd.1.xml:15(phrase)
+msgid "file"
+msgstr ""
+
 #: gpasswd.1.xml:11(refpurpose)
-msgid "administer the <placeholder-1/> file"
-msgstr "Administrer le fichier <placeholder-1/>"
+#, fuzzy
+msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
+msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:18(replaceable)
+#: gpasswd.1.xml:23(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "options"
 
-#: gpasswd.1.xml:28(para)
+#: gpasswd.1.xml:33(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:41(para)
 #, fuzzy
 msgid ""
-"The <command>gpasswd</command> command is used to administer the <filename>/"
-"etc/group</filename> file (and <filename>/etc/gshadow</filename> file if "
-"compiled with SHADOWGRP defined). Every group can have administrators, "
-"members and a password. System administrator can use the <option>-A</option> "
-"option to define group administrator(s) and the <option>-M</option> option "
-"to define members and has all rights of group administrators and members."
+"System administrator can use the <option>-A</option> option to define group "
+"administrator(s) and the <option>-M</option> option to define members and "
+"has all rights of group administrators and members."
 msgstr ""
 "<command>Gpasswd</command> est utilisé pour administrer le fichier "
 "<filename>/etc/group</filename> (ainsi que le fichier <filename>/etc/"
@@ -5582,14 +5836,20 @@
 "l'option <option>-M</option> pour en définir les membres. Il possède "
 "également tous les droits des administrateurs et des membres du groupe."
 
-#: gpasswd.1.xml:37(para)
+#: gpasswd.1.xml:46(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:53(para)
 #, fuzzy
 msgid ""
-"<command>gpasswd</command> called by a group administrator with a group name "
-"only prompts for the group password. If a password is set the members can "
-"still <citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry> without a password, and non-members must supply "
-"the password."
+"If a password is set the members can still "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry> without a password, and non-members must supply the password."
 msgstr ""
 "<command>Gpasswd</command> exécuté par un administrateur de groupe suivi "
 "d'un nom de groupe, affiche simplement l'invite de mot de passe du groupe. "
@@ -5598,11 +5858,11 @@
 "citerefentry> sans mot de passe, tandis que les utilisateurs n'étant pas "
 "membre du groupe devront fournir le mot de passe."
 
-#: gpasswd.1.xml:47(title)
+#: gpasswd.1.xml:61(title)
 msgid "Notes about group passwords"
 msgstr "Notes sur les mots de passe de groupe"
 
-#: gpasswd.1.xml:48(para)
+#: gpasswd.1.xml:62(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 "
@@ -5613,18 +5873,27 @@
 "Cependant, les groupes sont utiles pour permettre la coopération entre "
 "différents utilisateurs."
 
-#: gpasswd.1.xml:59(para)
+#: gpasswd.1.xml:73(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
-"options cannot be combined. The options which apply to the <command>gpasswd</"
-"command> command are:"
+"options cannot be combined."
 msgstr ""
 "Les options <option>-r</option>, <option>-h</option> et <option>-f</option> "
 "ne peuvent être utilisées que par root."
 
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:77(para)
+msgid "The options cannot be combined."
+msgstr ""
+
+#: gpasswd.1.xml:80(para)
 #, fuzzy
+msgid "The options which apply to the <command>gpasswd</command> command are:"
+msgstr ""
+"Les options disponibles pour la commande <command>passwd</command> sont :"
+
+#: gpasswd.1.xml:89(para)
+#, fuzzy
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
@@ -5632,7 +5901,7 @@
 "Le nom du groupe sera modifié de <emphasis remap=\"I\">GROUPE</emphasis> "
 "vers <emphasis remap=\"I\">NOUVEAU_NOM_GROUPE</emphasis>."
 
-#: gpasswd.1.xml:83(para)
+#: gpasswd.1.xml:102(para)
 #, fuzzy
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
@@ -5641,60 +5910,70 @@
 "Le nom du groupe sera modifié de <emphasis remap=\"I\">GROUPE</emphasis> "
 "vers <emphasis remap=\"I\">NOUVEAU_NOM_GROUPE</emphasis>."
 
-#: gpasswd.1.xml:96(para)
+#: gpasswd.1.xml:115(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:108(option)
+#: gpasswd.1.xml:127(option)
 #, fuzzy
 msgid "-R"
 msgstr "-"
 
-#: gpasswd.1.xml:111(para)
+#: gpasswd.1.xml:130(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:122(term)
+#: gpasswd.1.xml:141(term)
 #, fuzzy
 msgid "<option>-A</option><replaceable>user</replaceable>,..."
 msgstr ""
 "<option>-u</option>, <option>--uid</option> <replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:126(para)
+#: gpasswd.1.xml:145(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr "liste d'administrateurs du groupe séparés par des virgules"
 
-#: gpasswd.1.xml:134(term)
+#: gpasswd.1.xml:153(term)
 #, fuzzy
 msgid "<option>-M</option><replaceable>user</replaceable>,..."
 msgstr ""
 "<option>-u</option>, <option>--uid</option> <replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:138(para)
+#: gpasswd.1.xml:157(para)
 #, fuzzy
 msgid "Set the list of group members."
 msgstr "liste des membres du groupe séparés par des virgules"
 
-#: gpasswd.1.xml:166(para)
+#: gpasswd.1.xml:167(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:197(para)
+#, fuzzy
+msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</"
+"citerefentry>, <citerefentry><refentrytitle>groupadd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>grpck</"
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</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 ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
@@ -6007,11 +6286,6 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chpasswd.8.xml:5(refentrytitle) chpasswd.8.xml:10(refname)
-#: chpasswd.8.xml:16(command)
-msgid "chpasswd"
-msgstr "chpasswd"
-
 #: chpasswd.8.xml:11(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "Mettre à jour des mots de passe par lot"
@@ -6037,9 +6311,11 @@
 "\">mot_de_passe</emphasis>"
 
 #: chpasswd.8.xml:34(para)
+#, fuzzy
 msgid ""
-"By default the supplied password must be in clear-text. Default encryption "
-"algorithm is DES. Also the password age will be updated, if present."
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chpasswd</command>. Also the password age will be updated, if "
+"present."
 msgstr ""
 "Par défaut, le mot de passe doit être fourni en clair. L'algorithme de "
 "chiffrement par défaut est le chiffrement DES. L'âge du mot de passe sera "
@@ -6047,30 +6323,53 @@
 
 #: chpasswd.8.xml:39(para) chgpasswd.8.xml:38(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."
+msgstr ""
+
+#: chpasswd.8.xml:45(para) chgpasswd.8.xml:44(para)
+msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
 msgstr ""
 "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:47(para)
+#: chpasswd.8.xml:53(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:53(term) chgpasswd.8.xml:52(term)
+#: chpasswd.8.xml:59(term) chgpasswd.8.xml:58(term)
+#, fuzzy
+msgid "<option>-c</option>, <option>--crypt-method</option>"
+msgstr "<option>-e</option>, <option>--encrypted</option>"
+
+#: chpasswd.8.xml:61(para) chgpasswd.8.xml:60(para)
+msgid "Use the specified method to encrypt the passwords."
+msgstr ""
+
+#: chpasswd.8.xml:62(para) chgpasswd.8.xml:61(para)
+msgid ""
+"The available methods are DES, MD5, and SHA256 or SHA512 if compiled with "
+"the ENCRYPTMETHOD_SELECT flag."
+msgstr ""
+
+#: chpasswd.8.xml:69(term) chgpasswd.8.xml:68(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: chpasswd.8.xml:55(para) chgpasswd.8.xml:54(para)
+#: chpasswd.8.xml:71(para) chgpasswd.8.xml:70(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Indique que les mots de passe fournis sont chiffrés."
 
-#: chpasswd.8.xml:65(term) chgpasswd.8.xml:64(term)
+#: chpasswd.8.xml:81(term) chgpasswd.8.xml:80(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
-#: chpasswd.8.xml:67(para) chgpasswd.8.xml:66(para)
+#: chpasswd.8.xml:83(para) chgpasswd.8.xml:82(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -6078,33 +6377,77 @@
 "Permettre d'utiliser le chiffrement MD5, plutôt que DES, lorsque les mots de "
 "passe fournis ne sont pas chiffrés."
 
-#: chpasswd.8.xml:78(para) chgpasswd.8.xml:77(para)
+#: chpasswd.8.xml:90(term) chgpasswd.8.xml:89(term)
+#, fuzzy
+msgid "<option>-s</option>, <option>--sha-rounds</option>"
+msgstr "<option>-s</option>, <option>--shadow</option>"
+
+#: chpasswd.8.xml:92(para) chgpasswd.8.xml:91(para)
+msgid "Use the specified number of rounds to encrypt the passwords."
+msgstr ""
+
+#: chpasswd.8.xml:95(para) chgpasswd.8.xml:94(para)
 msgid ""
+"The value 0 means that the system will choose the default number of rounds "
+"for the crypt method (5000)."
+msgstr ""
+
+#: chpasswd.8.xml:99(para) chgpasswd.8.xml:98(para)
+msgid ""
+"A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
+msgstr ""
+
+#: chpasswd.8.xml:103(para) chgpasswd.8.xml:102(para)
+msgid "You can only use this option with the SHA256 or SHA512 crypt method."
+msgstr ""
+
+#: chpasswd.8.xml:107(para) chgpasswd.8.xml:106(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 ""
+
+#: chpasswd.8.xml:119(para) chgpasswd.8.xml:118(para)
+msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
 msgstr ""
 "Pensez à fixer les permissions ou umask afin d'empêcher la lecture par les "
 "autres utilisateurs des fichiers non chiffrés. "
 
-#: chpasswd.8.xml:86(para)
+#: chpasswd.8.xml:132(title)
+msgid "CONFIGURATION"
+msgstr ""
+
+#: chpasswd.8.xml:133(para)
 msgid ""
+"The following configuration variables in <filename>/etc/login.defs</"
+"filename> change the behavior of this tool:"
+msgstr ""
+
+#: chpasswd.8.xml:159(para)
+msgid ""
+"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"or by any command line option."
+msgstr ""
+
+#: chpasswd.8.xml:273(para)
+#, fuzzy
+msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>newusers</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<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>."
 
-#: chgpasswd.8.xml:5(refentrytitle) chgpasswd.8.xml:10(refname)
-#: chgpasswd.8.xml:16(command)
-msgid "chgpasswd"
-msgstr "chgpasswd"
-
 #: chgpasswd.8.xml:11(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "Mettre à jour par lot des mots de passe des groupes"
@@ -6130,28 +6473,34 @@
 "\">mot_de_passe</emphasis>"
 
 #: chgpasswd.8.xml:34(para)
+#, fuzzy
 msgid ""
-"By default the supplied password must be in clear-text. Default encryption "
-"algorithm is DES."
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chgpasswd</command>."
 msgstr ""
 "Par défaut, le mot de passe doit être fourni en clair. L'algorithme de "
 "chiffrement par défaut est le chiffrement DES."
 
-#: chgpasswd.8.xml:46(para)
+#: chgpasswd.8.xml:52(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:85(para)
+#: chgpasswd.8.xml:150(para)
+#, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
 
 #: chfn.1.xml:11(refpurpose)
 msgid "change real user name and information"
@@ -6479,7 +6828,54 @@
 msgid "translator-credits"
 msgstr "Nicolas FRANÇOIS <nicolas.francois at centraliens.net>, 2005."
 
+#, fuzzy
 #~ msgid ""
+#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pam</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid "administer the <placeholder-1/> file"
+#~ msgstr "Administrer le fichier <placeholder-1/>"
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid ""
 #~ "The name of the new user's login shell. The named program will be used "
 #~ "for all future new user accounts."
 #~ msgstr ""
@@ -6542,28 +6938,3 @@
 #~ "l'utilisateur désigné dans la liste des membres du groupe. Si un "
 #~ "identifiant de groupe inexistant est indiqué, un nouveau groupe est créé, "
 #~ "avec cet identifiant de groupe."
-
-#~ msgid ""
-#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>login</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>su</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#~ "manvolnum></citerefentry>."
-#~ msgstr ""
-#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>login</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>su</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#~ "manvolnum></citerefentry>."

Modified: upstream/trunk/man/po/it.po
===================================================================
--- upstream/trunk/man/po/it.po	2007-11-25 21:06:49 UTC (rev 1464)
+++ upstream/trunk/man/po/it.po	2007-11-25 21:28:26 UTC (rev 1465)
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.3\n"
-"POT-Creation-Date: 2007-11-10 23:24+0100\n"
+"POT-Creation-Date: 2007-11-25 20:28+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"
@@ -84,7 +84,7 @@
 #: login.access.5.xml:15(title) login.1.xml:36(title) limits.5.xml:16(title)
 #: lastlog.8.xml:24(title) gshadow.5.xml:15(title) grpck.8.xml:25(title)
 #: groups.1.xml:24(title) groupmod.8.xml:25(title) groupmems.8.xml:27(title)
-#: groupdel.8.xml:24(title) groupadd.8.xml:30(title) gpasswd.1.xml:27(title)
+#: groupdel.8.xml:24(title) groupadd.8.xml:30(title) gpasswd.1.xml:32(title)
 #: faillog.8.xml:24(title) faillog.5.xml:15(title) expiry.1.xml:23(title)
 #: chsh.1.xml:27(title) chpasswd.8.xml:24(title) chgpasswd.8.xml:24(title)
 #: chfn.1.xml:27(title) chage.1.xml:26(title)
@@ -123,8 +123,8 @@
 #: useradd.8.xml:48(title) su.1.xml:74(title) pwck.8.xml:96(title)
 #: passwd.1.xml:140(title) login.1.xml:119(title) lastlog.8.xml:36(title)
 #: grpck.8.xml:69(title) groupmod.8.xml:34(title) groupmems.8.xml:42(title)
-#: groupadd.8.xml:39(title) gpasswd.1.xml:58(title) faillog.8.xml:35(title)
-#: chsh.1.xml:38(title) chpasswd.8.xml:46(title) chgpasswd.8.xml:45(title)
+#: groupadd.8.xml:39(title) gpasswd.1.xml:72(title) faillog.8.xml:35(title)
+#: chsh.1.xml:38(title) chpasswd.8.xml:52(title) chgpasswd.8.xml:51(title)
 #: chage.1.xml:36(title)
 msgid "OPTIONS"
 msgstr "OPZIONI"
@@ -147,18 +147,18 @@
 msgstr ""
 
 # type: TP
-#: vipw.8.xml:64(term) userdel.8.xml:63(term) useradd.8.xml:164(term)
+#: vipw.8.xml:64(term) userdel.8.xml:63(term) useradd.8.xml:165(term)
 #: passwd.1.xml:180(term) lastlog.8.xml:52(term) groupmod.8.xml:60(term)
 #: groupadd.8.xml:74(term) faillog.8.xml:48(term) chsh.1.xml:44(term)
-#: chpasswd.8.xml:59(term) chgpasswd.8.xml:58(term) chage.1.xml:74(term)
+#: chpasswd.8.xml:75(term) chgpasswd.8.xml:74(term) chage.1.xml:74(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
 # type: Plain text
-#: vipw.8.xml:66(para) userdel.8.xml:65(para) useradd.8.xml:166(para)
+#: vipw.8.xml:66(para) userdel.8.xml:65(para) useradd.8.xml:167(para)
 #: passwd.1.xml:182(para) lastlog.8.xml:56(para) groupmod.8.xml:62(para)
 #: groupadd.8.xml:76(para) faillog.8.xml:50(para) chsh.1.xml:46(para)
-#: chpasswd.8.xml:61(para) chgpasswd.8.xml:60(para) chage.1.xml:76(para)
+#: chpasswd.8.xml:77(para) chgpasswd.8.xml:76(para) chage.1.xml:76(para)
 msgid "Display help message and exit."
 msgstr "Mostra un messaggio di aiuto ed esce."
 
@@ -172,11 +172,11 @@
 msgstr ""
 
 # type: IP
-#: vipw.8.xml:76(term) passwd.1.xml:234(term)
+#: vipw.8.xml:76(term) passwd.1.xml:235(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:78(para) passwd.1.xml:238(para)
+#: vipw.8.xml:78(para) passwd.1.xml:239(para)
 msgid "Quiet mode."
 msgstr ""
 
@@ -190,110 +190,119 @@
 msgstr ""
 
 # type: SH
-#: vipw.8.xml:91(title) usermod.8.xml:246(title) userdel.8.xml:89(title)
-#: useradd.8.xml:370(title) suauth.5.xml:139(title) su.1.xml:176(title)
+#: vipw.8.xml:91(title) usermod.8.xml:260(title) userdel.8.xml:89(title)
+#: useradd.8.xml:371(title) suauth.5.xml:139(title) su.1.xml:176(title)
 #: sg.1.xml:43(title) shadow.5.xml:105(title) shadow.3.xml:172(title)
 #: pwconv.8.xml:109(title) pwck.8.xml:145(title) porttime.5.xml:76(title)
-#: passwd.5.xml:87(title) passwd.1.xml:322(title) newusers.8.xml:90(title)
+#: passwd.5.xml:87(title) passwd.1.xml:324(title) newusers.8.xml:96(title)
 #: newgrp.1.xml:54(title) logoutd.8.xml:35(title) login.access.5.xml:66(title)
 #: login.1.xml:198(title) limits.5.xml:110(title) lastlog.8.xml:113(title)
 #: gshadow.5.xml:61(title) grpck.8.xml:87(title) groups.1.xml:46(title)
 #: groupmod.8.xml:92(title) groupmems.8.xml:103(title)
-#: groupdel.8.xml:43(title) groupadd.8.xml:114(title) gpasswd.1.xml:147(title)
+#: groupdel.8.xml:43(title) groupadd.8.xml:114(title) gpasswd.1.xml:178(title)
 #: faillog.8.xml:132(title) faillog.5.xml:38(title) expiry.1.xml:32(title)
-#: chsh.1.xml:85(title) chfn.1.xml:60(title) chage.1.xml:177(title)
+#: chsh.1.xml:85(title) chpasswd.8.xml:248(title) chgpasswd.8.xml:125(title)
+#: chfn.1.xml:60(title) chage.1.xml:177(title)
 msgid "FILES"
 msgstr "FILE"
 
-#: vipw.8.xml:94(filename) usermod.8.xml:249(filename)
-#: userdel.8.xml:92(filename) useradd.8.xml:385(filename)
-#: sg.1.xml:58(filename) pwck.8.xml:148(filename) newgrp.1.xml:69(filename)
-#: gshadow.5.xml:64(filename) grpck.8.xml:90(filename)
-#: groups.1.xml:49(filename) groupmod.8.xml:95(filename)
-#: groupmems.8.xml:106(filename) groupdel.8.xml:46(filename)
-#: groupadd.8.xml:117(filename) gpasswd.1.xml:11(filename)
-#: gpasswd.1.xml:150(filename)
+#: vipw.8.xml:94(filename) usermod.8.xml:263(filename)
+#: userdel.8.xml:92(filename) useradd.8.xml:386(filename)
+#: sg.1.xml:58(filename) pwck.8.xml:148(filename) newusers.8.xml:111(filename)
+#: newgrp.1.xml:69(filename) gshadow.5.xml:64(filename)
+#: grpck.8.xml:90(filename) groups.1.xml:49(filename)
+#: groupmod.8.xml:95(filename) groupmems.8.xml:106(filename)
+#: groupdel.8.xml:46(filename) groupadd.8.xml:117(filename)
+#: gpasswd.1.xml:12(filename) gpasswd.1.xml:181(filename)
+#: chgpasswd.8.xml:128(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
 # type: Plain text
-#: vipw.8.xml:96(para) usermod.8.xml:251(para) userdel.8.xml:94(para)
-#: useradd.8.xml:387(para) sg.1.xml:60(para) pwck.8.xml:150(para)
-#: newgrp.1.xml:71(para) gshadow.5.xml:66(para) grpck.8.xml:92(para)
-#: groups.1.xml:51(para) groupmod.8.xml:97(para) groupmems.8.xml:108(para)
-#: groupdel.8.xml:48(para) groupadd.8.xml:119(para) gpasswd.1.xml:152(para)
+#: vipw.8.xml:96(para) usermod.8.xml:265(para) userdel.8.xml:94(para)
+#: useradd.8.xml:388(para) sg.1.xml:60(para) pwck.8.xml:150(para)
+#: newusers.8.xml:113(para) newgrp.1.xml:71(para) gshadow.5.xml:66(para)
+#: grpck.8.xml:92(para) groups.1.xml:51(para) groupmod.8.xml:97(para)
+#: groupmems.8.xml:108(para) groupdel.8.xml:48(para) groupadd.8.xml:119(para)
+#: gpasswd.1.xml:183(para) chgpasswd.8.xml:130(para)
 msgid "Group account information."
 msgstr "Informazioni sugli account di gruppo."
 
-#: vipw.8.xml:100(filename) sg.1.xml:64(filename) newgrp.1.xml:75(filename)
-#: gshadow.5.xml:70(filename) grpck.8.xml:96(filename)
-#: groupmod.8.xml:101(filename) groupmems.8.xml:112(filename)
-#: groupdel.8.xml:52(filename) groupadd.8.xml:123(filename)
-#: gpasswd.1.xml:156(filename)
+#: vipw.8.xml:100(filename) sg.1.xml:64(filename) newusers.8.xml:117(filename)
+#: newgrp.1.xml:75(filename) gshadow.5.xml:70(filename)
+#: grpck.8.xml:96(filename) groupmod.8.xml:101(filename)
+#: groupmems.8.xml:112(filename) groupdel.8.xml:52(filename)
+#: groupadd.8.xml:123(filename) gpasswd.1.xml:13(filename)
+#: gpasswd.1.xml:187(filename) chgpasswd.8.xml:134(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
 # type: Plain text
-#: vipw.8.xml:102(para) sg.1.xml:66(para) newgrp.1.xml:77(para)
-#: gshadow.5.xml:72(para) grpck.8.xml:98(para) groupmod.8.xml:103(para)
-#: groupdel.8.xml:54(para) groupadd.8.xml:125(para) gpasswd.1.xml:158(para)
+#: vipw.8.xml:102(para) sg.1.xml:66(para) newusers.8.xml:119(para)
+#: newgrp.1.xml:77(para) gshadow.5.xml:72(para) grpck.8.xml:98(para)
+#: groupmod.8.xml:103(para) groupdel.8.xml:54(para) groupadd.8.xml:125(para)
+#: gpasswd.1.xml:189(para) chgpasswd.8.xml:136(para)
 msgid "Secure group account information."
 msgstr "Informazioni sicure sugli account di gruppo."
 
-#: vipw.8.xml:106(filename) usermod.8.xml:255(filename)
-#: userdel.8.xml:104(filename) useradd.8.xml:373(filename)
+#: vipw.8.xml:106(filename) usermod.8.xml:269(filename)
+#: userdel.8.xml:104(filename) useradd.8.xml:374(filename)
 #: su.1.xml:179(filename) sg.1.xml:46(filename) shadow.5.xml:108(filename)
 #: pwck.8.xml:154(filename) passwd.5.xml:90(filename)
-#: passwd.1.xml:325(filename) newgrp.1.xml:57(filename)
-#: login.1.xml:213(filename) grpck.8.xml:102(filename)
-#: expiry.1.xml:35(filename) chsh.1.xml:88(filename) chfn.1.xml:69(filename)
+#: passwd.1.xml:327(filename) newusers.8.xml:99(filename)
+#: newgrp.1.xml:57(filename) login.1.xml:213(filename)
+#: grpck.8.xml:102(filename) expiry.1.xml:35(filename) chsh.1.xml:88(filename)
+#: chpasswd.8.xml:251(filename) chfn.1.xml:69(filename)
 #: chage.1.xml:181(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
 # type: Plain text
-#: vipw.8.xml:108(para) usermod.8.xml:257(para) userdel.8.xml:106(para)
-#: useradd.8.xml:375(para) su.1.xml:181(para) sg.1.xml:48(para)
+#: vipw.8.xml:108(para) usermod.8.xml:271(para) userdel.8.xml:106(para)
+#: useradd.8.xml:376(para) su.1.xml:181(para) sg.1.xml:48(para)
 #: shadow.5.xml:110(para) pwck.8.xml:156(para) passwd.5.xml:92(para)
-#: passwd.1.xml:327(para) newgrp.1.xml:59(para) login.1.xml:215(para)
-#: grpck.8.xml:104(para) expiry.1.xml:37(para) chsh.1.xml:90(para)
-#: chfn.1.xml:71(para) chage.1.xml:184(para)
+#: passwd.1.xml:329(para) newusers.8.xml:101(para) newgrp.1.xml:59(para)
+#: login.1.xml:215(para) grpck.8.xml:104(para) expiry.1.xml:37(para)
+#: chsh.1.xml:90(para) chpasswd.8.xml:253(para) chfn.1.xml:71(para)
+#: chage.1.xml:184(para)
 msgid "User account information."
 msgstr "informazioni sugli account utente."
 
-#: vipw.8.xml:112(filename) usermod.8.xml:261(filename)
-#: userdel.8.xml:110(filename) useradd.8.xml:379(filename)
+#: vipw.8.xml:112(filename) usermod.8.xml:275(filename)
+#: userdel.8.xml:110(filename) useradd.8.xml:380(filename)
 #: su.1.xml:185(filename) sg.1.xml:52(filename) shadow.5.xml:114(filename)
 #: shadow.3.xml:175(filename) pwck.8.xml:160(filename)
-#: passwd.5.xml:96(filename) passwd.1.xml:331(filename)
-#: newgrp.1.xml:63(filename) login.1.xml:219(filename)
-#: expiry.1.xml:41(filename) chage.1.xml:189(filename)
+#: passwd.5.xml:96(filename) passwd.1.xml:333(filename)
+#: newusers.8.xml:105(filename) newgrp.1.xml:63(filename)
+#: login.1.xml:219(filename) expiry.1.xml:41(filename)
+#: chpasswd.8.xml:257(filename) chage.1.xml:189(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
 # type: Plain text
-#: vipw.8.xml:114(para) usermod.8.xml:263(para) userdel.8.xml:112(para)
-#: useradd.8.xml:381(para) su.1.xml:187(para) sg.1.xml:54(para)
+#: vipw.8.xml:114(para) usermod.8.xml:277(para) userdel.8.xml:112(para)
+#: useradd.8.xml:382(para) su.1.xml:187(para) sg.1.xml:54(para)
 #: shadow.5.xml:116(para) shadow.3.xml:177(para) pwck.8.xml:162(para)
-#: passwd.1.xml:333(para) newgrp.1.xml:65(para) login.1.xml:221(para)
-#: expiry.1.xml:43(para) chage.1.xml:192(para)
+#: passwd.1.xml:335(para) newusers.8.xml:107(para) newgrp.1.xml:65(para)
+#: login.1.xml:221(para) expiry.1.xml:43(para) chpasswd.8.xml:259(para)
+#: chage.1.xml:192(para)
 msgid "Secure user account information."
 msgstr "Informazioni sicure sugli account di utenti."
 
 # type: SH
-#: vipw.8.xml:120(title) usermod.8.xml:270(title) userdel.8.xml:191(title)
-#: useradd.8.xml:481(title) suauth.5.xml:168(title) su.1.xml:194(title)
+#: vipw.8.xml:120(title) usermod.8.xml:284(title) userdel.8.xml:191(title)
+#: useradd.8.xml:482(title) suauth.5.xml:168(title) su.1.xml:194(title)
 #: sg.1.xml:73(title) shadow.5.xml:123(title) shadow.3.xml:184(title)
 #: pwconv.8.xml:121(title) pwck.8.xml:169(title) porttime.5.xml:88(title)
-#: passwd.5.xml:105(title) passwd.1.xml:391(title) nologin.8.xml:35(title)
-#: newusers.8.xml:102(title) newgrp.1.xml:84(title)
-#: login.defs.5.xml:256(title) login.access.5.xml:78(title)
+#: passwd.5.xml:105(title) passwd.1.xml:393(title) nologin.8.xml:35(title)
+#: newusers.8.xml:132(title) newgrp.1.xml:84(title)
+#: login.defs.5.xml:412(title) login.access.5.xml:78(title)
 #: login.1.xml:252(title) limits.5.xml:120(title) gshadow.5.xml:79(title)
 #: grpck.8.xml:111(title) groups.1.xml:58(title) groupmod.8.xml:161(title)
 #: groupmems.8.xml:121(title) groupdel.8.xml:100(title)
-#: groupadd.8.xml:197(title) gpasswd.1.xml:165(title) faillog.8.xml:144(title)
+#: groupadd.8.xml:204(title) gpasswd.1.xml:196(title) faillog.8.xml:144(title)
 #: faillog.5.xml:50(title) expiry.1.xml:50(title) chsh.1.xml:109(title)
-#: chpasswd.8.xml:85(title) chgpasswd.8.xml:84(title) chfn.1.xml:78(title)
+#: chpasswd.8.xml:272(title) chgpasswd.8.xml:149(title) chfn.1.xml:78(title)
 #: chage.1.xml:232(title)
 msgid "SEE ALSO"
 msgstr "VEDERE ANCHE"
@@ -320,7 +329,7 @@
 "citerefentry>."
 
 #: usermod.8.xml:5(refentrytitle) usermod.8.xml:10(refname)
-#: usermod.8.xml:16(command) login.defs.5.xml:229(term)
+#: usermod.8.xml:16(command) login.defs.5.xml:385(term)
 msgid "usermod"
 msgstr "usermod"
 
@@ -382,7 +391,7 @@
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
 # type: TP
-#: usermod.8.xml:65(term) useradd.8.xml:91(term)
+#: usermod.8.xml:65(term) useradd.8.xml:92(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -400,14 +409,14 @@
 "home directory, che viene creata se non esiste già."
 
 # type: TP
-#: usermod.8.xml:79(term) useradd.8.xml:108(term) useradd.8.xml:293(term)
+#: usermod.8.xml:79(term) useradd.8.xml:109(term) useradd.8.xml:294(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:84(para) useradd.8.xml:113(para)
+#: usermod.8.xml:84(para) useradd.8.xml:114(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>."
@@ -416,14 +425,14 @@
 "specificata nel formato <emphasis remap=\"I\">MM/GG/AA</emphasis>."
 
 # type: TP
-#: usermod.8.xml:91(term) useradd.8.xml:120(term) useradd.8.xml:302(term)
+#: usermod.8.xml:91(term) useradd.8.xml:121(term) useradd.8.xml:303(term)
 msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:96(para) useradd.8.xml:125(para)
+#: usermod.8.xml:96(para) useradd.8.xml:126(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 "
@@ -435,7 +444,7 @@
 "caratteristica. Il valore predefinito è -1."
 
 # type: IP
-#: usermod.8.xml:105(term) useradd.8.xml:134(term) useradd.8.xml:314(term)
+#: usermod.8.xml:105(term) useradd.8.xml:135(term) useradd.8.xml:315(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
@@ -451,7 +460,7 @@
 "gruppo deve esistere. Un numero di gruppo deve riferirsi ad un gruppo già "
 "esistente. Il numero di gruppo predefinito è 1."
 
-#: usermod.8.xml:118(term) useradd.8.xml:148(term)
+#: usermod.8.xml:118(term) useradd.8.xml:149(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -509,40 +518,47 @@
 "p</option> or <option>-U</option>."
 msgstr ""
 
+#: usermod.8.xml:161(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 ""
+
 # type: TP
-#: usermod.8.xml:164(term) useradd.8.xml:217(term) groupmod.8.xml:78(term)
+#: usermod.8.xml:170(term) useradd.8.xml:218(term) groupmod.8.xml:78(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
-#: usermod.8.xml:168(para)
+#: usermod.8.xml:174(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:175(term) useradd.8.xml:225(term)
+#: usermod.8.xml:181(term) useradd.8.xml:226(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:180(para)
+#: usermod.8.xml:186(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
 msgstr ""
 
 # type: TP
-#: usermod.8.xml:188(term) useradd.8.xml:238(term) useradd.8.xml:327(term)
+#: usermod.8.xml:194(term) useradd.8.xml:239(term) useradd.8.xml:328(term)
 #: su.1.xml:108(term) chsh.1.xml:50(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:193(para) chsh.1.xml:54(para)
+#: usermod.8.xml:199(para) chsh.1.xml:54(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."
@@ -551,13 +567,13 @@
 "si fa in modo che il sistema selezioni la shell di connessione predefinita."
 
 # type: TP
-#: usermod.8.xml:200(term) useradd.8.xml:251(term)
+#: usermod.8.xml:206(term) useradd.8.xml:252(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:205(para)
+#: usermod.8.xml:211(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. Values "
@@ -575,28 +591,37 @@
 "fuori della home directory dell'utente devono essere modificati manualmente."
 
 # type: IP
-#: usermod.8.xml:218(term)
+#: usermod.8.xml:224(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:222(para)
+#: usermod.8.xml:228(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:233(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 <replaceable>EXPIRE</"
+"replaceable> value from <filename>/etc/default/useradd</filename>)."
+msgstr ""
+
 # type: SH
-#: usermod.8.xml:233(title) userdel.8.xml:170(title) useradd.8.xml:350(title)
-#: su.1.xml:168(title) shadow.3.xml:164(title) passwd.1.xml:311(title)
+#: usermod.8.xml:247(title) userdel.8.xml:170(title) useradd.8.xml:351(title)
+#: su.1.xml:168(title) shadow.3.xml:164(title) passwd.1.xml:313(title)
 #: newusers.8.xml:82(title) login.1.xml:164(title) lastlog.8.xml:125(title)
-#: groupdel.8.xml:36(title) groupadd.8.xml:138(title) faillog.8.xml:121(title)
-#: chpasswd.8.xml:77(title) chgpasswd.8.xml:76(title)
+#: groupdel.8.xml:36(title) groupadd.8.xml:138(title) gpasswd.1.xml:166(title)
+#: faillog.8.xml:121(title) chpasswd.8.xml:118(title)
+#: chgpasswd.8.xml:117(title)
 msgid "CAVEATS"
 msgstr "AVVISI/CAVEAT"
 
 # type: Plain text
-#: usermod.8.xml:234(para)
+#: usermod.8.xml:248(para)
 #, fuzzy
 msgid ""
 "<command>usermod</command> will not allow you to change the name of a user "
@@ -616,7 +641,7 @@
 "Occorre fare qualunque cambiamento che riguarda NIS sul server NIS."
 
 # type: Plain text
-#: usermod.8.xml:271(para)
+#: usermod.8.xml:285(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -655,7 +680,7 @@
 "manvolnum></citerefentry>."
 
 #: userdel.8.xml:5(refentrytitle) userdel.8.xml:10(refname)
-#: userdel.8.xml:15(command) login.defs.5.xml:221(term)
+#: userdel.8.xml:15(command) login.defs.5.xml:377(term)
 msgid "userdel"
 msgstr "userdel"
 
@@ -726,46 +751,48 @@
 "the <filename>login.defs</filename> file."
 msgstr ""
 
-#: userdel.8.xml:98(filename) useradd.8.xml:403(filename)
-#: pwconv.8.xml:112(filename) newusers.8.xml:93(filename)
+#: userdel.8.xml:98(filename) useradd.8.xml:404(filename)
+#: pwconv.8.xml:112(filename) newusers.8.xml:123(filename)
 #: login.access.5.xml:69(filename) groupadd.8.xml:129(filename)
-#: chsh.1.xml:100(filename) chfn.1.xml:63(filename)
+#: chsh.1.xml:100(filename) chpasswd.8.xml:263(filename)
+#: chgpasswd.8.xml:140(filename) chfn.1.xml:63(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:100(para) useradd.8.xml:405(para) pwconv.8.xml:114(para)
-#: newusers.8.xml:95(para) login.access.5.xml:71(para)
-#: groupadd.8.xml:131(para) chsh.1.xml:102(para) chfn.1.xml:65(para)
+#: userdel.8.xml:100(para) useradd.8.xml:406(para) pwconv.8.xml:114(para)
+#: newusers.8.xml:125(para) login.access.5.xml:71(para)
+#: groupadd.8.xml:131(para) chsh.1.xml:102(para) chpasswd.8.xml:265(para)
+#: chgpasswd.8.xml:142(para) chfn.1.xml:65(para)
 msgid "Shadow password suite configuration."
 msgstr ""
 
 # type: SH
-#: userdel.8.xml:119(title) useradd.8.xml:412(title) pwck.8.xml:186(title)
-#: passwd.1.xml:340(title) grpck.8.xml:129(title) groupmod.8.xml:110(title)
-#: groupdel.8.xml:61(title) groupadd.8.xml:152(title) chage.1.xml:199(title)
+#: userdel.8.xml:119(title) useradd.8.xml:413(title) pwck.8.xml:186(title)
+#: passwd.1.xml:342(title) grpck.8.xml:129(title) groupmod.8.xml:110(title)
+#: groupdel.8.xml:61(title) groupadd.8.xml:159(title) chage.1.xml:199(title)
 msgid "EXIT VALUES"
 msgstr "VALORI RESTITUITI"
 
 # type: IP
-#: userdel.8.xml:124(replaceable) useradd.8.xml:417(replaceable)
-#: pwck.8.xml:191(replaceable) passwd.1.xml:345(replaceable)
+#: userdel.8.xml:124(replaceable) useradd.8.xml:418(replaceable)
+#: pwck.8.xml:191(replaceable) passwd.1.xml:347(replaceable)
 #: grpck.8.xml:134(replaceable) groupmod.8.xml:115(replaceable)
-#: groupdel.8.xml:66(replaceable) groupadd.8.xml:157(replaceable)
+#: groupdel.8.xml:66(replaceable) groupadd.8.xml:164(replaceable)
 #: chage.1.xml:204(replaceable)
 msgid "0"
 msgstr "0"
 
 # type: Plain text
-#: userdel.8.xml:126(para) useradd.8.xml:419(para) pwck.8.xml:193(para)
-#: passwd.1.xml:347(para) grpck.8.xml:136(para) groupmod.8.xml:117(para)
-#: groupdel.8.xml:68(para) groupadd.8.xml:159(para) chage.1.xml:206(para)
+#: userdel.8.xml:126(para) useradd.8.xml:420(para) pwck.8.xml:193(para)
+#: passwd.1.xml:349(para) grpck.8.xml:136(para) groupmod.8.xml:117(para)
+#: groupdel.8.xml:68(para) groupadd.8.xml:166(para) chage.1.xml:206(para)
 msgid "success"
 msgstr "successo"
 
 # type: IP
-#: userdel.8.xml:130(replaceable) useradd.8.xml:423(replaceable)
+#: userdel.8.xml:130(replaceable) useradd.8.xml:424(replaceable)
 #: su.1.xml:6(manvolnum) sg.1.xml:6(manvolnum) pwck.8.xml:197(replaceable)
-#: passwd.1.xml:6(manvolnum) passwd.1.xml:351(replaceable)
+#: passwd.1.xml:6(manvolnum) passwd.1.xml:353(replaceable)
 #: newgrp.1.xml:6(manvolnum) login.1.xml:6(manvolnum)
 #: grpck.8.xml:140(replaceable) groups.1.xml:6(manvolnum)
 #: gpasswd.1.xml:6(manvolnum) expiry.1.xml:6(manvolnum)
@@ -775,29 +802,29 @@
 msgstr "1"
 
 # type: Plain text
-#: userdel.8.xml:132(para) useradd.8.xml:425(para)
+#: userdel.8.xml:132(para) useradd.8.xml:426(para)
 #, fuzzy
 msgid "can't update password file"
 msgstr "impossibile aggiornare i file delle password"
 
 # type: IP
-#: userdel.8.xml:136(replaceable) useradd.8.xml:429(replaceable)
-#: pwck.8.xml:203(replaceable) passwd.1.xml:357(replaceable)
+#: userdel.8.xml:136(replaceable) useradd.8.xml:430(replaceable)
+#: pwck.8.xml:203(replaceable) passwd.1.xml:359(replaceable)
 #: grpck.8.xml:146(replaceable) groupmod.8.xml:121(replaceable)
-#: groupdel.8.xml:72(replaceable) groupadd.8.xml:163(replaceable)
+#: groupdel.8.xml:72(replaceable) groupadd.8.xml:170(replaceable)
 #: chage.1.xml:216(replaceable)
 msgid "2"
 msgstr "2"
 
 # type: Plain text
-#: userdel.8.xml:138(para) useradd.8.xml:431(para) pwck.8.xml:199(para)
+#: userdel.8.xml:138(para) useradd.8.xml:432(para) pwck.8.xml:199(para)
 #: grpck.8.xml:142(para) groupmod.8.xml:123(para) groupdel.8.xml:74(para)
-#: groupadd.8.xml:165(para) chage.1.xml:218(para)
+#: groupadd.8.xml:172(para) chage.1.xml:218(para)
 msgid "invalid command syntax"
 msgstr "sintassi del comando errata"
 
-#: userdel.8.xml:142(replaceable) useradd.8.xml:447(replaceable)
-#: passwd.1.xml:381(replaceable) groupmod.8.xml:139(replaceable)
+#: userdel.8.xml:142(replaceable) useradd.8.xml:448(replaceable)
+#: passwd.1.xml:383(replaceable) groupmod.8.xml:139(replaceable)
 #: groupdel.8.xml:78(replaceable)
 msgid "6"
 msgstr "6"
@@ -812,20 +839,20 @@
 msgstr ""
 
 # type: IP
-#: userdel.8.xml:154(replaceable) useradd.8.xml:459(replaceable)
+#: userdel.8.xml:154(replaceable) useradd.8.xml:460(replaceable)
 #: groupmod.8.xml:151(replaceable) groupdel.8.xml:90(replaceable)
-#: groupadd.8.xml:187(replaceable)
+#: groupadd.8.xml:194(replaceable)
 msgid "10"
 msgstr "10"
 
 # type: Plain text
-#: userdel.8.xml:156(para) useradd.8.xml:461(para) groupmod.8.xml:153(para)
-#: groupdel.8.xml:92(para) groupadd.8.xml:189(para)
+#: userdel.8.xml:156(para) useradd.8.xml:462(para) groupmod.8.xml:153(para)
+#: groupdel.8.xml:92(para) groupadd.8.xml:196(para)
 msgid "can't update group file"
 msgstr "non è possibile aggiornare il file group"
 
 # type: IP
-#: userdel.8.xml:160(replaceable) useradd.8.xml:465(replaceable)
+#: userdel.8.xml:160(replaceable) useradd.8.xml:466(replaceable)
 msgid "12"
 msgstr "12"
 
@@ -915,7 +942,7 @@
 
 #: useradd.8.xml:5(refentrytitle) useradd.8.xml:10(refname)
 #: useradd.8.xml:15(command) useradd.8.xml:22(command)
-#: useradd.8.xml:26(command) login.defs.5.xml:210(term)
+#: useradd.8.xml:26(command) login.defs.5.xml:366(term)
 msgid "useradd"
 msgstr "useradd"
 
@@ -926,7 +953,7 @@
 "crea un nuovo utente o aggiorna le informazioni predefinite per i nuovi "
 "utenti"
 
-#: useradd.8.xml:23(arg) useradd.8.xml:27(arg) useradd.8.xml:82(option)
+#: useradd.8.xml:23(arg) useradd.8.xml:27(arg) useradd.8.xml:83(option)
 msgid "-D"
 msgstr "-D"
 
@@ -961,7 +988,7 @@
 msgstr ""
 
 # type: TP
-#: useradd.8.xml:66(term) useradd.8.xml:278(term)
+#: useradd.8.xml:66(term) useradd.8.xml:279(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
@@ -969,20 +996,21 @@
 
 #: useradd.8.xml:71(para)
 msgid ""
-"The default base directory for the system if <option>-d</option> dir 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."
+"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 ""
 
 # type: SS
-#: useradd.8.xml:85(para)
+#: useradd.8.xml:86(para)
 #, fuzzy
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr "Cambiare i valori predefiniti"
 
 # type: Plain text
-#: useradd.8.xml:96(para)
+#: useradd.8.xml:97(para)
 #, fuzzy
 msgid ""
 "The new user will be created using <replaceable>HOME_DIR</replaceable> as "
@@ -998,7 +1026,7 @@
 "login."
 
 # type: Plain text
-#: useradd.8.xml:139(para)
+#: useradd.8.xml:140(para)
 #, fuzzy
 msgid ""
 "The group name or number of the user's initial login group. The group name "
@@ -1011,7 +1039,7 @@
 "esistente. Il numero di gruppo predefinito è 1."
 
 # type: Plain text
-#: useradd.8.xml:153(para)
+#: useradd.8.xml:154(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. "
@@ -1026,12 +1054,12 @@
 "l'utente appartenga solo al gruppo iniziale."
 
 # type: IP
-#: useradd.8.xml:170(term)
+#: useradd.8.xml:171(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
 # type: Plain text
-#: useradd.8.xml:174(para)
+#: useradd.8.xml:175(para)
 #, fuzzy
 msgid ""
 "The user's home directory will be created if it does not exist. The files "
@@ -1053,13 +1081,13 @@
 "congiunzione con l'opzione <option>-m</option>.  Il comportamento "
 "predefinito è di non creare la directory e di non copiarvi alcun file."
 
-#: useradd.8.xml:190(term)
+#: useradd.8.xml:191(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
 msgstr ""
 
-#: useradd.8.xml:195(para)
+#: useradd.8.xml:196(para)
 msgid ""
 "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS "
 "and others). <placeholder-1/> Example: <option>-K </"
@@ -1072,19 +1100,19 @@
 "replaceable>=<replaceable>499</replaceable>"
 msgstr ""
 
-#: useradd.8.xml:209(para)
+#: useradd.8.xml:210(para)
 msgid ""
 "Note: <option>-K </option><replaceable>UID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable> doesn't work yet."
 msgstr ""
 
-#: useradd.8.xml:221(para)
+#: useradd.8.xml:222(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:230(para)
+#: useradd.8.xml:231(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
@@ -1092,7 +1120,7 @@
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:243(para)
+#: useradd.8.xml:244(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."
@@ -1102,7 +1130,7 @@
 "connessione predefinita."
 
 # type: Plain text
-#: useradd.8.xml:256(para)
+#: useradd.8.xml:257(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -1118,12 +1146,12 @@
 "sistema."
 
 # type: SS
-#: useradd.8.xml:268(title)
+#: useradd.8.xml:269(title)
 msgid "Changing the default values"
 msgstr "Cambiare i valori predefiniti"
 
 # type: Plain text
-#: useradd.8.xml:269(para)
+#: useradd.8.xml:270(para)
 #, fuzzy
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
@@ -1136,7 +1164,7 @@
 "valori predefiniti dalla linea di comando. Le opzioni valide sono"
 
 # type: Plain text
-#: useradd.8.xml:283(para)
+#: useradd.8.xml:284(para)
 #, fuzzy
 msgid ""
 "The path prefix for a new user's home directory. The user's name will be "
@@ -1150,12 +1178,12 @@
 "option>I< quando si crea un nuovo account.>"
 
 # type: Plain text
-#: useradd.8.xml:298(para)
+#: useradd.8.xml:299(para)
 msgid "The date on which the user account is disabled."
 msgstr "La data in cui l'account dell'utente verrà disabilitato."
 
 # type: Plain text
-#: useradd.8.xml:307(para)
+#: useradd.8.xml:308(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
@@ -1164,7 +1192,7 @@
 "venga disabilitato."
 
 # type: Plain text
-#: useradd.8.xml:319(para)
+#: useradd.8.xml:320(para)
 msgid ""
 "The group name or ID for a new user's initial group. The named group must "
 "exist, and a numerical group ID must have an existing entry."
@@ -1172,17 +1200,17 @@
 "Il nome o ID del gruppo iniziale per un nuovo utente.  Il gruppo nominato "
 "deve esistere, ed un ID numerico di gruppo deve avere una voce esistente."
 
-#: useradd.8.xml:332(para)
+#: useradd.8.xml:333(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
 # type: SH
-#: useradd.8.xml:343(title)
+#: useradd.8.xml:344(title)
 msgid "NOTES"
 msgstr "NOTE"
 
 # type: Plain text
-#: useradd.8.xml:344(para)
+#: useradd.8.xml:345(para)
 msgid ""
 "The system administrator is responsible for placing the default user files "
 "in the <filename>/etc/skel/</filename> directory."
@@ -1191,22 +1219,23 @@
 "predefiniti degli utenti nella directory <filename>/etc/skel/</filename>."
 
 # type: Plain text
-#: useradd.8.xml:351(para)
+#: useradd.8.xml:352(para)
+#, fuzzy
 msgid ""
-"You may not add a user to a NIS group. This must be performed on the NIS "
-"server."
+"You may not add a user to a NIS or LDAP group. This must be performed on the "
+"corresponding server."
 msgstr ""
 "Non è possibile aggiungere un utente ad un gruppo NIS. Questo deve essere "
 "fatto sul server NIS."
 
-#: useradd.8.xml:356(para)
+#: useradd.8.xml:357(para)
 msgid ""
 "Similarly, if the username already exists in an external user database such "
-"as NIS, <command>useradd</command> will deny the user account creation "
-"request."
+"as NIS or LDAP, <command>useradd</command> will deny the user account "
+"creation request."
 msgstr ""
 
-#: useradd.8.xml:362(para)
+#: useradd.8.xml:363(para)
 msgid ""
 "Usernames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
@@ -1214,78 +1243,78 @@
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:391(filename)
+#: useradd.8.xml:392(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
-#: useradd.8.xml:393(para)
+#: useradd.8.xml:394(para)
 msgid "Default values for account creation."
 msgstr ""
 
-#: useradd.8.xml:397(filename)
+#: useradd.8.xml:398(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
 # type: Plain text
-#: useradd.8.xml:399(para)
+#: useradd.8.xml:400(para)
 msgid "Directory containing default files."
 msgstr "Directory contenente i file predefiniti."
 
 # type: IP
-#: useradd.8.xml:435(replaceable) shadow.3.xml:6(manvolnum)
-#: pwck.8.xml:209(replaceable) passwd.1.xml:363(replaceable)
+#: useradd.8.xml:436(replaceable) shadow.3.xml:6(manvolnum)
+#: pwck.8.xml:209(replaceable) passwd.1.xml:365(replaceable)
 #: grpck.8.xml:152(replaceable) groupmod.8.xml:127(replaceable)
-#: groupadd.8.xml:169(replaceable)
+#: groupadd.8.xml:176(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:437(para) passwd.1.xml:383(para) groupmod.8.xml:129(para)
-#: groupadd.8.xml:171(para)
+#: useradd.8.xml:438(para) passwd.1.xml:385(para) groupmod.8.xml:129(para)
+#: groupadd.8.xml:178(para)
 msgid "invalid argument to option"
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:441(replaceable) pwck.8.xml:215(replaceable)
-#: passwd.1.xml:369(replaceable) grpck.8.xml:158(replaceable)
-#: groupmod.8.xml:133(replaceable) groupadd.8.xml:175(replaceable)
+#: useradd.8.xml:442(replaceable) pwck.8.xml:215(replaceable)
+#: passwd.1.xml:371(replaceable) grpck.8.xml:158(replaceable)
+#: groupmod.8.xml:133(replaceable) groupadd.8.xml:182(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:443(para)
+#: useradd.8.xml:444(para)
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:449(para) groupmod.8.xml:135(para) groupmod.8.xml:141(para)
+#: useradd.8.xml:450(para) groupmod.8.xml:135(para) groupmod.8.xml:141(para)
 #: groupdel.8.xml:80(para)
 msgid "specified group doesn't exist"
 msgstr "il gruppo specificato non esiste"
 
-#: useradd.8.xml:453(replaceable) groupmod.8.xml:145(replaceable)
-#: groupadd.8.xml:181(replaceable)
+#: useradd.8.xml:454(replaceable) groupmod.8.xml:145(replaceable)
+#: groupadd.8.xml:188(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:455(para)
+#: useradd.8.xml:456(para)
 msgid "username already in use"
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:467(para)
+#: useradd.8.xml:468(para)
 msgid "can't create home directory"
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:471(replaceable)
+#: useradd.8.xml:472(replaceable)
 msgid "13"
 msgstr "13"
 
-#: useradd.8.xml:473(para)
+#: useradd.8.xml:474(para)
 msgid "can't create mail spool"
 msgstr ""
 
 # type: TP
-#: useradd.8.xml:413(para)
+#: useradd.8.xml:414(para)
 #, fuzzy
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
@@ -1297,7 +1326,7 @@
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
 # type: Plain text
-#: useradd.8.xml:482(para)
+#: useradd.8.xml:483(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1342,7 +1371,7 @@
 # type: IP
 #: suauth.5.xml:6(manvolnum) shadow.5.xml:6(manvolnum)
 #: pwck.8.xml:221(replaceable) porttime.5.xml:6(manvolnum)
-#: passwd.5.xml:6(manvolnum) passwd.1.xml:375(replaceable)
+#: passwd.5.xml:6(manvolnum) passwd.1.xml:377(replaceable)
 #: login.defs.5.xml:6(manvolnum) login.access.5.xml:6(manvolnum)
 #: limits.5.xml:6(manvolnum) gshadow.5.xml:6(manvolnum)
 #: grpck.8.xml:164(replaceable) faillog.5.xml:6(manvolnum)
@@ -1494,7 +1523,7 @@
 msgstr ""
 
 # type: SH
-#: suauth.5.xml:149(title) pwconv.8.xml:98(title) login.defs.5.xml:239(title)
+#: suauth.5.xml:149(title) pwconv.8.xml:98(title) login.defs.5.xml:395(title)
 msgid "BUGS"
 msgstr "PROBLEMI"
 
@@ -2333,7 +2362,7 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 #: pwconv.8.xml:5(refentrytitle) pwconv.8.xml:10(refname)
-#: pwconv.8.xml:19(command) login.defs.5.xml:204(term)
+#: pwconv.8.xml:19(command) login.defs.5.xml:360(term)
 msgid "pwconv"
 msgstr "pwconv"
 
@@ -2515,7 +2544,7 @@
 msgstr "passwd"
 
 #: pwck.8.xml:31(arg) pwck.8.xml:114(option) login.1.xml:148(option)
-#: grpck.8.xml:16(arg) gpasswd.1.xml:93(option)
+#: grpck.8.xml:16(arg) gpasswd.1.xml:112(option)
 msgid "-r"
 msgstr "-r"
 
@@ -3225,18 +3254,19 @@
 #: passwd.1.xml:215(para)
 msgid ""
 "Lock the named account. This option disables an account by changing the "
-"password to a value which matches no possible encrypted value."
+"password to a value which matches no possible encrypted value, and by "
+"setting the account expiry field to 1."
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:222(term) chage.1.xml:109(term)
+#: passwd.1.xml:223(term) chage.1.xml:109(term)
 msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: passwd.1.xml:226(para) chage.1.xml:113(para)
+#: passwd.1.xml:227(para) chage.1.xml:113(para)
 #, fuzzy
 msgid ""
 "Set the minimum number of days between password changes to "
@@ -3248,23 +3278,23 @@
 "momento."
 
 # type: IP
-#: passwd.1.xml:244(term)
+#: passwd.1.xml:245(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
 msgstr ""
 
-#: passwd.1.xml:248(para)
+#: passwd.1.xml:249(para)
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:254(term)
+#: passwd.1.xml:255(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
 # type: Plain text
-#: passwd.1.xml:258(para)
+#: passwd.1.xml:259(para)
 #, fuzzy
 msgid ""
 "Display account status information. The status information consists of 7 "
@@ -3285,26 +3315,26 @@
 "campi."
 
 # type: IP
-#: passwd.1.xml:271(term)
+#: passwd.1.xml:272(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
-#: passwd.1.xml:275(para)
+#: passwd.1.xml:276(para)
 msgid ""
 "Unlock the named account. This option re-enables an account by changing the "
 "password back to its previous value (to value before using <option>-l</"
-"option> option)."
+"option> option), and by resetting the account expiry field."
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:283(term)
+#: passwd.1.xml:285(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: passwd.1.xml:287(para)
+#: passwd.1.xml:289(para)
 #, fuzzy
 msgid ""
 "Set the number of days of warning before a password change is required. The "
@@ -3318,20 +3348,20 @@
 "scadenza."
 
 # type: IP
-#: passwd.1.xml:296(term)
+#: passwd.1.xml:298(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
 msgstr ""
 
-#: passwd.1.xml:300(para)
+#: passwd.1.xml:302(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:312(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Not all options may be supported. Password complexity checking may vary from "
 "site to site. The user is urged to select a password as complex as he or she "
@@ -3345,36 +3375,36 @@
 "di modificare la propria password se NIS è abilitato e loro non hanno fatto "
 "il login sul server NIS."
 
-#: passwd.1.xml:353(para) chage.1.xml:212(para)
+#: passwd.1.xml:355(para) chage.1.xml:212(para)
 msgid "permission denied"
 msgstr ""
 
-#: passwd.1.xml:359(para)
+#: passwd.1.xml:361(para)
 msgid "invalid combination of options"
 msgstr ""
 
-#: passwd.1.xml:365(para)
+#: passwd.1.xml:367(para)
 msgid "unexpected failure, nothing done"
 msgstr ""
 
-#: passwd.1.xml:371(para)
+#: passwd.1.xml:373(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr ""
 
 # type: TP
-#: passwd.1.xml:377(para)
+#: passwd.1.xml:379(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 
 # type: TP
-#: passwd.1.xml:341(para)
+#: passwd.1.xml:343(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:392(para)
+#: passwd.1.xml:394(para)
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -3437,7 +3467,7 @@
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
 #: newusers.8.xml:5(refentrytitle) newusers.8.xml:10(refname)
-#: newusers.8.xml:16(command) login.defs.5.xml:196(term)
+#: newusers.8.xml:16(command) login.defs.5.xml:352(term)
 msgid "newusers"
 msgstr "newusers"
 
@@ -3507,8 +3537,15 @@
 "The input file must be protected since it contains unencrypted passwords."
 msgstr ""
 
+#: newusers.8.xml:87(para) chpasswd.8.xml:123(para)
+msgid ""
+"PAM is not used to update the passwords. Only <filename>/etc/passwd</"
+"filename> and <filename>/etc/shadow</filename> are updated, and the various "
+"checks or options provided by PAM modules are not used."
+msgstr ""
+
 # type: Plain text
-#: newusers.8.xml:103(para)
+#: newusers.8.xml:133(para)
 msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -3539,7 +3576,7 @@
 
 #: newgrp.1.xml:17(replaceable) grpck.8.xml:18(replaceable)
 #: groupdel.8.xml:18(replaceable) groupadd.8.xml:24(replaceable)
-#: gpasswd.1.xml:21(replaceable)
+#: gpasswd.1.xml:26(replaceable)
 msgid "group"
 msgstr ""
 
@@ -3598,12 +3635,14 @@
 
 # type: Plain text
 #: newgrp.1.xml:85(para)
+#, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"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>, <citerefentry><refentrytitle>gshadow</"
@@ -3612,12 +3651,13 @@
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<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>, <citerefentry><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
 #: logoutd.8.xml:5(refentrytitle) logoutd.8.xml:10(refname)
 #: logoutd.8.xml:16(command)
@@ -3690,208 +3730,396 @@
 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 \"yes\" or \"no\". An undefined boolean parameter or one "
-"with a value other than these will be given a \"no\" value. Numbers (both "
+"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 \"0\") or hexadecimal values (precede the value with \"0x\"). The "
-"maximum value of the regular and long numeric parameters is machine-"
-"dependent."
+"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:42(para)
+#: login.defs.5.xml:46(para)
 msgid "The following configuration items are provided:"
 msgstr ""
 
-#: login.defs.5.xml:46(term)
-msgid "CHFN_AUTH (boolean)"
-msgstr ""
+# type: IP
+#: login.defs.5.xml:50(term)
+#, fuzzy
+msgid "<option>CHFN_AUTH</option> (boolean)"
+msgstr "<option>-c </option>I<commento>"
 
-#: login.defs.5.xml:48(para)
+#: login.defs.5.xml:52(para)
 msgid ""
-"If <emphasis remap=\"I\">yes</emphasis>, the <command>chfn</command> and "
+"If <replaceable>yes</replaceable>, the <command>chfn</command> and "
 "<command>chsh</command> programs will require authentication before making "
 "any changes, unless run by the superuser."
 msgstr ""
 
-#: login.defs.5.xml:57(term)
-msgid "CHFN_RESTRICT (string)"
-msgstr ""
+# type: IP
+#: login.defs.5.xml:61(term)
+#, fuzzy
+msgid "<option>CHFN_RESTRICT</option> (string)"
+msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:59(para)
+#: login.defs.5.xml:63(para)
 msgid ""
 "This parameter specifies which values in the <emphasis remap=\"I\">gecos</"
 "emphasis> field of the <filename>/etc/passwd</filename> file may be changed "
 "by regular users using the <command>chfn</command> program. It can be any "
-"combination of letters <emphasis remap=\"I\">f</emphasis> ,<emphasis remap="
-"\"I\">r</emphasis>, <emphasis remap=\"I\">w</emphasis>, <emphasis remap=\"I"
-"\">h</emphasis>, for Full name, Room number, Work phone, and Home phone, "
-"respectively. For backward compatibility, \"yes\" is equivalent to \"rwh\" "
-"and \"no\" is equivalent to \"frwh\". If not specified, only the superuser "
-"can make any changes. The most restrictive setting is better achieved by not "
-"installing <filename>chfn</filename> SUID."
+"combination of letters <replaceable>f</replaceable>, <replaceable>r</"
+"replaceable>, <replaceable>w</replaceable>, <replaceable>h</replaceable>, "
+"for Full name, Room number, Work phone, and Home phone, respectively. For "
+"backward compatibility, <replaceable>yes</replaceable> is equivalent to "
+"<replaceable>rwh</replaceable> and <replaceable>no</replaceable> is "
+"equivalent to <replaceable>frwh</replaceable>. If not specified, only the "
+"superuser can make any changes. The most restrictive setting is better "
+"achieved by not installing <command>chfn</command> SUID."
 msgstr ""
 
-#: login.defs.5.xml:76(term)
-msgid "GID_MAX (number)"
+#: login.defs.5.xml:83(term) chpasswd.8.xml:175(term)
+msgid "<option>ENCRYPT_METHOD</option> (string)"
 msgstr ""
 
-#: login.defs.5.xml:77(term)
-msgid "GID_MIN (number)"
+#: login.defs.5.xml:85(para) chpasswd.8.xml:177(para)
+msgid ""
+"This defines the system default encryption algorithm for encrypting "
+"passwords (if no algorithm are specified on the command line)."
 msgstr ""
 
-#: login.defs.5.xml:79(para)
+#: login.defs.5.xml:94(para) chpasswd.8.xml:186(para)
+msgid "<replaceable>DES</replaceable> (default)"
+msgstr ""
+
+#: login.defs.5.xml:97(replaceable) chpasswd.8.xml:189(replaceable)
+msgid "MD5"
+msgstr ""
+
+#: login.defs.5.xml:100(replaceable) chpasswd.8.xml:192(replaceable)
+msgid "SHA256"
+msgstr ""
+
+#: login.defs.5.xml:103(replaceable) chpasswd.8.xml:195(replaceable)
+msgid "SHA512"
+msgstr ""
+
+#: login.defs.5.xml:90(para) chpasswd.8.xml:182(para)
+msgid "It can take one of these values: <placeholder-1/>"
+msgstr ""
+
+#: login.defs.5.xml:107(para) chpasswd.8.xml:199(para)
 msgid ""
+"Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option> variable."
+msgstr ""
+
+#: login.defs.5.xml:111(para) login.defs.5.xml:192(para)
+#: chpasswd.8.xml:168(para) chpasswd.8.xml:203(para)
+msgid ""
+"Note: if you use PAM, it is recommended to set this variable consistently "
+"with the PAM modules configuration."
+msgstr ""
+
+# type: IP
+#: login.defs.5.xml:118(term)
+#, fuzzy
+msgid "<option>GID_MAX</option> (number)"
+msgstr "<option>-I</option> I<inattività>"
+
+# type: IP
+#: login.defs.5.xml:119(term)
+#, fuzzy
+msgid "<option>GID_MIN</option> (number)"
+msgstr "<option>-I</option> I<inattività>"
+
+#: login.defs.5.xml:121(para)
+msgid ""
 "Range of group IDs to choose from for the <command>useradd</command> and "
 "<command>groupadd</command> programs."
 msgstr ""
 
-#: login.defs.5.xml:87(term)
-msgid "MAIL_DIR (string)"
-msgstr ""
+# type: IP
+#: login.defs.5.xml:129(term)
+#, fuzzy
+msgid "<option>MAIL_DIR</option> (string)"
+msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:89(para)
+#: login.defs.5.xml:131(para)
 msgid ""
 "The mail spool directory. This is needed to manipulate the mailbox when its "
 "corresponding user account is modified or deleted. If not specified, a "
 "compile-time default is used."
 msgstr ""
 
-#: login.defs.5.xml:97(term)
-msgid "PASS_MAX_DAYS (number)"
+#: login.defs.5.xml:139(term)
+msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
 msgstr ""
 
-#: login.defs.5.xml:99(para)
+#: login.defs.5.xml:141(para)
 msgid ""
+"Maximum members per group entry. When the maximum is reached, a new group "
+"entry (line) is started in <filename>/etc/group</filename> (with the same "
+"name, same password, and same GID)."
+msgstr ""
+
+#: login.defs.5.xml:147(para)
+msgid ""
+"The default value is 0, meaning that there are no limits in the number of "
+"members in a group."
+msgstr ""
+
+#. Note: on HP, split groups have the same ID, but different
+#. 	             names.
+#: login.defs.5.xml:153(para)
+msgid ""
+"This feature (split group) permits to limit the length of lines in the group "
+"file. This is useful to make sure that lines for NIS groups are not larger "
+"than 1024 characters."
+msgstr ""
+
+#: login.defs.5.xml:158(para)
+msgid "If you need to enforce such limit, you can use 25."
+msgstr ""
+
+#: login.defs.5.xml:161(para)
+msgid ""
+"Note: split groups may not be supported by all tools (even in the Shadow "
+"toolsuite. You should not use this variable unless you really need it."
+msgstr ""
+
+#: login.defs.5.xml:169(term) chpasswd.8.xml:145(term)
+msgid "<option>MD5_CRYPT_ENAB</option> (boolean)"
+msgstr ""
+
+#: login.defs.5.xml:171(para) chpasswd.8.xml:147(para)
+msgid ""
+"Indicate if passwords must be encrypted using the MD5-based algorithm. If "
+"set to <replaceable>yes</replaceable>, new passwords will be encrypted using "
+"the MD5-based algorithm compatible with the one used by recent releases of "
+"FreeBSD. It supports passwords of unlimited length and longer salt strings. "
+"Set to <replaceable>no</replaceable> if you need to copy encrypted passwords "
+"to other systems which don't understand the new algorithm. Default is "
+"<replaceable>no</replaceable>."
+msgstr ""
+
+#: login.defs.5.xml:183(para)
+msgid ""
+"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"or by any command line option used to configure the encryption algorithm."
+msgstr ""
+
+#: login.defs.5.xml:188(para) chpasswd.8.xml:164(para)
+msgid ""
+"This variable is deprecated. You should use <option>ENCRYPT_METHOD</option>."
+msgstr ""
+
+#: login.defs.5.xml:199(term)
+msgid "<option>PASS_MAX_DAYS</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:201(para)
+msgid ""
 "The maximum number of days a password may be used. If the password is older "
 "than this, a password change will be forced. If not specified, -1 will be "
 "assumed (which disables the restriction)."
 msgstr ""
 
-#: login.defs.5.xml:108(term)
-msgid "PASS_MIN_DAYS (number)"
-msgstr ""
+# type: IP
+#: login.defs.5.xml:210(term)
+#, fuzzy
+msgid "<option>PASS_MIN_DAYS</option> (number)"
+msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:110(para)
+#: login.defs.5.xml:212(para)
 msgid ""
 "The minimum number of days allowed between password changes. Any password "
 "changes attempted sooner than this will be rejected. If not specified, -1 "
 "will be assumed (which disables the restriction)."
 msgstr ""
 
-#: login.defs.5.xml:119(term)
-msgid "PASS_WARN_AGE (number)"
+#: login.defs.5.xml:221(term)
+msgid "<option>PASS_WARN_AGE</option> (number)"
 msgstr ""
 
-#: login.defs.5.xml:121(para)
+#: login.defs.5.xml:223(para)
 msgid ""
 "The number of days warning given before a password expires. A zero means "
 "warning is given only upon the day of expiration, a negative value means no "
 "warning is given. If not specified, no warning will be provided."
 msgstr ""
 
-#: login.defs.5.xml:131(para)
+#: login.defs.5.xml:233(para)
 msgid ""
-"PASS_MAX_DAYS, PASS_MIN_DAYS and PASS_WARN_AGE are only used at the time of "
-"account creation. Any changes to these settings won't affect existing "
-"accounts."
+"<option>PASS_MAX_DAYS</option>, <option>PASS_MIN_DAYS</option> and "
+"<option>PASS_WARN_AGE</option> are only used at the time of account "
+"creation. Any changes to these settings won't affect existing accounts."
 msgstr ""
 
-#: login.defs.5.xml:138(term)
-msgid "UID_MAX (number)"
+#: login.defs.5.xml:241(term) chpasswd.8.xml:210(term)
+msgid "<option>SHA_CRYPT_MIN_ROUNDS</option> (number)"
 msgstr ""
 
-#: login.defs.5.xml:139(term)
-msgid "UID_MIN (number)"
+#: login.defs.5.xml:242(term) chpasswd.8.xml:211(term)
+msgid "<option>SHA_CRYPT_MAX_ROUNDS</option> (number)"
 msgstr ""
 
-#: login.defs.5.xml:141(para)
+#: login.defs.5.xml:244(para) chpasswd.8.xml:213(para)
 msgid ""
-"Range of user IDs to choose from for the <command>useradd</command> program."
+"When <option>ENCRYPT_METHOD</option> is set to <replaceable>SHA256</"
+"replaceable> or <replaceable>SHA512</replaceable>, this defines the number "
+"of SHA rounds used by the encryption algorithm by default (when the number "
+"of rounds is not specified on the command line)."
 msgstr ""
 
-#: login.defs.5.xml:148(term)
-msgid "UMASK (number)"
+#: login.defs.5.xml:251(para) chpasswd.8.xml:220(para)
+msgid ""
+"With a lot of rounds, it is more difficult to brute forcing the password. "
+"But note also that more CPU resources will be needed to authenticate users."
 msgstr ""
 
-#: login.defs.5.xml:150(para)
+#: login.defs.5.xml:256(para) chpasswd.8.xml:225(para)
 msgid ""
+"If not specified, the libc will choose the default number of rounds (5000)."
+msgstr ""
+
+#: login.defs.5.xml:260(para) chpasswd.8.xml:229(para)
+msgid "The values must be inside the 1000-999999999 range."
+msgstr ""
+
+#: login.defs.5.xml:263(para) chpasswd.8.xml:232(para)
+msgid ""
+"If only one of the <option>SHA_CRYPT_MIN_ROUNDS</option> or "
+"<option>SHA_CRYPT_MAX_ROUNDS</option> values is set, then this value will be "
+"used."
+msgstr ""
+
+#: login.defs.5.xml:268(para) chpasswd.8.xml:237(para)
+msgid ""
+"If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</"
+"option>, the highest value will be used."
+msgstr ""
+
+# type: IP
+#: login.defs.5.xml:276(term)
+#, fuzzy
+msgid "<option>UID_MAX</option> (number)"
+msgstr "<option>-I</option> I<inattività>"
+
+# type: IP
+#: login.defs.5.xml:277(term)
+#, fuzzy
+msgid "<option>UID_MIN</option> (number)"
+msgstr "<option>-I</option> I<inattività>"
+
+#: login.defs.5.xml:279(para)
+msgid ""
+"Range of user IDs to choose from for the <command>useradd</command> program."
+msgstr ""
+
+# type: IP
+#: login.defs.5.xml:286(term)
+#, fuzzy
+msgid "<option>UMASK</option> (number)"
+msgstr "<option>-M</option> I<gg_max>"
+
+#: login.defs.5.xml:288(para)
+msgid ""
 "The permission mask is initialized to this value. If not specified, the "
 "permission mask will be initialized to 022."
 msgstr ""
 
-#: login.defs.5.xml:157(term)
-msgid "USERDEL_CMD (string)"
+#: login.defs.5.xml:295(term)
+msgid "<option>USERDEL_CMD</option> (string)"
 msgstr ""
 
-#: login.defs.5.xml:159(para)
+#: login.defs.5.xml:297(para)
 msgid ""
 "If defined, this command is run when removing a user. It should remove any "
 "at/cron/print jobs etc. owned by the user to be removed (passed as the first "
 "argument)."
 msgstr ""
 
-#: login.defs.5.xml:170(title)
+#: login.defs.5.xml:308(title)
 msgid "CROSS REFERENCE"
 msgstr ""
 
-#: login.defs.5.xml:171(para)
+#: login.defs.5.xml:309(para)
 msgid ""
 "The following cross reference shows which programs in the shadow password "
 "suite use which parameters."
 msgstr ""
 
-#: login.defs.5.xml:178(term) chfn.1.xml:5(refentrytitle)
+#: login.defs.5.xml:316(term) chfn.1.xml:5(refentrytitle)
 #: chfn.1.xml:10(refname) chfn.1.xml:16(command)
 msgid "chfn"
 msgstr ""
 
-#: login.defs.5.xml:180(para)
+#: login.defs.5.xml:318(para)
 msgid "CHFN_AUTH CHFN_RESTRICT"
 msgstr ""
 
-#: login.defs.5.xml:184(term) chsh.1.xml:5(refentrytitle)
+#: login.defs.5.xml:322(term) chgpasswd.8.xml:5(refentrytitle)
+#: chgpasswd.8.xml:10(refname) chgpasswd.8.xml:16(command)
+msgid "chgpasswd"
+msgstr "chgpasswd"
+
+#: login.defs.5.xml:324(para)
+msgid ""
+"MD5_CRYPT_ENAB ENCRYPT_METHOD SHA_CRYPT_MIN_ROUNDS SHA_CRYPT_MAX_ROUNDS "
+"MAX_MEMBERS_PER_GROUP"
+msgstr ""
+
+#: login.defs.5.xml:331(term) chpasswd.8.xml:5(refentrytitle)
+#: chpasswd.8.xml:10(refname) chpasswd.8.xml:16(command)
+msgid "chpasswd"
+msgstr "chpasswd"
+
+#: login.defs.5.xml:333(para)
+msgid "MD5_CRYPT_ENAB ENCRYPT_METHOD SHA_CRYPT_MIN_ROUNDS SHA_CRYPT_MAX_ROUNDS"
+msgstr ""
+
+#: login.defs.5.xml:340(term) chsh.1.xml:5(refentrytitle)
 #: chsh.1.xml:10(refname) chsh.1.xml:16(command)
 msgid "chsh"
 msgstr ""
 
 # type: TH
-#: login.defs.5.xml:186(para)
+#: login.defs.5.xml:342(para)
 msgid "CHFN_AUTH"
 msgstr ""
 
-#: login.defs.5.xml:190(term) groupadd.8.xml:5(refentrytitle)
+#: login.defs.5.xml:346(term) groupadd.8.xml:5(refentrytitle)
 #: groupadd.8.xml:10(refname) groupadd.8.xml:16(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:192(para)
+#: login.defs.5.xml:348(para)
 msgid "GID_MAX GID_MIN"
 msgstr ""
 
-#: login.defs.5.xml:198(para)
+#: login.defs.5.xml:354(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 msgstr ""
 
-#: login.defs.5.xml:206(para)
+#: login.defs.5.xml:362(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 msgstr ""
 
-#: login.defs.5.xml:212(para)
+#: login.defs.5.xml:368(para)
 msgid ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 msgstr ""
 
-#: login.defs.5.xml:223(para)
+#: login.defs.5.xml:379(para)
 msgid "MAIL_DIR USERDEL_CMD"
 msgstr ""
 
-#: login.defs.5.xml:231(para)
+#: login.defs.5.xml:387(para)
 msgid "MAIL_DIR"
 msgstr ""
 
 # type: Plain text
-#: login.defs.5.xml:240(para)
+#: login.defs.5.xml:396(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 "
@@ -3904,7 +4132,7 @@
 msgstr ""
 
 # type: Plain text
-#: login.defs.5.xml:257(para)
+#: login.defs.5.xml:413(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4896,8 +5124,8 @@
 msgid "display current group names"
 msgstr "mostra i nomi dei gruppi correnti"
 
-#: groups.1.xml:18(replaceable) gpasswd.1.xml:67(replaceable)
-#: gpasswd.1.xml:80(replaceable) chfn.1.xml:22(replaceable)
+#: groups.1.xml:18(replaceable) gpasswd.1.xml:86(replaceable)
+#: gpasswd.1.xml:99(replaceable) chfn.1.xml:22(replaceable)
 msgid "user"
 msgstr ""
 
@@ -5118,7 +5346,7 @@
 "The options which apply to the <command>groupmems</command> command are:"
 msgstr "Il comando <command>groupmems</command> accetta le seguenti opzioni:"
 
-#: groupmems.8.xml:49(option) gpasswd.1.xml:67(option)
+#: groupmems.8.xml:49(option) gpasswd.1.xml:86(option)
 msgid "-a"
 msgstr "-a"
 
@@ -5126,7 +5354,7 @@
 msgid "Add a new user to the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:55(option) gpasswd.1.xml:80(option)
+#: groupmems.8.xml:55(option) gpasswd.1.xml:99(option)
 msgid "-d"
 msgstr "-d"
 
@@ -5398,26 +5626,36 @@
 "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgstr ""
 
-#: groupadd.8.xml:143(para)
+#: groupadd.8.xml:144(para)
+msgid "Groupnames may only be up to 16 characters long."
+msgstr ""
+
+# type: Plain text
+#: groupadd.8.xml:147(para)
+#, fuzzy
 msgid ""
-"If the groupname already exists in an external group database such as NIS, "
-"<command>groupadd</command> will deny the group creation request."
+"You may not add a NIS or LDAP group. This must be performed on the "
+"corresponding server."
 msgstr ""
+"Non è possibile aggiungere un utente ad un gruppo NIS. Questo deve essere "
+"fatto sul server NIS."
 
-#: groupadd.8.xml:148(para)
-msgid "Groupnames may only be up to 16 characters long."
+#: groupadd.8.xml:151(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:177(para)
+#: groupadd.8.xml:184(para)
 msgid "GID not unique (when <option>-o</option> not used)"
 msgstr ""
 
-#: groupadd.8.xml:183(para)
+#: groupadd.8.xml:190(para)
 msgid "group name not unique"
 msgstr ""
 
 # type: TP
-#: groupadd.8.xml:153(para)
+#: groupadd.8.xml:160(para)
 #, fuzzy
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
@@ -5429,7 +5667,7 @@
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
 # type: Plain text
-#: groupadd.8.xml:198(para)
+#: groupadd.8.xml:205(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -5464,29 +5702,44 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 #: gpasswd.1.xml:5(refentrytitle) gpasswd.1.xml:10(refname)
-#: gpasswd.1.xml:16(command)
+#: gpasswd.1.xml:21(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
+#: gpasswd.1.xml:13(phrase)
+#, fuzzy
+msgid "and <placeholder-1/> files"
+msgstr "-a <placeholder-1/>"
+
+#: gpasswd.1.xml:15(phrase)
+msgid "file"
+msgstr ""
+
 #: gpasswd.1.xml:11(refpurpose)
-msgid "administer the <placeholder-1/> file"
-msgstr "amministra il file <placeholder-1/>"
+#, fuzzy
+msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
+msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:18(replaceable)
+#: gpasswd.1.xml:23(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "opzioni"
 
+#: gpasswd.1.xml:33(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 ""
+
 # type: Plain text
-#: gpasswd.1.xml:28(para)
+#: gpasswd.1.xml:41(para)
 #, fuzzy
 msgid ""
-"The <command>gpasswd</command> command is used to administer the <filename>/"
-"etc/group</filename> file (and <filename>/etc/gshadow</filename> file if "
-"compiled with SHADOWGRP defined). Every group can have administrators, "
-"members and a password. System administrator can use the <option>-A</option> "
-"option to define group administrator(s) and the <option>-M</option> option "
-"to define members and has all rights of group administrators and members."
+"System administrator can use the <option>-A</option> option to define group "
+"administrator(s) and the <option>-M</option> option to define members and "
+"has all rights of group administrators and members."
 msgstr ""
 "<command>gpasswd</command> viene usato per amministrare il file <filename>/"
 "etc/group</filename> (ed il file <filename>/etc/gshadow</filename> se "
@@ -5496,15 +5749,21 @@
 "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:46(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 ""
+
 # type: Plain text
-#: gpasswd.1.xml:37(para)
+#: gpasswd.1.xml:53(para)
 #, fuzzy
 msgid ""
-"<command>gpasswd</command> called by a group administrator with a group name "
-"only prompts for the group password. If a password is set the members can "
-"still <citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry> without a password, and non-members must supply "
-"the password."
+"If a password is set the members can still "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry> without a password, and non-members must supply the password."
 msgstr ""
 "<command>gpasswd</command> invocata da un amministratore di gruppo con il "
 "solo nome del gruppo richiede solamente la password di gruppo. Se la "
@@ -5513,12 +5772,12 @@
 "citerefentry> senza la password, i non-membri devono fornire la password."
 
 # type: SS
-#: gpasswd.1.xml:47(title)
+#: gpasswd.1.xml:61(title)
 msgid "Notes about group passwords"
 msgstr "Note sulle password di gruppo"
 
 # type: Plain text
-#: gpasswd.1.xml:48(para)
+#: gpasswd.1.xml:62(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 "
@@ -5529,20 +5788,29 @@
 "la cooperazione tra vari utenti."
 
 # type: Plain text
-#: gpasswd.1.xml:59(para)
+#: gpasswd.1.xml:73(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
-"options cannot be combined. The options which apply to the <command>gpasswd</"
-"command> command are:"
+"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."
 
+#: gpasswd.1.xml:77(para)
+msgid "The options cannot be combined."
+msgstr ""
+
 # type: Plain text
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:80(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: Plain text
+#: gpasswd.1.xml:89(para)
+#, fuzzy
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
@@ -5551,7 +5819,7 @@
 "<replaceable>nome_gruppo</replaceable>."
 
 # type: Plain text
-#: gpasswd.1.xml:83(para)
+#: gpasswd.1.xml:102(para)
 #, fuzzy
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
@@ -5560,19 +5828,19 @@
 "Il nome del gruppo verrà modificato da <replaceable>gruppo</replaceable> a "
 "<replaceable>nome_gruppo</replaceable>."
 
-#: gpasswd.1.xml:96(para)
+#: gpasswd.1.xml:115(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:108(option)
+#: gpasswd.1.xml:127(option)
 #, fuzzy
 msgid "-R"
 msgstr "-"
 
-#: gpasswd.1.xml:111(para)
+#: gpasswd.1.xml:130(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 "
@@ -5580,14 +5848,14 @@
 msgstr ""
 
 # type: IP
-#: gpasswd.1.xml:122(term)
+#: gpasswd.1.xml:141(term)
 #, fuzzy
 msgid "<option>-A</option><replaceable>user</replaceable>,..."
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
 
 # type: Plain text
-#: gpasswd.1.xml:126(para)
+#: gpasswd.1.xml:145(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr ""
@@ -5597,30 +5865,40 @@
 "- una lista valida di membri e amministratori"
 
 # type: IP
-#: gpasswd.1.xml:134(term)
+#: gpasswd.1.xml:153(term)
 #, fuzzy
 msgid "<option>-M</option><replaceable>user</replaceable>,..."
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
 
-#: gpasswd.1.xml:138(para)
+#: gpasswd.1.xml:157(para)
 msgid "Set the list of group members."
 msgstr ""
 
+#: gpasswd.1.xml:167(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 ""
+
 # type: Plain text
-#: gpasswd.1.xml:166(para)
+#: gpasswd.1.xml:197(para)
+#, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</"
+"citerefentry>, <citerefentry><refentrytitle>groupadd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>grpck</"
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</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 ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
@@ -5959,11 +6237,6 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chpasswd.8.xml:5(refentrytitle) chpasswd.8.xml:10(refname)
-#: chpasswd.8.xml:16(command)
-msgid "chpasswd"
-msgstr "chpasswd"
-
 # type: Plain text
 #: chpasswd.8.xml:11(refpurpose)
 msgid "update passwords in batch mode"
@@ -5992,17 +6265,27 @@
 
 # type: Plain text
 #: chpasswd.8.xml:34(para)
+#, fuzzy
 msgid ""
-"By default the supplied password must be in clear-text. Default encryption "
-"algorithm is DES. Also the password age will be updated, if present."
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chpasswd</command>. Also the password age will be updated, if "
+"present."
 msgstr ""
 "Come impostazione predefinita, si devono fornire password in chiaro. "
 "L'algoritmo di cifratura predefinito è DES. Se sono presenti, vengono "
 "aggiornate anche le informazioni sulla durata delle password."
 
-# type: Plain text
 #: chpasswd.8.xml:39(para) chgpasswd.8.xml:38(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."
+msgstr ""
+
+# type: Plain text
+#: chpasswd.8.xml:45(para) chgpasswd.8.xml:44(para)
+msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
 msgstr ""
@@ -6010,59 +6293,120 @@
 "necessità di creare molti account nello stesso momento."
 
 # type: Plain text
-#: chpasswd.8.xml:47(para)
+#: chpasswd.8.xml:53(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:53(term) chgpasswd.8.xml:52(term)
+#: chpasswd.8.xml:59(term) chgpasswd.8.xml:58(term)
+#, fuzzy
+msgid "<option>-c</option>, <option>--crypt-method</option>"
+msgstr "<option>-e</option>, <option>--encrypted</option>"
+
+#: chpasswd.8.xml:61(para) chgpasswd.8.xml:60(para)
+msgid "Use the specified method to encrypt the passwords."
+msgstr ""
+
+#: chpasswd.8.xml:62(para) chgpasswd.8.xml:61(para)
+msgid ""
+"The available methods are DES, MD5, and SHA256 or SHA512 if compiled with "
+"the ENCRYPTMETHOD_SELECT flag."
+msgstr ""
+
+# type: IP
+#: chpasswd.8.xml:69(term) chgpasswd.8.xml:68(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
 # type: Plain text
-#: chpasswd.8.xml:55(para) chgpasswd.8.xml:54(para)
+#: chpasswd.8.xml:71(para) chgpasswd.8.xml:70(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Le password fornite sono in forma cifrata."
 
 # type: IP
-#: chpasswd.8.xml:65(term) chgpasswd.8.xml:64(term)
+#: chpasswd.8.xml:81(term) chgpasswd.8.xml:80(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
 # type: Plain text
-#: chpasswd.8.xml:67(para) chgpasswd.8.xml:66(para)
+#: chpasswd.8.xml:83(para) chgpasswd.8.xml:82(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
 msgstr ""
 "Usa la cifratura MD5 anziché DES quando le password fornite non sono cifrate."
 
-#: chpasswd.8.xml:78(para) chgpasswd.8.xml:77(para)
+# type: IP
+#: chpasswd.8.xml:90(term) chgpasswd.8.xml:89(term)
+#, fuzzy
+msgid "<option>-s</option>, <option>--sha-rounds</option>"
+msgstr "<option>-s</option>, <option>--shadow</option>"
+
+#: chpasswd.8.xml:92(para) chgpasswd.8.xml:91(para)
+msgid "Use the specified number of rounds to encrypt the passwords."
+msgstr ""
+
+#: chpasswd.8.xml:95(para) chgpasswd.8.xml:94(para)
 msgid ""
+"The value 0 means that the system will choose the default number of rounds "
+"for the crypt method (5000)."
+msgstr ""
+
+#: chpasswd.8.xml:99(para) chgpasswd.8.xml:98(para)
+msgid ""
+"A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
+msgstr ""
+
+#: chpasswd.8.xml:103(para) chgpasswd.8.xml:102(para)
+msgid "You can only use this option with the SHA256 or SHA512 crypt method."
+msgstr ""
+
+#: chpasswd.8.xml:107(para) chgpasswd.8.xml:106(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 ""
+
+#: chpasswd.8.xml:119(para) chgpasswd.8.xml:118(para)
+msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
 msgstr ""
 
+#: chpasswd.8.xml:132(title)
+msgid "CONFIGURATION"
+msgstr ""
+
+#: chpasswd.8.xml:133(para)
+msgid ""
+"The following configuration variables in <filename>/etc/login.defs</"
+"filename> change the behavior of this tool:"
+msgstr ""
+
+#: chpasswd.8.xml:159(para)
+msgid ""
+"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"or by any command line option."
+msgstr ""
+
 # type: Plain text
-#: chpasswd.8.xml:86(para)
+#: chpasswd.8.xml:273(para)
+#, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>newusers</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<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>."
 
-#: chgpasswd.8.xml:5(refentrytitle) chgpasswd.8.xml:10(refname)
-#: chgpasswd.8.xml:16(command)
-msgid "chgpasswd"
-msgstr "chgpasswd"
-
 # type: Plain text
 #: chgpasswd.8.xml:11(refpurpose)
 msgid "update group passwords in batch mode"
@@ -6089,29 +6433,35 @@
 
 # type: Plain text
 #: chgpasswd.8.xml:34(para)
+#, fuzzy
 msgid ""
-"By default the supplied password must be in clear-text. Default encryption "
-"algorithm is DES."
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chgpasswd</command>."
 msgstr ""
 "Come impostazione predefinita, si devono fornire password in chiaro. "
 "L'algoritmo di cifratura predefinito è DES."
 
 # type: Plain text
-#: chgpasswd.8.xml:46(para)
+#: chgpasswd.8.xml:52(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:85(para)
+#: chgpasswd.8.xml:150(para)
+#, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
 
 # type: Plain text
 #: chfn.1.xml:11(refpurpose)
@@ -6453,6 +6803,55 @@
 
 # type: Plain text
 #~ msgid ""
+#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+
+#~ msgid "administer the <placeholder-1/> file"
+#~ msgstr "amministra il file <placeholder-1/>"
+
+# type: Plain text
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+
+# type: Plain text
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+# type: Plain text
+#~ msgid ""
 #~ "The group name or number of the user's initial login group. The group "
 #~ "name must exist. A group number must refer to an already existing group."
 #~ msgstr ""
@@ -6624,10 +7023,6 @@
 #~ msgstr "Creare Nuovi Utenti"
 
 # type: IP
-#~ msgid "<option>-c </option>I<comment>"
-#~ msgstr "<option>-c </option>I<commento>"
-
-# type: IP
 #~ msgid "<option>-d </option>I<home_dir>"
 #~ msgstr "<option>-d </option>I<home_dir>"
 
@@ -7009,18 +7404,10 @@
 #~ msgstr "<option>-E</option> I<data_scadenza>"
 
 # type: IP
-#~ msgid "<option>-I</option> I<inactive>"
-#~ msgstr "<option>-I</option> I<inattività>"
-
-# type: IP
 #~ msgid "<option>-m</option> I<mindays>"
 #~ msgstr "<option>-m</option> I<gg_min>"
 
 # type: IP
-#~ msgid "<option>-M</option> I<maxdays>"
-#~ msgstr "<option>-M</option> I<gg_max>"
-
-# type: IP
 #~ msgid "<option>-W</option> I<warndays>"
 #~ msgstr "<option>-W</option> I<gg_avviso>"
 

Modified: upstream/trunk/man/po/pl.po
===================================================================
--- upstream/trunk/man/po/pl.po	2007-11-25 21:06:49 UTC (rev 1464)
+++ upstream/trunk/man/po/pl.po	2007-11-25 21:28:26 UTC (rev 1465)
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: man pages for shadow 4.0.16\n"
-"POT-Creation-Date: 2007-11-10 23:24+0100\n"
+"POT-Creation-Date: 2007-11-25 20:28+0100\n"
 "PO-Revision-Date: 2006-05-20 02:21+0200\n"
 "Last-Translator: Tomasz Kłoczko <kloczek at pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -70,7 +70,7 @@
 #: login.access.5.xml:15(title) login.1.xml:36(title) limits.5.xml:16(title)
 #: lastlog.8.xml:24(title) gshadow.5.xml:15(title) grpck.8.xml:25(title)
 #: groups.1.xml:24(title) groupmod.8.xml:25(title) groupmems.8.xml:27(title)
-#: groupdel.8.xml:24(title) groupadd.8.xml:30(title) gpasswd.1.xml:27(title)
+#: groupdel.8.xml:24(title) groupadd.8.xml:30(title) gpasswd.1.xml:32(title)
 #: faillog.8.xml:24(title) faillog.5.xml:15(title) expiry.1.xml:23(title)
 #: chsh.1.xml:27(title) chpasswd.8.xml:24(title) chgpasswd.8.xml:24(title)
 #: chfn.1.xml:27(title) chage.1.xml:26(title)
@@ -106,8 +106,8 @@
 #: useradd.8.xml:48(title) su.1.xml:74(title) pwck.8.xml:96(title)
 #: passwd.1.xml:140(title) login.1.xml:119(title) lastlog.8.xml:36(title)
 #: grpck.8.xml:69(title) groupmod.8.xml:34(title) groupmems.8.xml:42(title)
-#: groupadd.8.xml:39(title) gpasswd.1.xml:58(title) faillog.8.xml:35(title)
-#: chsh.1.xml:38(title) chpasswd.8.xml:46(title) chgpasswd.8.xml:45(title)
+#: groupadd.8.xml:39(title) gpasswd.1.xml:72(title) faillog.8.xml:35(title)
+#: chsh.1.xml:38(title) chpasswd.8.xml:52(title) chgpasswd.8.xml:51(title)
 #: chage.1.xml:36(title)
 msgid "OPTIONS"
 msgstr "OPCJE"
@@ -129,17 +129,17 @@
 msgid "Edit group database."
 msgstr "Edycja bazy grup."
 
-#: vipw.8.xml:64(term) userdel.8.xml:63(term) useradd.8.xml:164(term)
+#: vipw.8.xml:64(term) userdel.8.xml:63(term) useradd.8.xml:165(term)
 #: passwd.1.xml:180(term) lastlog.8.xml:52(term) groupmod.8.xml:60(term)
 #: groupadd.8.xml:74(term) faillog.8.xml:48(term) chsh.1.xml:44(term)
-#: chpasswd.8.xml:59(term) chgpasswd.8.xml:58(term) chage.1.xml:74(term)
+#: chpasswd.8.xml:75(term) chgpasswd.8.xml:74(term) chage.1.xml:74(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
-#: vipw.8.xml:66(para) userdel.8.xml:65(para) useradd.8.xml:166(para)
+#: vipw.8.xml:66(para) userdel.8.xml:65(para) useradd.8.xml:167(para)
 #: passwd.1.xml:182(para) lastlog.8.xml:56(para) groupmod.8.xml:62(para)
 #: groupadd.8.xml:76(para) faillog.8.xml:50(para) chsh.1.xml:46(para)
-#: chpasswd.8.xml:61(para) chgpasswd.8.xml:60(para) chage.1.xml:76(para)
+#: chpasswd.8.xml:77(para) chgpasswd.8.xml:76(para) chage.1.xml:76(para)
 msgid "Display help message and exit."
 msgstr "Wyświetlenie komunikatu pomocy i zakończenie działania."
 
@@ -151,11 +151,11 @@
 msgid "Edit passwd database."
 msgstr "Edycja bazy passwd."
 
-#: vipw.8.xml:76(term) passwd.1.xml:234(term)
+#: vipw.8.xml:76(term) passwd.1.xml:235(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:78(para) passwd.1.xml:238(para)
+#: vipw.8.xml:78(para) passwd.1.xml:239(para)
 msgid "Quiet mode."
 msgstr "Cichy tryb pracy."
 
@@ -167,105 +167,114 @@
 msgid "Edit shadow or gshadow database."
 msgstr "Edycja bazy shadow lub gshadow."
 
-#: vipw.8.xml:91(title) usermod.8.xml:246(title) userdel.8.xml:89(title)
-#: useradd.8.xml:370(title) suauth.5.xml:139(title) su.1.xml:176(title)
+#: vipw.8.xml:91(title) usermod.8.xml:260(title) userdel.8.xml:89(title)
+#: useradd.8.xml:371(title) suauth.5.xml:139(title) su.1.xml:176(title)
 #: sg.1.xml:43(title) shadow.5.xml:105(title) shadow.3.xml:172(title)
 #: pwconv.8.xml:109(title) pwck.8.xml:145(title) porttime.5.xml:76(title)
-#: passwd.5.xml:87(title) passwd.1.xml:322(title) newusers.8.xml:90(title)
+#: passwd.5.xml:87(title) passwd.1.xml:324(title) newusers.8.xml:96(title)
 #: newgrp.1.xml:54(title) logoutd.8.xml:35(title) login.access.5.xml:66(title)
 #: login.1.xml:198(title) limits.5.xml:110(title) lastlog.8.xml:113(title)
 #: gshadow.5.xml:61(title) grpck.8.xml:87(title) groups.1.xml:46(title)
 #: groupmod.8.xml:92(title) groupmems.8.xml:103(title)
-#: groupdel.8.xml:43(title) groupadd.8.xml:114(title) gpasswd.1.xml:147(title)
+#: groupdel.8.xml:43(title) groupadd.8.xml:114(title) gpasswd.1.xml:178(title)
 #: faillog.8.xml:132(title) faillog.5.xml:38(title) expiry.1.xml:32(title)
-#: chsh.1.xml:85(title) chfn.1.xml:60(title) chage.1.xml:177(title)
+#: chsh.1.xml:85(title) chpasswd.8.xml:248(title) chgpasswd.8.xml:125(title)
+#: chfn.1.xml:60(title) chage.1.xml:177(title)
 msgid "FILES"
 msgstr "PLIKI"
 
-#: vipw.8.xml:94(filename) usermod.8.xml:249(filename)
-#: userdel.8.xml:92(filename) useradd.8.xml:385(filename)
-#: sg.1.xml:58(filename) pwck.8.xml:148(filename) newgrp.1.xml:69(filename)
-#: gshadow.5.xml:64(filename) grpck.8.xml:90(filename)
-#: groups.1.xml:49(filename) groupmod.8.xml:95(filename)
-#: groupmems.8.xml:106(filename) groupdel.8.xml:46(filename)
-#: groupadd.8.xml:117(filename) gpasswd.1.xml:11(filename)
-#: gpasswd.1.xml:150(filename)
+#: vipw.8.xml:94(filename) usermod.8.xml:263(filename)
+#: userdel.8.xml:92(filename) useradd.8.xml:386(filename)
+#: sg.1.xml:58(filename) pwck.8.xml:148(filename) newusers.8.xml:111(filename)
+#: newgrp.1.xml:69(filename) gshadow.5.xml:64(filename)
+#: grpck.8.xml:90(filename) groups.1.xml:49(filename)
+#: groupmod.8.xml:95(filename) groupmems.8.xml:106(filename)
+#: groupdel.8.xml:46(filename) groupadd.8.xml:117(filename)
+#: gpasswd.1.xml:12(filename) gpasswd.1.xml:181(filename)
+#: chgpasswd.8.xml:128(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
-#: vipw.8.xml:96(para) usermod.8.xml:251(para) userdel.8.xml:94(para)
-#: useradd.8.xml:387(para) sg.1.xml:60(para) pwck.8.xml:150(para)
-#: newgrp.1.xml:71(para) gshadow.5.xml:66(para) grpck.8.xml:92(para)
-#: groups.1.xml:51(para) groupmod.8.xml:97(para) groupmems.8.xml:108(para)
-#: groupdel.8.xml:48(para) groupadd.8.xml:119(para) gpasswd.1.xml:152(para)
+#: vipw.8.xml:96(para) usermod.8.xml:265(para) userdel.8.xml:94(para)
+#: useradd.8.xml:388(para) sg.1.xml:60(para) pwck.8.xml:150(para)
+#: newusers.8.xml:113(para) newgrp.1.xml:71(para) gshadow.5.xml:66(para)
+#: grpck.8.xml:92(para) groups.1.xml:51(para) groupmod.8.xml:97(para)
+#: groupmems.8.xml:108(para) groupdel.8.xml:48(para) groupadd.8.xml:119(para)
+#: gpasswd.1.xml:183(para) chgpasswd.8.xml:130(para)
 msgid "Group account information."
 msgstr "Informacje o grupach użytkowników."
 
-#: vipw.8.xml:100(filename) sg.1.xml:64(filename) newgrp.1.xml:75(filename)
-#: gshadow.5.xml:70(filename) grpck.8.xml:96(filename)
-#: groupmod.8.xml:101(filename) groupmems.8.xml:112(filename)
-#: groupdel.8.xml:52(filename) groupadd.8.xml:123(filename)
-#: gpasswd.1.xml:156(filename)
+#: vipw.8.xml:100(filename) sg.1.xml:64(filename) newusers.8.xml:117(filename)
+#: newgrp.1.xml:75(filename) gshadow.5.xml:70(filename)
+#: grpck.8.xml:96(filename) groupmod.8.xml:101(filename)
+#: groupmems.8.xml:112(filename) groupdel.8.xml:52(filename)
+#: groupadd.8.xml:123(filename) gpasswd.1.xml:13(filename)
+#: gpasswd.1.xml:187(filename) chgpasswd.8.xml:134(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
-#: vipw.8.xml:102(para) sg.1.xml:66(para) newgrp.1.xml:77(para)
-#: gshadow.5.xml:72(para) grpck.8.xml:98(para) groupmod.8.xml:103(para)
-#: groupdel.8.xml:54(para) groupadd.8.xml:125(para) gpasswd.1.xml:158(para)
+#: vipw.8.xml:102(para) sg.1.xml:66(para) newusers.8.xml:119(para)
+#: newgrp.1.xml:77(para) gshadow.5.xml:72(para) grpck.8.xml:98(para)
+#: groupmod.8.xml:103(para) groupdel.8.xml:54(para) groupadd.8.xml:125(para)
+#: gpasswd.1.xml:189(para) chgpasswd.8.xml:136(para)
 msgid "Secure group account information."
 msgstr "Informacje chronione o grupach użytkowników."
 
-#: vipw.8.xml:106(filename) usermod.8.xml:255(filename)
-#: userdel.8.xml:104(filename) useradd.8.xml:373(filename)
+#: vipw.8.xml:106(filename) usermod.8.xml:269(filename)
+#: userdel.8.xml:104(filename) useradd.8.xml:374(filename)
 #: su.1.xml:179(filename) sg.1.xml:46(filename) shadow.5.xml:108(filename)
 #: pwck.8.xml:154(filename) passwd.5.xml:90(filename)
-#: passwd.1.xml:325(filename) newgrp.1.xml:57(filename)
-#: login.1.xml:213(filename) grpck.8.xml:102(filename)
-#: expiry.1.xml:35(filename) chsh.1.xml:88(filename) chfn.1.xml:69(filename)
+#: passwd.1.xml:327(filename) newusers.8.xml:99(filename)
+#: newgrp.1.xml:57(filename) login.1.xml:213(filename)
+#: grpck.8.xml:102(filename) expiry.1.xml:35(filename) chsh.1.xml:88(filename)
+#: chpasswd.8.xml:251(filename) chfn.1.xml:69(filename)
 #: chage.1.xml:181(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
-#: vipw.8.xml:108(para) usermod.8.xml:257(para) userdel.8.xml:106(para)
-#: useradd.8.xml:375(para) su.1.xml:181(para) sg.1.xml:48(para)
+#: vipw.8.xml:108(para) usermod.8.xml:271(para) userdel.8.xml:106(para)
+#: useradd.8.xml:376(para) su.1.xml:181(para) sg.1.xml:48(para)
 #: shadow.5.xml:110(para) pwck.8.xml:156(para) passwd.5.xml:92(para)
-#: passwd.1.xml:327(para) newgrp.1.xml:59(para) login.1.xml:215(para)
-#: grpck.8.xml:104(para) expiry.1.xml:37(para) chsh.1.xml:90(para)
-#: chfn.1.xml:71(para) chage.1.xml:184(para)
+#: passwd.1.xml:329(para) newusers.8.xml:101(para) newgrp.1.xml:59(para)
+#: login.1.xml:215(para) grpck.8.xml:104(para) expiry.1.xml:37(para)
+#: chsh.1.xml:90(para) chpasswd.8.xml:253(para) chfn.1.xml:71(para)
+#: chage.1.xml:184(para)
 msgid "User account information."
 msgstr "Informacja o kontach użytkowników."
 
-#: vipw.8.xml:112(filename) usermod.8.xml:261(filename)
-#: userdel.8.xml:110(filename) useradd.8.xml:379(filename)
+#: vipw.8.xml:112(filename) usermod.8.xml:275(filename)
+#: userdel.8.xml:110(filename) useradd.8.xml:380(filename)
 #: su.1.xml:185(filename) sg.1.xml:52(filename) shadow.5.xml:114(filename)
 #: shadow.3.xml:175(filename) pwck.8.xml:160(filename)
-#: passwd.5.xml:96(filename) passwd.1.xml:331(filename)
-#: newgrp.1.xml:63(filename) login.1.xml:219(filename)
-#: expiry.1.xml:41(filename) chage.1.xml:189(filename)
+#: passwd.5.xml:96(filename) passwd.1.xml:333(filename)
+#: newusers.8.xml:105(filename) newgrp.1.xml:63(filename)
+#: login.1.xml:219(filename) expiry.1.xml:41(filename)
+#: chpasswd.8.xml:257(filename) chage.1.xml:189(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
-#: vipw.8.xml:114(para) usermod.8.xml:263(para) userdel.8.xml:112(para)
-#: useradd.8.xml:381(para) su.1.xml:187(para) sg.1.xml:54(para)
+#: vipw.8.xml:114(para) usermod.8.xml:277(para) userdel.8.xml:112(para)
+#: useradd.8.xml:382(para) su.1.xml:187(para) sg.1.xml:54(para)
 #: shadow.5.xml:116(para) shadow.3.xml:177(para) pwck.8.xml:162(para)
-#: passwd.1.xml:333(para) newgrp.1.xml:65(para) login.1.xml:221(para)
-#: expiry.1.xml:43(para) chage.1.xml:192(para)
+#: passwd.1.xml:335(para) newusers.8.xml:107(para) newgrp.1.xml:65(para)
+#: login.1.xml:221(para) expiry.1.xml:43(para) chpasswd.8.xml:259(para)
+#: chage.1.xml:192(para)
 msgid "Secure user account information."
 msgstr "Informacje chronione o użytkownikach."
 
-#: vipw.8.xml:120(title) usermod.8.xml:270(title) userdel.8.xml:191(title)
-#: useradd.8.xml:481(title) suauth.5.xml:168(title) su.1.xml:194(title)
+#: vipw.8.xml:120(title) usermod.8.xml:284(title) userdel.8.xml:191(title)
+#: useradd.8.xml:482(title) suauth.5.xml:168(title) su.1.xml:194(title)
 #: sg.1.xml:73(title) shadow.5.xml:123(title) shadow.3.xml:184(title)
 #: pwconv.8.xml:121(title) pwck.8.xml:169(title) porttime.5.xml:88(title)
-#: passwd.5.xml:105(title) passwd.1.xml:391(title) nologin.8.xml:35(title)
-#: newusers.8.xml:102(title) newgrp.1.xml:84(title)
-#: login.defs.5.xml:256(title) login.access.5.xml:78(title)
+#: passwd.5.xml:105(title) passwd.1.xml:393(title) nologin.8.xml:35(title)
+#: newusers.8.xml:132(title) newgrp.1.xml:84(title)
+#: login.defs.5.xml:412(title) login.access.5.xml:78(title)
 #: login.1.xml:252(title) limits.5.xml:120(title) gshadow.5.xml:79(title)
 #: grpck.8.xml:111(title) groups.1.xml:58(title) groupmod.8.xml:161(title)
 #: groupmems.8.xml:121(title) groupdel.8.xml:100(title)
-#: groupadd.8.xml:197(title) gpasswd.1.xml:165(title) faillog.8.xml:144(title)
+#: groupadd.8.xml:204(title) gpasswd.1.xml:196(title) faillog.8.xml:144(title)
 #: faillog.5.xml:50(title) expiry.1.xml:50(title) chsh.1.xml:109(title)
-#: chpasswd.8.xml:85(title) chgpasswd.8.xml:84(title) chfn.1.xml:78(title)
+#: chpasswd.8.xml:272(title) chgpasswd.8.xml:149(title) chfn.1.xml:78(title)
 #: chage.1.xml:232(title)
 msgid "SEE ALSO"
 msgstr "ZOBACZ TAKŻE"
@@ -291,7 +300,7 @@
 "citerefentry>."
 
 #: usermod.8.xml:5(refentrytitle) usermod.8.xml:10(refname)
-#: usermod.8.xml:16(command) login.defs.5.xml:229(term)
+#: usermod.8.xml:16(command) login.defs.5.xml:385(term)
 msgid "usermod"
 msgstr "usermod"
 
@@ -348,7 +357,7 @@
 "jest zmieniana przy pomocy polecenia <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: usermod.8.xml:65(term) useradd.8.xml:91(term)
+#: usermod.8.xml:65(term) useradd.8.xml:92(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -366,7 +375,7 @@
 "zawartość aktualnego katalogu domowego zostanie przesunięta do nowego "
 "katalogu. Nowy katalog domowy jest tworzony jeśli nie istnieje."
 
-#: usermod.8.xml:79(term) useradd.8.xml:108(term) useradd.8.xml:293(term)
+#: usermod.8.xml:79(term) useradd.8.xml:109(term) useradd.8.xml:294(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -374,7 +383,7 @@
 "<option>-e</option>, <option>--expiredate</option><replaceable>DATA_WAŻN</"
 "replaceable>"
 
-#: usermod.8.xml:84(para) useradd.8.xml:113(para)
+#: usermod.8.xml:84(para) useradd.8.xml:114(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>."
@@ -382,7 +391,7 @@
 "Data, od której konto danego użytkownika zostanie wyłączone. Data podawana "
 "jest w formacie <emphasis remap=\"I\">MM/DD/RR</emphasis>."
 
-#: usermod.8.xml:91(term) useradd.8.xml:120(term) useradd.8.xml:302(term)
+#: usermod.8.xml:91(term) useradd.8.xml:121(term) useradd.8.xml:303(term)
 msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -390,7 +399,7 @@
 "<option>-f</option>, <option>--inactive</option><replaceable>NIEAKTYWNE</"
 "replaceable>"
 
-#: usermod.8.xml:96(para) useradd.8.xml:125(para)
+#: usermod.8.xml:96(para) useradd.8.xml:126(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 "
@@ -400,7 +409,7 @@
 "wyłącza konto natychmiast po przeterminowaniu hasła, zaś wartość -1 wyłącza "
 "tę cechę. Domyślną wartością jest -1."
 
-#: usermod.8.xml:105(term) useradd.8.xml:134(term) useradd.8.xml:314(term)
+#: usermod.8.xml:105(term) useradd.8.xml:135(term) useradd.8.xml:315(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
@@ -416,7 +425,7 @@
 "istnieć. Numer grupy musi odnosić się do już istniejącej grupy. Domyślnym "
 "numerem grupy jest 1."
 
-#: usermod.8.xml:118(term) useradd.8.xml:148(term)
+#: usermod.8.xml:118(term) useradd.8.xml:149(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -479,17 +488,24 @@
 "zakodowanego hasła. Opcji tej nie można używać z opcjami <option>-p</option> "
 "or <option>-U</option>."
 
-#: usermod.8.xml:164(term) useradd.8.xml:217(term) groupmod.8.xml:78(term)
+#: usermod.8.xml:161(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:170(term) useradd.8.xml:218(term) groupmod.8.xml:78(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
-#: usermod.8.xml:168(para)
+#: usermod.8.xml:174(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:175(term) useradd.8.xml:225(term)
+#: usermod.8.xml:181(term) useradd.8.xml:226(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -497,20 +513,20 @@
 "<option>-p</option>, <option>--password</option><replaceable>HASŁO</"
 "replaceable>"
 
-#: usermod.8.xml:180(para)
+#: usermod.8.xml:186(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
 msgstr ""
 
-#: usermod.8.xml:188(term) useradd.8.xml:238(term) useradd.8.xml:327(term)
+#: usermod.8.xml:194(term) useradd.8.xml:239(term) useradd.8.xml:328(term)
 #: su.1.xml:108(term) chsh.1.xml:50(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 
-#: usermod.8.xml:193(para) chsh.1.xml:54(para)
+#: usermod.8.xml:199(para) chsh.1.xml:54(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."
@@ -518,13 +534,13 @@
 "Nazwa nowej powłoki (shell) użytkownika. Ustawienie tego pola na puste "
 "powoduje, że system wybierze domyślną powłokę logowania."
 
-#: usermod.8.xml:200(term) useradd.8.xml:251(term)
+#: usermod.8.xml:206(term) useradd.8.xml:252(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: usermod.8.xml:205(para)
+#: usermod.8.xml:211(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. Values "
@@ -534,11 +550,11 @@
 "Files outside of the user's home directory must be altered manually."
 msgstr ""
 
-#: usermod.8.xml:218(term)
+#: usermod.8.xml:224(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:222(para)
+#: usermod.8.xml:228(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</"
@@ -548,15 +564,24 @@
 "zakodowanego hasła. Opcji tej nie można używać z opcjami <option>-p</option> "
 "lub <option>-L</option>."
 
-#: usermod.8.xml:233(title) userdel.8.xml:170(title) useradd.8.xml:350(title)
-#: su.1.xml:168(title) shadow.3.xml:164(title) passwd.1.xml:311(title)
+#: usermod.8.xml:233(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 <replaceable>EXPIRE</"
+"replaceable> value from <filename>/etc/default/useradd</filename>)."
+msgstr ""
+
+#: usermod.8.xml:247(title) userdel.8.xml:170(title) useradd.8.xml:351(title)
+#: su.1.xml:168(title) shadow.3.xml:164(title) passwd.1.xml:313(title)
 #: newusers.8.xml:82(title) login.1.xml:164(title) lastlog.8.xml:125(title)
-#: groupdel.8.xml:36(title) groupadd.8.xml:138(title) faillog.8.xml:121(title)
-#: chpasswd.8.xml:77(title) chgpasswd.8.xml:76(title)
+#: groupdel.8.xml:36(title) groupadd.8.xml:138(title) gpasswd.1.xml:166(title)
+#: faillog.8.xml:121(title) chpasswd.8.xml:118(title)
+#: chgpasswd.8.xml:117(title)
 msgid "CAVEATS"
 msgstr "OSTRZEŻENIA"
 
-#: usermod.8.xml:234(para)
+#: usermod.8.xml:248(para)
 msgid ""
 "<command>usermod</command> will not allow you to change the name of a user "
 "who is logged in. You must make certain that the named user is not executing "
@@ -574,7 +599,7 @@
 "<command>at</command> musisz zmienić ręcznie. Jakiekolwiek zmiany dotyczące "
 "NIS musisz wykonać na serwerze NIS."
 
-#: usermod.8.xml:271(para)
+#: usermod.8.xml:285(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -613,7 +638,7 @@
 "manvolnum></citerefentry>."
 
 #: userdel.8.xml:5(refentrytitle) userdel.8.xml:10(refname)
-#: userdel.8.xml:15(command) login.defs.5.xml:221(term)
+#: userdel.8.xml:15(command) login.defs.5.xml:377(term)
 msgid "userdel"
 msgstr "userdel"
 
@@ -674,42 +699,44 @@
 "the <filename>login.defs</filename> file."
 msgstr ""
 
-#: userdel.8.xml:98(filename) useradd.8.xml:403(filename)
-#: pwconv.8.xml:112(filename) newusers.8.xml:93(filename)
+#: userdel.8.xml:98(filename) useradd.8.xml:404(filename)
+#: pwconv.8.xml:112(filename) newusers.8.xml:123(filename)
 #: login.access.5.xml:69(filename) groupadd.8.xml:129(filename)
-#: chsh.1.xml:100(filename) chfn.1.xml:63(filename)
+#: chsh.1.xml:100(filename) chpasswd.8.xml:263(filename)
+#: chgpasswd.8.xml:140(filename) chfn.1.xml:63(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:100(para) useradd.8.xml:405(para) pwconv.8.xml:114(para)
-#: newusers.8.xml:95(para) login.access.5.xml:71(para)
-#: groupadd.8.xml:131(para) chsh.1.xml:102(para) chfn.1.xml:65(para)
+#: userdel.8.xml:100(para) useradd.8.xml:406(para) pwconv.8.xml:114(para)
+#: newusers.8.xml:125(para) login.access.5.xml:71(para)
+#: groupadd.8.xml:131(para) chsh.1.xml:102(para) chpasswd.8.xml:265(para)
+#: chgpasswd.8.xml:142(para) chfn.1.xml:65(para)
 msgid "Shadow password suite configuration."
 msgstr "Konfiguracja pakietu shadow."
 
-#: userdel.8.xml:119(title) useradd.8.xml:412(title) pwck.8.xml:186(title)
-#: passwd.1.xml:340(title) grpck.8.xml:129(title) groupmod.8.xml:110(title)
-#: groupdel.8.xml:61(title) groupadd.8.xml:152(title) chage.1.xml:199(title)
+#: userdel.8.xml:119(title) useradd.8.xml:413(title) pwck.8.xml:186(title)
+#: passwd.1.xml:342(title) grpck.8.xml:129(title) groupmod.8.xml:110(title)
+#: groupdel.8.xml:61(title) groupadd.8.xml:159(title) chage.1.xml:199(title)
 msgid "EXIT VALUES"
 msgstr "KOD ZAKOŃCZENIA"
 
-#: userdel.8.xml:124(replaceable) useradd.8.xml:417(replaceable)
-#: pwck.8.xml:191(replaceable) passwd.1.xml:345(replaceable)
+#: userdel.8.xml:124(replaceable) useradd.8.xml:418(replaceable)
+#: pwck.8.xml:191(replaceable) passwd.1.xml:347(replaceable)
 #: grpck.8.xml:134(replaceable) groupmod.8.xml:115(replaceable)
-#: groupdel.8.xml:66(replaceable) groupadd.8.xml:157(replaceable)
+#: groupdel.8.xml:66(replaceable) groupadd.8.xml:164(replaceable)
 #: chage.1.xml:204(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:126(para) useradd.8.xml:419(para) pwck.8.xml:193(para)
-#: passwd.1.xml:347(para) grpck.8.xml:136(para) groupmod.8.xml:117(para)
-#: groupdel.8.xml:68(para) groupadd.8.xml:159(para) chage.1.xml:206(para)
+#: userdel.8.xml:126(para) useradd.8.xml:420(para) pwck.8.xml:193(para)
+#: passwd.1.xml:349(para) grpck.8.xml:136(para) groupmod.8.xml:117(para)
+#: groupdel.8.xml:68(para) groupadd.8.xml:166(para) chage.1.xml:206(para)
 msgid "success"
 msgstr "poprawne zakończenie działania programu"
 
-#: userdel.8.xml:130(replaceable) useradd.8.xml:423(replaceable)
+#: userdel.8.xml:130(replaceable) useradd.8.xml:424(replaceable)
 #: su.1.xml:6(manvolnum) sg.1.xml:6(manvolnum) pwck.8.xml:197(replaceable)
-#: passwd.1.xml:6(manvolnum) passwd.1.xml:351(replaceable)
+#: passwd.1.xml:6(manvolnum) passwd.1.xml:353(replaceable)
 #: newgrp.1.xml:6(manvolnum) login.1.xml:6(manvolnum)
 #: grpck.8.xml:140(replaceable) groups.1.xml:6(manvolnum)
 #: gpasswd.1.xml:6(manvolnum) expiry.1.xml:6(manvolnum)
@@ -718,26 +745,26 @@
 msgid "1"
 msgstr "1"
 
-#: userdel.8.xml:132(para) useradd.8.xml:425(para)
+#: userdel.8.xml:132(para) useradd.8.xml:426(para)
 msgid "can't update password file"
 msgstr "nie można zaktualizować pliku z hasłami"
 
-#: userdel.8.xml:136(replaceable) useradd.8.xml:429(replaceable)
-#: pwck.8.xml:203(replaceable) passwd.1.xml:357(replaceable)
+#: userdel.8.xml:136(replaceable) useradd.8.xml:430(replaceable)
+#: pwck.8.xml:203(replaceable) passwd.1.xml:359(replaceable)
 #: grpck.8.xml:146(replaceable) groupmod.8.xml:121(replaceable)
-#: groupdel.8.xml:72(replaceable) groupadd.8.xml:163(replaceable)
+#: groupdel.8.xml:72(replaceable) groupadd.8.xml:170(replaceable)
 #: chage.1.xml:216(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:138(para) useradd.8.xml:431(para) pwck.8.xml:199(para)
+#: userdel.8.xml:138(para) useradd.8.xml:432(para) pwck.8.xml:199(para)
 #: grpck.8.xml:142(para) groupmod.8.xml:123(para) groupdel.8.xml:74(para)
-#: groupadd.8.xml:165(para) chage.1.xml:218(para)
+#: groupadd.8.xml:172(para) chage.1.xml:218(para)
 msgid "invalid command syntax"
 msgstr "niepoprawna składnia polecenia"
 
-#: userdel.8.xml:142(replaceable) useradd.8.xml:447(replaceable)
-#: passwd.1.xml:381(replaceable) groupmod.8.xml:139(replaceable)
+#: userdel.8.xml:142(replaceable) useradd.8.xml:448(replaceable)
+#: passwd.1.xml:383(replaceable) groupmod.8.xml:139(replaceable)
 #: groupdel.8.xml:78(replaceable)
 msgid "6"
 msgstr "6"
@@ -750,18 +777,18 @@
 msgid "user currently logged in"
 msgstr ""
 
-#: userdel.8.xml:154(replaceable) useradd.8.xml:459(replaceable)
+#: userdel.8.xml:154(replaceable) useradd.8.xml:460(replaceable)
 #: groupmod.8.xml:151(replaceable) groupdel.8.xml:90(replaceable)
-#: groupadd.8.xml:187(replaceable)
+#: groupadd.8.xml:194(replaceable)
 msgid "10"
 msgstr "10"
 
-#: userdel.8.xml:156(para) useradd.8.xml:461(para) groupmod.8.xml:153(para)
-#: groupdel.8.xml:92(para) groupadd.8.xml:189(para)
+#: userdel.8.xml:156(para) useradd.8.xml:462(para) groupmod.8.xml:153(para)
+#: groupdel.8.xml:92(para) groupadd.8.xml:196(para)
 msgid "can't update group file"
 msgstr "nie można zaktualizować pliku z grupami"
 
-#: userdel.8.xml:160(replaceable) useradd.8.xml:465(replaceable)
+#: userdel.8.xml:160(replaceable) useradd.8.xml:466(replaceable)
 msgid "12"
 msgstr "12"
 
@@ -837,7 +864,7 @@
 
 #: useradd.8.xml:5(refentrytitle) useradd.8.xml:10(refname)
 #: useradd.8.xml:15(command) useradd.8.xml:22(command)
-#: useradd.8.xml:26(command) login.defs.5.xml:210(term)
+#: useradd.8.xml:26(command) login.defs.5.xml:366(term)
 msgid "useradd"
 msgstr "useradd"
 
@@ -845,7 +872,7 @@
 msgid "create a new user or update default new user information"
 msgstr ""
 
-#: useradd.8.xml:23(arg) useradd.8.xml:27(arg) useradd.8.xml:82(option)
+#: useradd.8.xml:23(arg) useradd.8.xml:27(arg) useradd.8.xml:83(option)
 msgid "-D"
 msgstr "-D"
 
@@ -869,7 +896,7 @@
 "currently used as the field for the user's full name."
 msgstr ""
 
-#: useradd.8.xml:66(term) useradd.8.xml:278(term)
+#: useradd.8.xml:66(term) useradd.8.xml:279(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
@@ -879,17 +906,18 @@
 
 #: useradd.8.xml:71(para)
 msgid ""
-"The default base directory for the system if <option>-d</option> dir 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."
+"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:85(para)
+#: useradd.8.xml:86(para)
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr ""
 
-#: useradd.8.xml:96(para)
+#: useradd.8.xml:97(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 "
@@ -899,7 +927,7 @@
 "created if it is missing."
 msgstr ""
 
-#: useradd.8.xml:139(para)
+#: useradd.8.xml:140(para)
 msgid ""
 "The group name or number of the user's initial login group. The group name "
 "must exist. A group number must refer to an already existing group. The "
@@ -907,7 +935,7 @@
 "useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:153(para)
+#: useradd.8.xml:154(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. "
@@ -916,11 +944,11 @@
 "the initial group."
 msgstr ""
 
-#: useradd.8.xml:170(term)
+#: useradd.8.xml:171(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:174(para)
+#: useradd.8.xml:175(para)
 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 "
@@ -933,7 +961,7 @@
 "to not copy any files."
 msgstr ""
 
-#: useradd.8.xml:190(term)
+#: useradd.8.xml:191(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -941,7 +969,7 @@
 "<option>-K</option>, <option>--key</option><replaceable>KLUCZ</"
 "replaceable>=<replaceable>WARTOŚĆ</replaceable>"
 
-#: useradd.8.xml:195(para)
+#: useradd.8.xml:196(para)
 msgid ""
 "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS "
 "and others). <placeholder-1/> Example: <option>-K </"
@@ -954,31 +982,31 @@
 "replaceable>=<replaceable>499</replaceable>"
 msgstr ""
 
-#: useradd.8.xml:209(para)
+#: useradd.8.xml:210(para)
 msgid ""
 "Note: <option>-K </option><replaceable>UID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable> doesn't work yet."
 msgstr ""
 
-#: useradd.8.xml:221(para)
+#: useradd.8.xml:222(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr ""
 
-#: useradd.8.xml:230(para)
+#: useradd.8.xml:231(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
 "disable the account."
 msgstr ""
 
-#: useradd.8.xml:243(para)
+#: useradd.8.xml:244(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."
 msgstr ""
 
-#: useradd.8.xml:256(para)
+#: useradd.8.xml:257(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -987,11 +1015,11 @@
 "accounts."
 msgstr ""
 
-#: useradd.8.xml:268(title)
+#: useradd.8.xml:269(title)
 msgid "Changing the default values"
 msgstr ""
 
-#: useradd.8.xml:269(para)
+#: useradd.8.xml:270(para)
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
 "command> will display the current default values. When invoked with <option>-"
@@ -999,7 +1027,7 @@
 "default values for the specified options. Valid default-changing options are:"
 msgstr ""
 
-#: useradd.8.xml:283(para)
+#: useradd.8.xml:284(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 "
@@ -1007,121 +1035,121 @@
 "when creating a new account."
 msgstr ""
 
-#: useradd.8.xml:298(para)
+#: useradd.8.xml:299(para)
 msgid "The date on which the user account is disabled."
 msgstr ""
 
-#: useradd.8.xml:307(para)
+#: useradd.8.xml:308(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
 msgstr ""
 
-#: useradd.8.xml:319(para)
+#: useradd.8.xml:320(para)
 msgid ""
 "The group name or ID for a new user's initial group. The named group must "
 "exist, and a numerical group ID must have an existing entry."
 msgstr ""
 
-#: useradd.8.xml:332(para)
+#: useradd.8.xml:333(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
-#: useradd.8.xml:343(title)
+#: useradd.8.xml:344(title)
 msgid "NOTES"
 msgstr "UWAGI"
 
-#: useradd.8.xml:344(para)
+#: useradd.8.xml:345(para)
 msgid ""
 "The system administrator is responsible for placing the default user files "
 "in the <filename>/etc/skel/</filename> directory."
 msgstr ""
 
-#: useradd.8.xml:351(para)
+#: useradd.8.xml:352(para)
 msgid ""
-"You may not add a user to a NIS group. This must be performed on the NIS "
-"server."
+"You may not add a user to a NIS or LDAP group. This must be performed on the "
+"corresponding server."
 msgstr ""
 
-#: useradd.8.xml:356(para)
+#: useradd.8.xml:357(para)
 msgid ""
 "Similarly, if the username already exists in an external user database such "
-"as NIS, <command>useradd</command> will deny the user account creation "
-"request."
+"as NIS or LDAP, <command>useradd</command> will deny the user account "
+"creation request."
 msgstr ""
 
-#: useradd.8.xml:362(para)
+#: useradd.8.xml:363(para)
 msgid ""
 "Usernames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
 "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgstr ""
 
-#: useradd.8.xml:391(filename)
+#: useradd.8.xml:392(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
-#: useradd.8.xml:393(para)
+#: useradd.8.xml:394(para)
 msgid "Default values for account creation."
 msgstr ""
 
-#: useradd.8.xml:397(filename)
+#: useradd.8.xml:398(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
-#: useradd.8.xml:399(para)
+#: useradd.8.xml:400(para)
 msgid "Directory containing default files."
 msgstr ""
 
-#: useradd.8.xml:435(replaceable) shadow.3.xml:6(manvolnum)
-#: pwck.8.xml:209(replaceable) passwd.1.xml:363(replaceable)
+#: useradd.8.xml:436(replaceable) shadow.3.xml:6(manvolnum)
+#: pwck.8.xml:209(replaceable) passwd.1.xml:365(replaceable)
 #: grpck.8.xml:152(replaceable) groupmod.8.xml:127(replaceable)
-#: groupadd.8.xml:169(replaceable)
+#: groupadd.8.xml:176(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:437(para) passwd.1.xml:383(para) groupmod.8.xml:129(para)
-#: groupadd.8.xml:171(para)
+#: useradd.8.xml:438(para) passwd.1.xml:385(para) groupmod.8.xml:129(para)
+#: groupadd.8.xml:178(para)
 msgid "invalid argument to option"
 msgstr "nieprawidłowy argument opcji"
 
-#: useradd.8.xml:441(replaceable) pwck.8.xml:215(replaceable)
-#: passwd.1.xml:369(replaceable) grpck.8.xml:158(replaceable)
-#: groupmod.8.xml:133(replaceable) groupadd.8.xml:175(replaceable)
+#: useradd.8.xml:442(replaceable) pwck.8.xml:215(replaceable)
+#: passwd.1.xml:371(replaceable) grpck.8.xml:158(replaceable)
+#: groupmod.8.xml:133(replaceable) groupadd.8.xml:182(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:443(para)
+#: useradd.8.xml:444(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:449(para) groupmod.8.xml:135(para) groupmod.8.xml:141(para)
+#: useradd.8.xml:450(para) groupmod.8.xml:135(para) groupmod.8.xml:141(para)
 #: groupdel.8.xml:80(para)
 msgid "specified group doesn't exist"
 msgstr ""
 
-#: useradd.8.xml:453(replaceable) groupmod.8.xml:145(replaceable)
-#: groupadd.8.xml:181(replaceable)
+#: useradd.8.xml:454(replaceable) groupmod.8.xml:145(replaceable)
+#: groupadd.8.xml:188(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:455(para)
+#: useradd.8.xml:456(para)
 msgid "username already in use"
 msgstr ""
 
-#: useradd.8.xml:467(para)
+#: useradd.8.xml:468(para)
 msgid "can't create home directory"
 msgstr ""
 
-#: useradd.8.xml:471(replaceable)
+#: useradd.8.xml:472(replaceable)
 msgid "13"
 msgstr "13"
 
-#: useradd.8.xml:473(para)
+#: useradd.8.xml:474(para)
 msgid "can't create mail spool"
 msgstr ""
 
-#: useradd.8.xml:413(para)
+#: useradd.8.xml:414(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1129,7 +1157,7 @@
 "Polecenie <command>useradd</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: useradd.8.xml:482(para)
+#: useradd.8.xml:483(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1173,7 +1201,7 @@
 
 #: suauth.5.xml:6(manvolnum) shadow.5.xml:6(manvolnum)
 #: pwck.8.xml:221(replaceable) porttime.5.xml:6(manvolnum)
-#: passwd.5.xml:6(manvolnum) passwd.1.xml:375(replaceable)
+#: passwd.5.xml:6(manvolnum) passwd.1.xml:377(replaceable)
 #: login.defs.5.xml:6(manvolnum) login.access.5.xml:6(manvolnum)
 #: limits.5.xml:6(manvolnum) gshadow.5.xml:6(manvolnum)
 #: grpck.8.xml:164(replaceable) faillog.5.xml:6(manvolnum)
@@ -1320,7 +1348,7 @@
 "    "
 msgstr ""
 
-#: suauth.5.xml:149(title) pwconv.8.xml:98(title) login.defs.5.xml:239(title)
+#: suauth.5.xml:149(title) pwconv.8.xml:98(title) login.defs.5.xml:395(title)
 msgid "BUGS"
 msgstr "BŁĘDY"
 
@@ -1925,7 +1953,7 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 #: pwconv.8.xml:5(refentrytitle) pwconv.8.xml:10(refname)
-#: pwconv.8.xml:19(command) login.defs.5.xml:204(term)
+#: pwconv.8.xml:19(command) login.defs.5.xml:360(term)
 msgid "pwconv"
 msgstr "pwconv"
 
@@ -2059,7 +2087,7 @@
 msgstr "passwd"
 
 #: pwck.8.xml:31(arg) pwck.8.xml:114(option) login.1.xml:148(option)
-#: grpck.8.xml:16(arg) gpasswd.1.xml:93(option)
+#: grpck.8.xml:16(arg) gpasswd.1.xml:112(option)
 msgid "-r"
 msgstr "-r"
 
@@ -2586,10 +2614,11 @@
 #: passwd.1.xml:215(para)
 msgid ""
 "Lock the named account. This option disables an account by changing the "
-"password to a value which matches no possible encrypted value."
+"password to a value which matches no possible encrypted value, and by "
+"setting the account expiry field to 1."
 msgstr ""
 
-#: passwd.1.xml:222(term) chage.1.xml:109(term)
+#: passwd.1.xml:223(term) chage.1.xml:109(term)
 msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -2597,7 +2626,7 @@
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DNI</"
 "replaceable>"
 
-#: passwd.1.xml:226(para) chage.1.xml:113(para)
+#: passwd.1.xml:227(para) chage.1.xml:113(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -2607,7 +2636,7 @@
 "<replaceable>MIN_DAYS</replaceable>. Wartość zerowa oznacza, że użytkownik "
 "może je zmieniać w dowolnym czasie."
 
-#: passwd.1.xml:244(term)
+#: passwd.1.xml:245(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -2615,15 +2644,15 @@
 "<option>-r</option>, <option>--repository</option><replaceable>REPOZYTORIUM</"
 "replaceable>"
 
-#: passwd.1.xml:248(para)
+#: passwd.1.xml:249(para)
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr ""
 
-#: passwd.1.xml:254(term)
+#: passwd.1.xml:255(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
-#: passwd.1.xml:258(para)
+#: passwd.1.xml:259(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 "
@@ -2633,18 +2662,18 @@
 "inactivity period for the password. These ages are expressed in days."
 msgstr ""
 
-#: passwd.1.xml:271(term)
+#: passwd.1.xml:272(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
-#: passwd.1.xml:275(para)
+#: passwd.1.xml:276(para)
 msgid ""
 "Unlock the named account. This option re-enables an account by changing the "
 "password back to its previous value (to value before using <option>-l</"
-"option> option)."
+"option> option), and by resetting the account expiry field."
 msgstr ""
 
-#: passwd.1.xml:283(term)
+#: passwd.1.xml:285(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -2652,7 +2681,7 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>DNI_OSTRZ</"
 "replaceable>"
 
-#: passwd.1.xml:287(para)
+#: passwd.1.xml:289(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 "
@@ -2660,7 +2689,7 @@
 "about to expire."
 msgstr ""
 
-#: passwd.1.xml:296(term)
+#: passwd.1.xml:298(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -2668,13 +2697,13 @@
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DNI</"
 "replaceable>"
 
-#: passwd.1.xml:300(para)
+#: passwd.1.xml:302(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:312(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Not all options may be supported. Password complexity checking may vary from "
 "site to site. The user is urged to select a password as complex as he or she "
@@ -2682,27 +2711,27 @@
 "system if NIS is enabled and they are not logged into the NIS server."
 msgstr ""
 
-#: passwd.1.xml:353(para) chage.1.xml:212(para)
+#: passwd.1.xml:355(para) chage.1.xml:212(para)
 msgid "permission denied"
 msgstr "brak dostępu"
 
-#: passwd.1.xml:359(para)
+#: passwd.1.xml:361(para)
 msgid "invalid combination of options"
 msgstr "nieprawidłowa kombinacja opcji"
 
-#: passwd.1.xml:365(para)
+#: passwd.1.xml:367(para)
 msgid "unexpected failure, nothing done"
 msgstr ""
 
-#: passwd.1.xml:371(para)
+#: passwd.1.xml:373(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr ""
 
-#: passwd.1.xml:377(para)
+#: passwd.1.xml:379(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 
-#: passwd.1.xml:341(para)
+#: passwd.1.xml:343(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -2710,7 +2739,7 @@
 "Polecenie <command>passwd</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: passwd.1.xml:392(para)
+#: passwd.1.xml:394(para)
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -2762,7 +2791,7 @@
 msgstr ""
 
 #: newusers.8.xml:5(refentrytitle) newusers.8.xml:10(refname)
-#: newusers.8.xml:16(command) login.defs.5.xml:196(term)
+#: newusers.8.xml:16(command) login.defs.5.xml:352(term)
 msgid "newusers"
 msgstr "newusers"
 
@@ -2835,8 +2864,15 @@
 "The input file must be protected since it contains unencrypted passwords."
 msgstr ""
 
-#: newusers.8.xml:103(para)
+#: newusers.8.xml:87(para) chpasswd.8.xml:123(para)
 msgid ""
+"PAM is not used to update the passwords. Only <filename>/etc/passwd</"
+"filename> and <filename>/etc/shadow</filename> are updated, and the various "
+"checks or options provided by PAM modules are not used."
+msgstr ""
+
+#: newusers.8.xml:133(para)
+msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
@@ -2860,7 +2896,7 @@
 
 #: newgrp.1.xml:17(replaceable) grpck.8.xml:18(replaceable)
 #: groupdel.8.xml:18(replaceable) groupadd.8.xml:24(replaceable)
-#: gpasswd.1.xml:21(replaceable)
+#: gpasswd.1.xml:26(replaceable)
 msgid "group"
 msgstr "group"
 
@@ -2896,12 +2932,14 @@
 msgstr ""
 
 #: newgrp.1.xml:85(para)
+#, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"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>, <citerefentry><refentrytitle>gshadow</"
@@ -2910,12 +2948,13 @@
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<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>, <citerefentry><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
 #: logoutd.8.xml:5(refentrytitle) logoutd.8.xml:10(refname)
 #: logoutd.8.xml:16(command)
@@ -2974,192 +3013,373 @@
 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 \"yes\" or \"no\". An undefined boolean parameter or one "
-"with a value other than these will be given a \"no\" value. Numbers (both "
+"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 \"0\") or hexadecimal values (precede the value with \"0x\"). The "
-"maximum value of the regular and long numeric parameters is machine-"
-"dependent."
+"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:42(para)
+#: login.defs.5.xml:46(para)
 msgid "The following configuration items are provided:"
 msgstr ""
 
-#: login.defs.5.xml:46(term)
-msgid "CHFN_AUTH (boolean)"
+#: login.defs.5.xml:50(term)
+msgid "<option>CHFN_AUTH</option> (boolean)"
 msgstr ""
 
-#: login.defs.5.xml:48(para)
+#: login.defs.5.xml:52(para)
 msgid ""
-"If <emphasis remap=\"I\">yes</emphasis>, the <command>chfn</command> and "
+"If <replaceable>yes</replaceable>, the <command>chfn</command> and "
 "<command>chsh</command> programs will require authentication before making "
 "any changes, unless run by the superuser."
 msgstr ""
 
-#: login.defs.5.xml:57(term)
-msgid "CHFN_RESTRICT (string)"
+#: login.defs.5.xml:61(term)
+#, fuzzy
+msgid "<option>CHFN_RESTRICT</option> (string)"
 msgstr "CHFN_RESTRICT (łańcuch)"
 
-#: login.defs.5.xml:59(para)
+#: login.defs.5.xml:63(para)
 msgid ""
 "This parameter specifies which values in the <emphasis remap=\"I\">gecos</"
 "emphasis> field of the <filename>/etc/passwd</filename> file may be changed "
 "by regular users using the <command>chfn</command> program. It can be any "
-"combination of letters <emphasis remap=\"I\">f</emphasis> ,<emphasis remap="
-"\"I\">r</emphasis>, <emphasis remap=\"I\">w</emphasis>, <emphasis remap=\"I"
-"\">h</emphasis>, for Full name, Room number, Work phone, and Home phone, "
-"respectively. For backward compatibility, \"yes\" is equivalent to \"rwh\" "
-"and \"no\" is equivalent to \"frwh\". If not specified, only the superuser "
-"can make any changes. The most restrictive setting is better achieved by not "
-"installing <filename>chfn</filename> SUID."
+"combination of letters <replaceable>f</replaceable>, <replaceable>r</"
+"replaceable>, <replaceable>w</replaceable>, <replaceable>h</replaceable>, "
+"for Full name, Room number, Work phone, and Home phone, respectively. For "
+"backward compatibility, <replaceable>yes</replaceable> is equivalent to "
+"<replaceable>rwh</replaceable> and <replaceable>no</replaceable> is "
+"equivalent to <replaceable>frwh</replaceable>. If not specified, only the "
+"superuser can make any changes. The most restrictive setting is better "
+"achieved by not installing <command>chfn</command> SUID."
 msgstr ""
 
-#: login.defs.5.xml:76(term)
-msgid "GID_MAX (number)"
+#: login.defs.5.xml:83(term) chpasswd.8.xml:175(term)
+msgid "<option>ENCRYPT_METHOD</option> (string)"
+msgstr ""
+
+#: login.defs.5.xml:85(para) chpasswd.8.xml:177(para)
+msgid ""
+"This defines the system default encryption algorithm for encrypting "
+"passwords (if no algorithm are specified on the command line)."
+msgstr ""
+
+#: login.defs.5.xml:94(para) chpasswd.8.xml:186(para)
+msgid "<replaceable>DES</replaceable> (default)"
+msgstr ""
+
+#: login.defs.5.xml:97(replaceable) chpasswd.8.xml:189(replaceable)
+msgid "MD5"
+msgstr ""
+
+#: login.defs.5.xml:100(replaceable) chpasswd.8.xml:192(replaceable)
+msgid "SHA256"
+msgstr ""
+
+#: login.defs.5.xml:103(replaceable) chpasswd.8.xml:195(replaceable)
+msgid "SHA512"
+msgstr ""
+
+#: login.defs.5.xml:90(para) chpasswd.8.xml:182(para)
+msgid "It can take one of these values: <placeholder-1/>"
+msgstr ""
+
+#: login.defs.5.xml:107(para) chpasswd.8.xml:199(para)
+msgid ""
+"Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option> variable."
+msgstr ""
+
+#: login.defs.5.xml:111(para) login.defs.5.xml:192(para)
+#: chpasswd.8.xml:168(para) chpasswd.8.xml:203(para)
+msgid ""
+"Note: if you use PAM, it is recommended to set this variable consistently "
+"with the PAM modules configuration."
+msgstr ""
+
+#: login.defs.5.xml:118(term)
+#, fuzzy
+msgid "<option>GID_MAX</option> (number)"
 msgstr "GID_MAX (numer)"
 
-#: login.defs.5.xml:77(term)
-msgid "GID_MIN (number)"
+#: login.defs.5.xml:119(term)
+#, fuzzy
+msgid "<option>GID_MIN</option> (number)"
 msgstr "GID_MIN (numer)"
 
-#: login.defs.5.xml:79(para)
+#: login.defs.5.xml:121(para)
 msgid ""
 "Range of group IDs to choose from for the <command>useradd</command> and "
 "<command>groupadd</command> programs."
 msgstr ""
 
-#: login.defs.5.xml:87(term)
-msgid "MAIL_DIR (string)"
+#: login.defs.5.xml:129(term)
+#, fuzzy
+msgid "<option>MAIL_DIR</option> (string)"
 msgstr "MAIL_DIR (łańcuch)"
 
-#: login.defs.5.xml:89(para)
+#: login.defs.5.xml:131(para)
 msgid ""
 "The mail spool directory. This is needed to manipulate the mailbox when its "
 "corresponding user account is modified or deleted. If not specified, a "
 "compile-time default is used."
 msgstr ""
 
-#: login.defs.5.xml:97(term)
-msgid "PASS_MAX_DAYS (number)"
+#: login.defs.5.xml:139(term)
+msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:141(para)
+msgid ""
+"Maximum members per group entry. When the maximum is reached, a new group "
+"entry (line) is started in <filename>/etc/group</filename> (with the same "
+"name, same password, and same GID)."
+msgstr ""
+
+#: login.defs.5.xml:147(para)
+msgid ""
+"The default value is 0, meaning that there are no limits in the number of "
+"members in a group."
+msgstr ""
+
+#. Note: on HP, split groups have the same ID, but different
+#. 	             names.
+#: login.defs.5.xml:153(para)
+msgid ""
+"This feature (split group) permits to limit the length of lines in the group "
+"file. This is useful to make sure that lines for NIS groups are not larger "
+"than 1024 characters."
+msgstr ""
+
+#: login.defs.5.xml:158(para)
+msgid "If you need to enforce such limit, you can use 25."
+msgstr ""
+
+#: login.defs.5.xml:161(para)
+msgid ""
+"Note: split groups may not be supported by all tools (even in the Shadow "
+"toolsuite. You should not use this variable unless you really need it."
+msgstr ""
+
+#: login.defs.5.xml:169(term) chpasswd.8.xml:145(term)
+msgid "<option>MD5_CRYPT_ENAB</option> (boolean)"
+msgstr ""
+
+#: login.defs.5.xml:171(para) chpasswd.8.xml:147(para)
+msgid ""
+"Indicate if passwords must be encrypted using the MD5-based algorithm. If "
+"set to <replaceable>yes</replaceable>, new passwords will be encrypted using "
+"the MD5-based algorithm compatible with the one used by recent releases of "
+"FreeBSD. It supports passwords of unlimited length and longer salt strings. "
+"Set to <replaceable>no</replaceable> if you need to copy encrypted passwords "
+"to other systems which don't understand the new algorithm. Default is "
+"<replaceable>no</replaceable>."
+msgstr ""
+
+#: login.defs.5.xml:183(para)
+msgid ""
+"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"or by any command line option used to configure the encryption algorithm."
+msgstr ""
+
+#: login.defs.5.xml:188(para) chpasswd.8.xml:164(para)
+msgid ""
+"This variable is deprecated. You should use <option>ENCRYPT_METHOD</option>."
+msgstr ""
+
+#: login.defs.5.xml:199(term)
+#, fuzzy
+msgid "<option>PASS_MAX_DAYS</option> (number)"
 msgstr "PASS_MAX_DAYS (numer)"
 
-#: login.defs.5.xml:99(para)
+#: login.defs.5.xml:201(para)
 msgid ""
 "The maximum number of days a password may be used. If the password is older "
 "than this, a password change will be forced. If not specified, -1 will be "
 "assumed (which disables the restriction)."
 msgstr ""
 
-#: login.defs.5.xml:108(term)
-msgid "PASS_MIN_DAYS (number)"
+#: login.defs.5.xml:210(term)
+#, fuzzy
+msgid "<option>PASS_MIN_DAYS</option> (number)"
 msgstr "PASS_MIN_DAYS (numer)"
 
-#: login.defs.5.xml:110(para)
+#: login.defs.5.xml:212(para)
 msgid ""
 "The minimum number of days allowed between password changes. Any password "
 "changes attempted sooner than this will be rejected. If not specified, -1 "
 "will be assumed (which disables the restriction)."
 msgstr ""
 
-#: login.defs.5.xml:119(term)
-msgid "PASS_WARN_AGE (number)"
+#: login.defs.5.xml:221(term)
+#, fuzzy
+msgid "<option>PASS_WARN_AGE</option> (number)"
 msgstr "PASS_WARN_AGE (numer)"
 
-#: login.defs.5.xml:121(para)
+#: login.defs.5.xml:223(para)
 msgid ""
 "The number of days warning given before a password expires. A zero means "
 "warning is given only upon the day of expiration, a negative value means no "
 "warning is given. If not specified, no warning will be provided."
 msgstr ""
 
-#: login.defs.5.xml:131(para)
+#: login.defs.5.xml:233(para)
 msgid ""
-"PASS_MAX_DAYS, PASS_MIN_DAYS and PASS_WARN_AGE are only used at the time of "
-"account creation. Any changes to these settings won't affect existing "
-"accounts."
+"<option>PASS_MAX_DAYS</option>, <option>PASS_MIN_DAYS</option> and "
+"<option>PASS_WARN_AGE</option> are only used at the time of account "
+"creation. Any changes to these settings won't affect existing accounts."
 msgstr ""
 
-#: login.defs.5.xml:138(term)
-msgid "UID_MAX (number)"
+#: login.defs.5.xml:241(term) chpasswd.8.xml:210(term)
+msgid "<option>SHA_CRYPT_MIN_ROUNDS</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:242(term) chpasswd.8.xml:211(term)
+msgid "<option>SHA_CRYPT_MAX_ROUNDS</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:244(para) chpasswd.8.xml:213(para)
+msgid ""
+"When <option>ENCRYPT_METHOD</option> is set to <replaceable>SHA256</"
+"replaceable> or <replaceable>SHA512</replaceable>, this defines the number "
+"of SHA rounds used by the encryption algorithm by default (when the number "
+"of rounds is not specified on the command line)."
+msgstr ""
+
+#: login.defs.5.xml:251(para) chpasswd.8.xml:220(para)
+msgid ""
+"With a lot of rounds, it is more difficult to brute forcing the password. "
+"But note also that more CPU resources will be needed to authenticate users."
+msgstr ""
+
+#: login.defs.5.xml:256(para) chpasswd.8.xml:225(para)
+msgid ""
+"If not specified, the libc will choose the default number of rounds (5000)."
+msgstr ""
+
+#: login.defs.5.xml:260(para) chpasswd.8.xml:229(para)
+msgid "The values must be inside the 1000-999999999 range."
+msgstr ""
+
+#: login.defs.5.xml:263(para) chpasswd.8.xml:232(para)
+msgid ""
+"If only one of the <option>SHA_CRYPT_MIN_ROUNDS</option> or "
+"<option>SHA_CRYPT_MAX_ROUNDS</option> values is set, then this value will be "
+"used."
+msgstr ""
+
+#: login.defs.5.xml:268(para) chpasswd.8.xml:237(para)
+msgid ""
+"If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</"
+"option>, the highest value will be used."
+msgstr ""
+
+#: login.defs.5.xml:276(term)
+#, fuzzy
+msgid "<option>UID_MAX</option> (number)"
 msgstr "UID_MAX (numer)"
 
-#: login.defs.5.xml:139(term)
-msgid "UID_MIN (number)"
+#: login.defs.5.xml:277(term)
+#, fuzzy
+msgid "<option>UID_MIN</option> (number)"
 msgstr "UID_MIN (numer)"
 
-#: login.defs.5.xml:141(para)
+#: login.defs.5.xml:279(para)
 msgid ""
 "Range of user IDs to choose from for the <command>useradd</command> program."
 msgstr ""
 
-#: login.defs.5.xml:148(term)
-msgid "UMASK (number)"
+#: login.defs.5.xml:286(term)
+#, fuzzy
+msgid "<option>UMASK</option> (number)"
 msgstr "UMASK (number)"
 
-#: login.defs.5.xml:150(para)
+#: login.defs.5.xml:288(para)
 msgid ""
 "The permission mask is initialized to this value. If not specified, the "
 "permission mask will be initialized to 022."
 msgstr ""
 
-#: login.defs.5.xml:157(term)
-msgid "USERDEL_CMD (string)"
+#: login.defs.5.xml:295(term)
+#, fuzzy
+msgid "<option>USERDEL_CMD</option> (string)"
 msgstr "USERDEL_CMD (łańcuch)"
 
-#: login.defs.5.xml:159(para)
+#: login.defs.5.xml:297(para)
 msgid ""
 "If defined, this command is run when removing a user. It should remove any "
 "at/cron/print jobs etc. owned by the user to be removed (passed as the first "
 "argument)."
 msgstr ""
 
-#: login.defs.5.xml:170(title)
+#: login.defs.5.xml:308(title)
 msgid "CROSS REFERENCE"
 msgstr ""
 
-#: login.defs.5.xml:171(para)
+#: login.defs.5.xml:309(para)
 msgid ""
 "The following cross reference shows which programs in the shadow password "
 "suite use which parameters."
 msgstr ""
 
-#: login.defs.5.xml:178(term) chfn.1.xml:5(refentrytitle)
+#: login.defs.5.xml:316(term) chfn.1.xml:5(refentrytitle)
 #: chfn.1.xml:10(refname) chfn.1.xml:16(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:180(para)
+#: login.defs.5.xml:318(para)
 msgid "CHFN_AUTH CHFN_RESTRICT"
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
-#: login.defs.5.xml:184(term) chsh.1.xml:5(refentrytitle)
+#: login.defs.5.xml:322(term) chgpasswd.8.xml:5(refentrytitle)
+#: chgpasswd.8.xml:10(refname) chgpasswd.8.xml:16(command)
+msgid "chgpasswd"
+msgstr "chgpasswd"
+
+#: login.defs.5.xml:324(para)
+msgid ""
+"MD5_CRYPT_ENAB ENCRYPT_METHOD SHA_CRYPT_MIN_ROUNDS SHA_CRYPT_MAX_ROUNDS "
+"MAX_MEMBERS_PER_GROUP"
+msgstr ""
+
+#: login.defs.5.xml:331(term) chpasswd.8.xml:5(refentrytitle)
+#: chpasswd.8.xml:10(refname) chpasswd.8.xml:16(command)
+msgid "chpasswd"
+msgstr "chpasswd"
+
+#: login.defs.5.xml:333(para)
+msgid "MD5_CRYPT_ENAB ENCRYPT_METHOD SHA_CRYPT_MIN_ROUNDS SHA_CRYPT_MAX_ROUNDS"
+msgstr ""
+
+#: login.defs.5.xml:340(term) chsh.1.xml:5(refentrytitle)
 #: chsh.1.xml:10(refname) chsh.1.xml:16(command)
 msgid "chsh"
 msgstr "chsh"
 
-#: login.defs.5.xml:186(para)
+#: login.defs.5.xml:342(para)
 msgid "CHFN_AUTH"
 msgstr "CHFN_AUTH"
 
-#: login.defs.5.xml:190(term) groupadd.8.xml:5(refentrytitle)
+#: login.defs.5.xml:346(term) groupadd.8.xml:5(refentrytitle)
 #: groupadd.8.xml:10(refname) groupadd.8.xml:16(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:192(para)
+#: login.defs.5.xml:348(para)
 msgid "GID_MAX GID_MIN"
 msgstr "GID_MAX GID_MIN"
 
-#: login.defs.5.xml:198(para)
+#: login.defs.5.xml:354(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 
-#: login.defs.5.xml:206(para)
+#: login.defs.5.xml:362(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 
-#: login.defs.5.xml:212(para)
+#: login.defs.5.xml:368(para)
 msgid ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
@@ -3167,15 +3387,15 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:223(para)
+#: login.defs.5.xml:379(para)
 msgid "MAIL_DIR USERDEL_CMD"
 msgstr "MAIL_DIR USERDEL_CMD"
 
-#: login.defs.5.xml:231(para)
+#: login.defs.5.xml:387(para)
 msgid "MAIL_DIR"
 msgstr "MAIL_DIR"
 
-#: login.defs.5.xml:240(para)
+#: login.defs.5.xml:396(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 "
@@ -3187,7 +3407,7 @@
 "configuration files instead."
 msgstr ""
 
-#: login.defs.5.xml:257(para)
+#: login.defs.5.xml:413(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -3975,8 +4195,8 @@
 msgid "display current group names"
 msgstr ""
 
-#: groups.1.xml:18(replaceable) gpasswd.1.xml:67(replaceable)
-#: gpasswd.1.xml:80(replaceable) chfn.1.xml:22(replaceable)
+#: groups.1.xml:18(replaceable) gpasswd.1.xml:86(replaceable)
+#: gpasswd.1.xml:99(replaceable) chfn.1.xml:22(replaceable)
 msgid "user"
 msgstr ""
 
@@ -4186,7 +4406,7 @@
 "The options which apply to the <command>groupmems</command> command are:"
 msgstr "Polecenie <command>groupmems</command> posiada następujące opcje:"
 
-#: groupmems.8.xml:49(option) gpasswd.1.xml:67(option)
+#: groupmems.8.xml:49(option) gpasswd.1.xml:86(option)
 msgid "-a"
 msgstr "-a"
 
@@ -4194,7 +4414,7 @@
 msgid "Add a new user to the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:55(option) gpasswd.1.xml:80(option)
+#: groupmems.8.xml:55(option) gpasswd.1.xml:99(option)
 msgid "-d"
 msgstr "-d"
 
@@ -4435,25 +4655,31 @@
 "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgstr ""
 
-#: groupadd.8.xml:143(para)
+#: groupadd.8.xml:144(para)
+msgid "Groupnames may only be up to 16 characters long."
+msgstr ""
+
+#: groupadd.8.xml:147(para)
 msgid ""
-"If the groupname already exists in an external group database such as NIS, "
-"<command>groupadd</command> will deny the group creation request."
+"You may not add a NIS or LDAP group. This must be performed on the "
+"corresponding server."
 msgstr ""
 
-#: groupadd.8.xml:148(para)
-msgid "Groupnames may only be up to 16 characters long."
+#: groupadd.8.xml:151(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:177(para)
+#: groupadd.8.xml:184(para)
 msgid "GID not unique (when <option>-o</option> not used)"
 msgstr ""
 
-#: groupadd.8.xml:183(para)
+#: groupadd.8.xml:190(para)
 msgid "group name not unique"
 msgstr ""
 
-#: groupadd.8.xml:153(para)
+#: groupadd.8.xml:160(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4461,7 +4687,7 @@
 "Polecenie <command>groupadd</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: groupadd.8.xml:198(para)
+#: groupadd.8.xml:205(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -4496,58 +4722,92 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 #: gpasswd.1.xml:5(refentrytitle) gpasswd.1.xml:10(refname)
-#: gpasswd.1.xml:16(command)
+#: gpasswd.1.xml:21(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
-#: gpasswd.1.xml:11(refpurpose)
-msgid "administer the <placeholder-1/> file"
+#: gpasswd.1.xml:13(phrase)
+#, fuzzy
+msgid "and <placeholder-1/> files"
+msgstr "-a <placeholder-1/>"
+
+#: gpasswd.1.xml:15(phrase)
+msgid "file"
 msgstr ""
 
-#: gpasswd.1.xml:18(replaceable)
+#: gpasswd.1.xml:11(refpurpose)
 #, fuzzy
+msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
+msgstr "-K <placeholder-1/>=<placeholder-2/>"
+
+#: gpasswd.1.xml:23(replaceable)
+#, fuzzy
 msgid "option"
 msgstr "opcje"
 
-#: gpasswd.1.xml:28(para)
+#: gpasswd.1.xml:33(para)
 msgid ""
-"The <command>gpasswd</command> command is used to administer the <filename>/"
-"etc/group</filename> file (and <filename>/etc/gshadow</filename> file if "
-"compiled with SHADOWGRP defined). Every group can have administrators, "
-"members and a password. System administrator can use the <option>-A</option> "
-"option to define group administrator(s) and the <option>-M</option> option "
-"to define members and has all rights of group administrators and members."
+"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:37(para)
+#: gpasswd.1.xml:41(para)
 msgid ""
-"<command>gpasswd</command> called by a group administrator with a group name "
-"only prompts for the group password. If a password is set the members can "
-"still <citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry> without a password, and non-members must supply "
-"the password."
+"System administrator can use the <option>-A</option> option to define group "
+"administrator(s) and the <option>-M</option> option to define members and "
+"has all rights of group administrators and members."
 msgstr ""
 
-#: gpasswd.1.xml:47(title)
+#: gpasswd.1.xml:46(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:53(para)
+#, fuzzy
+msgid ""
+"If a password is set the members can still "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry> without a password, and non-members must supply the password."
+msgstr ""
+"Nowa wartość pola komentarza dla danego użytkownika w pliku haseł. Zwykle "
+"jest zmieniana przy pomocy polecenia <citerefentry><refentrytitle>chfn</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>."
+
+#: gpasswd.1.xml:61(title)
 msgid "Notes about group passwords"
 msgstr ""
 
-#: gpasswd.1.xml:48(para)
+#: gpasswd.1.xml:62(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:59(para)
+#: gpasswd.1.xml:73(para)
+#, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
-"options cannot be combined. The options which apply to the <command>gpasswd</"
-"command> command are:"
+"options cannot be combined."
+msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
+
+#: gpasswd.1.xml:77(para)
+msgid "The options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:80(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:89(para)
+#, fuzzy
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
@@ -4555,7 +4815,7 @@
 "Nazwa grupy zostanie zmieniona z <replaceable>GRUPA</replaceable> na nazwę "
 "<replaceable>NOWA_GRUPA</replaceable>."
 
-#: gpasswd.1.xml:83(para)
+#: gpasswd.1.xml:102(para)
 #, fuzzy
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
@@ -4564,58 +4824,68 @@
 "Nazwa grupy zostanie zmieniona z <replaceable>GRUPA</replaceable> na nazwę "
 "<replaceable>NOWA_GRUPA</replaceable>."
 
-#: gpasswd.1.xml:96(para)
+#: gpasswd.1.xml:115(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:108(option)
+#: gpasswd.1.xml:127(option)
 #, fuzzy
 msgid "-R"
 msgstr "-"
 
-#: gpasswd.1.xml:111(para)
+#: gpasswd.1.xml:130(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:122(term)
+#: gpasswd.1.xml:141(term)
 #, fuzzy
 msgid "<option>-A</option><replaceable>user</replaceable>,..."
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:126(para)
+#: gpasswd.1.xml:145(para)
 msgid "Set the list of administrative users."
 msgstr ""
 
-#: gpasswd.1.xml:134(term)
+#: gpasswd.1.xml:153(term)
 #, fuzzy
 msgid "<option>-M</option><replaceable>user</replaceable>,..."
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:138(para)
+#: gpasswd.1.xml:157(para)
 msgid "Set the list of group members."
 msgstr ""
 
-#: gpasswd.1.xml:166(para)
+#: gpasswd.1.xml:167(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:197(para)
+#, fuzzy
+msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</"
+"citerefentry>, <citerefentry><refentrytitle>groupadd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>grpck</"
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</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 ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
@@ -4878,11 +5148,6 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chpasswd.8.xml:5(refentrytitle) chpasswd.8.xml:10(refname)
-#: chpasswd.8.xml:16(command)
-msgid "chpasswd"
-msgstr "chpasswd"
-
 #: chpasswd.8.xml:11(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "wsadowa aktualizacja haseł użytkowników"
@@ -4907,9 +5172,11 @@
 "\">hasło</emphasis>"
 
 #: chpasswd.8.xml:34(para)
+#, fuzzy
 msgid ""
-"By default the supplied password must be in clear-text. Default encryption "
-"algorithm is DES. Also the password age will be updated, if present."
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chpasswd</command>. Also the password age will be updated, if "
+"present."
 msgstr ""
 "Domyślnie dostarczane hasła muszą być w postaci jawnej. Podczas kodowania "
 "haseł używany jest domyślnie algorytm DES. W trakcie zmiany hasła "
@@ -4917,30 +5184,53 @@
 
 #: chpasswd.8.xml:39(para) chgpasswd.8.xml:38(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."
+msgstr ""
+
+#: chpasswd.8.xml:45(para) chgpasswd.8.xml:44(para)
+msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
 msgstr ""
 "Polecenie to przeznaczone jest do użytku w dużych systemach, gdzie "
 "aktualizuje się wiele kont naraz."
 
-#: chpasswd.8.xml:47(para)
+#: chpasswd.8.xml:53(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:53(term) chgpasswd.8.xml:52(term)
+#: chpasswd.8.xml:59(term) chgpasswd.8.xml:58(term)
+#, fuzzy
+msgid "<option>-c</option>, <option>--crypt-method</option>"
+msgstr "<option>-e</option>, <option>--encrypted</option>"
+
+#: chpasswd.8.xml:61(para) chgpasswd.8.xml:60(para)
+msgid "Use the specified method to encrypt the passwords."
+msgstr ""
+
+#: chpasswd.8.xml:62(para) chgpasswd.8.xml:61(para)
+msgid ""
+"The available methods are DES, MD5, and SHA256 or SHA512 if compiled with "
+"the ENCRYPTMETHOD_SELECT flag."
+msgstr ""
+
+#: chpasswd.8.xml:69(term) chgpasswd.8.xml:68(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: chpasswd.8.xml:55(para) chgpasswd.8.xml:54(para)
+#: chpasswd.8.xml:71(para) chgpasswd.8.xml:70(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr ""
 "Dostarczone na standardowe wejście hasła są traktowane jako już zakodowane."
 
-#: chpasswd.8.xml:65(term) chgpasswd.8.xml:64(term)
+#: chpasswd.8.xml:81(term) chgpasswd.8.xml:80(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
-#: chpasswd.8.xml:67(para) chgpasswd.8.xml:66(para)
+#: chpasswd.8.xml:83(para) chgpasswd.8.xml:82(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -4948,33 +5238,77 @@
 "Jeżeli dpostarczane hasła są w postaci jawnej użyj kodowania MD5 zamiast "
 "domyślnego DES."
 
-#: chpasswd.8.xml:78(para) chgpasswd.8.xml:77(para)
+#: chpasswd.8.xml:90(term) chgpasswd.8.xml:89(term)
+#, fuzzy
+msgid "<option>-s</option>, <option>--sha-rounds</option>"
+msgstr "<option>-s</option>, <option>--shadow</option>"
+
+#: chpasswd.8.xml:92(para) chgpasswd.8.xml:91(para)
+msgid "Use the specified number of rounds to encrypt the passwords."
+msgstr ""
+
+#: chpasswd.8.xml:95(para) chgpasswd.8.xml:94(para)
 msgid ""
+"The value 0 means that the system will choose the default number of rounds "
+"for the crypt method (5000)."
+msgstr ""
+
+#: chpasswd.8.xml:99(para) chgpasswd.8.xml:98(para)
+msgid ""
+"A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
+msgstr ""
+
+#: chpasswd.8.xml:103(para) chgpasswd.8.xml:102(para)
+msgid "You can only use this option with the SHA256 or SHA512 crypt method."
+msgstr ""
+
+#: chpasswd.8.xml:107(para) chgpasswd.8.xml:106(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 ""
+
+#: chpasswd.8.xml:119(para) chgpasswd.8.xml:118(para)
+msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
 msgstr ""
 "Pamiętaj żeby zabezpieczyć przed odczytem plik przekazywany na standardowe "
 "wejście polecenia."
 
-#: chpasswd.8.xml:86(para)
+#: chpasswd.8.xml:132(title)
+msgid "CONFIGURATION"
+msgstr ""
+
+#: chpasswd.8.xml:133(para)
 msgid ""
+"The following configuration variables in <filename>/etc/login.defs</"
+"filename> change the behavior of this tool:"
+msgstr ""
+
+#: chpasswd.8.xml:159(para)
+msgid ""
+"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"or by any command line option."
+msgstr ""
+
+#: chpasswd.8.xml:273(para)
+#, fuzzy
+msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>newusers</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<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>."
 
-#: chgpasswd.8.xml:5(refentrytitle) chgpasswd.8.xml:10(refname)
-#: chgpasswd.8.xml:16(command)
-msgid "chgpasswd"
-msgstr "chgpasswd"
-
 #: chgpasswd.8.xml:11(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "wsadowa aktualizacja haseł grup"
@@ -4999,27 +5333,33 @@
 "emphasis>"
 
 #: chgpasswd.8.xml:34(para)
+#, fuzzy
 msgid ""
-"By default the supplied password must be in clear-text. Default encryption "
-"algorithm is DES."
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chgpasswd</command>."
 msgstr ""
 "Domyślnie dostarczane hasła muszą być w postaci jawnej. Podczas kodowania "
 "haseł używany jest domyślnie algorytm DES."
 
-#: chgpasswd.8.xml:46(para)
+#: chgpasswd.8.xml:52(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:85(para)
+#: chgpasswd.8.xml:150(para)
+#, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
 
 #: chfn.1.xml:11(refpurpose)
 msgid "change real user name and information"
@@ -5315,6 +5655,49 @@
 msgid "translator-credits"
 msgstr "Tomasz Kłoczko <kloczek at pld.org.pl>, 2006"
 
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
 #~ msgid "-R <placeholder-1/>"
 #~ msgstr "-R <placeholder-1/>"
 

Modified: upstream/trunk/man/po/ru.po
===================================================================
--- upstream/trunk/man/po/ru.po	2007-11-25 21:06:49 UTC (rev 1464)
+++ upstream/trunk/man/po/ru.po	2007-11-25 21:28:26 UTC (rev 1465)
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1:4.0.18.2-1\n"
-"POT-Creation-Date: 2006-11-12 20:17+0100\n"
+"POT-Creation-Date: 2007-11-25 20:28+0100\n"
 "PO-Revision-Date: 2007-11-21 21:37+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -11,7 +11,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 # type: Content of: <refentry><refsect1><para><command>
 #: vipw.8.xml:5(refentrytitle) vipw.8.xml:10(refname) vipw.8.xml:19(command)
@@ -20,7 +21,7 @@
 
 # type: Content of: <refentry><refsect1><para><citerefentry><manvolnum>
 #: vipw.8.xml:6(manvolnum) usermod.8.xml:6(manvolnum)
-#: userdel.8.xml:6(manvolnum) userdel.8.xml:147(replaceable)
+#: userdel.8.xml:6(manvolnum) userdel.8.xml:148(replaceable)
 #: useradd.8.xml:6(manvolnum) pwconv.8.xml:6(manvolnum)
 #: pwck.8.xml:6(manvolnum) nologin.8.xml:6(manvolnum)
 #: newusers.8.xml:6(manvolnum) logoutd.8.xml:6(manvolnum)
@@ -81,7 +82,7 @@
 #: login.access.5.xml:15(title) login.1.xml:36(title) limits.5.xml:16(title)
 #: lastlog.8.xml:24(title) gshadow.5.xml:15(title) grpck.8.xml:25(title)
 #: groups.1.xml:24(title) groupmod.8.xml:25(title) groupmems.8.xml:27(title)
-#: groupdel.8.xml:24(title) groupadd.8.xml:30(title) gpasswd.1.xml:48(title)
+#: groupdel.8.xml:24(title) groupadd.8.xml:30(title) gpasswd.1.xml:32(title)
 #: faillog.8.xml:24(title) faillog.5.xml:15(title) expiry.1.xml:23(title)
 #: chsh.1.xml:27(title) chpasswd.8.xml:24(title) chgpasswd.8.xml:24(title)
 #: chfn.1.xml:27(title) chage.1.xml:26(title)
@@ -114,11 +115,11 @@
 
 # type: Content of: <refentry><refsect1><title>
 #: vipw.8.xml:51(title) usermod.8.xml:33(title) userdel.8.xml:33(title)
-#: useradd.8.xml:47(title) su.1.xml:74(title) pwck.8.xml:96(title)
+#: useradd.8.xml:48(title) su.1.xml:74(title) pwck.8.xml:96(title)
 #: passwd.1.xml:140(title) login.1.xml:119(title) lastlog.8.xml:36(title)
 #: grpck.8.xml:69(title) groupmod.8.xml:34(title) groupmems.8.xml:42(title)
-#: groupadd.8.xml:39(title) gpasswd.1.xml:71(title) faillog.8.xml:35(title)
-#: chsh.1.xml:38(title) chpasswd.8.xml:46(title) chgpasswd.8.xml:45(title)
+#: groupadd.8.xml:39(title) gpasswd.1.xml:72(title) faillog.8.xml:35(title)
+#: chsh.1.xml:38(title) chpasswd.8.xml:52(title) chgpasswd.8.xml:51(title)
 #: chage.1.xml:36(title)
 msgid "OPTIONS"
 msgstr "ПАРАМЕТРЫ"
@@ -138,18 +139,18 @@
 msgid "Edit group database."
 msgstr "Редактирует базу данных групп."
 
-#: vipw.8.xml:64(term) userdel.8.xml:62(term) useradd.8.xml:153(term)
-#: passwd.1.xml:180(term) lastlog.8.xml:52(term) groupmod.8.xml:57(term)
-#: groupadd.8.xml:72(term) faillog.8.xml:48(term) chsh.1.xml:44(term)
-#: chpasswd.8.xml:59(term) chgpasswd.8.xml:58(term) chage.1.xml:74(term)
+#: vipw.8.xml:64(term) userdel.8.xml:63(term) useradd.8.xml:165(term)
+#: passwd.1.xml:180(term) lastlog.8.xml:52(term) groupmod.8.xml:60(term)
+#: groupadd.8.xml:74(term) faillog.8.xml:48(term) chsh.1.xml:44(term)
+#: chpasswd.8.xml:75(term) chgpasswd.8.xml:74(term) chage.1.xml:74(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:66(para) userdel.8.xml:64(para) useradd.8.xml:155(para)
-#: passwd.1.xml:182(para) lastlog.8.xml:56(para) groupmod.8.xml:59(para)
-#: groupadd.8.xml:74(para) faillog.8.xml:50(para) chsh.1.xml:46(para)
-#: chpasswd.8.xml:61(para) chgpasswd.8.xml:60(para) chage.1.xml:76(para)
+#: vipw.8.xml:66(para) userdel.8.xml:65(para) useradd.8.xml:167(para)
+#: passwd.1.xml:182(para) lastlog.8.xml:56(para) groupmod.8.xml:62(para)
+#: groupadd.8.xml:76(para) faillog.8.xml:50(para) chsh.1.xml:46(para)
+#: chpasswd.8.xml:77(para) chgpasswd.8.xml:76(para) chage.1.xml:76(para)
 msgid "Display help message and exit."
 msgstr "Показать краткую справку и закончить работу."
 
@@ -162,12 +163,12 @@
 msgid "Edit passwd database."
 msgstr "Редактировать базу данных passwd."
 
-#: vipw.8.xml:76(term) passwd.1.xml:234(term)
+#: vipw.8.xml:76(term) passwd.1.xml:235(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:78(para) passwd.1.xml:238(para)
+#: vipw.8.xml:78(para) passwd.1.xml:239(para)
 msgid "Quiet mode."
 msgstr "Не выводить сообщений при работе."
 
@@ -181,114 +182,123 @@
 msgstr "Редактировать базу данных shadow или gshadow."
 
 # type: Content of: <refentry><refsect1><title>
-#: vipw.8.xml:91(title) usermod.8.xml:246(title) userdel.8.xml:88(title)
-#: useradd.8.xml:363(title) suauth.5.xml:139(title) su.1.xml:176(title)
+#: vipw.8.xml:91(title) usermod.8.xml:260(title) userdel.8.xml:89(title)
+#: useradd.8.xml:371(title) suauth.5.xml:139(title) su.1.xml:176(title)
 #: sg.1.xml:43(title) shadow.5.xml:105(title) shadow.3.xml:172(title)
 #: pwconv.8.xml:109(title) pwck.8.xml:145(title) porttime.5.xml:76(title)
-#: passwd.5.xml:87(title) passwd.1.xml:322(title) newusers.8.xml:90(title)
+#: passwd.5.xml:87(title) passwd.1.xml:324(title) newusers.8.xml:96(title)
 #: newgrp.1.xml:54(title) logoutd.8.xml:35(title) login.access.5.xml:66(title)
-#: login.1.xml:198(title) limits.5.xml:107(title) lastlog.8.xml:113(title)
+#: login.1.xml:198(title) limits.5.xml:110(title) lastlog.8.xml:113(title)
 #: gshadow.5.xml:61(title) grpck.8.xml:87(title) groups.1.xml:46(title)
-#: groupmod.8.xml:89(title) groupmems.8.xml:103(title)
-#: groupdel.8.xml:43(title) groupadd.8.xml:112(title) gpasswd.1.xml:93(title)
+#: groupmod.8.xml:92(title) groupmems.8.xml:103(title)
+#: groupdel.8.xml:43(title) groupadd.8.xml:114(title) gpasswd.1.xml:178(title)
 #: faillog.8.xml:132(title) faillog.5.xml:38(title) expiry.1.xml:32(title)
-#: chsh.1.xml:85(title) chfn.1.xml:60(title) chage.1.xml:177(title)
+#: chsh.1.xml:85(title) chpasswd.8.xml:248(title) chgpasswd.8.xml:125(title)
+#: chfn.1.xml:60(title) chage.1.xml:177(title)
 msgid "FILES"
 msgstr "ФАЙЛЫ"
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: vipw.8.xml:94(filename) usermod.8.xml:249(filename)
-#: userdel.8.xml:91(filename) useradd.8.xml:378(filename)
-#: sg.1.xml:58(filename) pwck.8.xml:148(filename) newgrp.1.xml:69(filename)
-#: gshadow.5.xml:64(filename) grpck.8.xml:90(filename)
-#: groups.1.xml:49(filename) groupmod.8.xml:92(filename)
-#: groupmems.8.xml:106(filename) groupdel.8.xml:46(filename)
-#: groupadd.8.xml:115(filename) gpasswd.1.xml:11(filename)
-#: gpasswd.1.xml:96(filename)
+#: vipw.8.xml:94(filename) usermod.8.xml:263(filename)
+#: userdel.8.xml:92(filename) useradd.8.xml:386(filename)
+#: sg.1.xml:58(filename) pwck.8.xml:148(filename) newusers.8.xml:111(filename)
+#: newgrp.1.xml:69(filename) gshadow.5.xml:64(filename)
+#: grpck.8.xml:90(filename) groups.1.xml:49(filename)
+#: groupmod.8.xml:95(filename) groupmems.8.xml:106(filename)
+#: groupdel.8.xml:46(filename) groupadd.8.xml:117(filename)
+#: gpasswd.1.xml:12(filename) gpasswd.1.xml:181(filename)
+#: chgpasswd.8.xml:128(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:96(para) usermod.8.xml:251(para) userdel.8.xml:93(para)
-#: useradd.8.xml:380(para) sg.1.xml:60(para) pwck.8.xml:150(para)
-#: newgrp.1.xml:71(para) gshadow.5.xml:66(para) grpck.8.xml:92(para)
-#: groups.1.xml:51(para) groupmod.8.xml:94(para) groupmems.8.xml:108(para)
-#: groupdel.8.xml:48(para) groupadd.8.xml:117(para) gpasswd.1.xml:98(para)
+#: vipw.8.xml:96(para) usermod.8.xml:265(para) userdel.8.xml:94(para)
+#: useradd.8.xml:388(para) sg.1.xml:60(para) pwck.8.xml:150(para)
+#: newusers.8.xml:113(para) newgrp.1.xml:71(para) gshadow.5.xml:66(para)
+#: grpck.8.xml:92(para) groups.1.xml:51(para) groupmod.8.xml:97(para)
+#: groupmems.8.xml:108(para) groupdel.8.xml:48(para) groupadd.8.xml:119(para)
+#: gpasswd.1.xml:183(para) chgpasswd.8.xml:130(para)
 msgid "Group account information."
 msgstr "содержит информацию о группах"
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: vipw.8.xml:100(filename) sg.1.xml:64(filename) newgrp.1.xml:75(filename)
-#: gshadow.5.xml:70(filename) grpck.8.xml:96(filename)
-#: groupmod.8.xml:98(filename) groupmems.8.xml:112(filename)
-#: groupdel.8.xml:52(filename) groupadd.8.xml:121(filename)
-#: gpasswd.1.xml:102(filename)
+#: vipw.8.xml:100(filename) sg.1.xml:64(filename) newusers.8.xml:117(filename)
+#: newgrp.1.xml:75(filename) gshadow.5.xml:70(filename)
+#: grpck.8.xml:96(filename) groupmod.8.xml:101(filename)
+#: groupmems.8.xml:112(filename) groupdel.8.xml:52(filename)
+#: groupadd.8.xml:123(filename) gpasswd.1.xml:13(filename)
+#: gpasswd.1.xml:187(filename) chgpasswd.8.xml:134(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:102(para) sg.1.xml:66(para) newgrp.1.xml:77(para)
-#: gshadow.5.xml:72(para) grpck.8.xml:98(para) groupmod.8.xml:100(para)
-#: groupdel.8.xml:54(para) groupadd.8.xml:123(para) gpasswd.1.xml:104(para)
+#: vipw.8.xml:102(para) sg.1.xml:66(para) newusers.8.xml:119(para)
+#: newgrp.1.xml:77(para) gshadow.5.xml:72(para) grpck.8.xml:98(para)
+#: groupmod.8.xml:103(para) groupdel.8.xml:54(para) groupadd.8.xml:125(para)
+#: gpasswd.1.xml:189(para) chgpasswd.8.xml:136(para)
 msgid "Secure group account information."
 msgstr "содержит защищаемую информацию о группах"
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: vipw.8.xml:106(filename) usermod.8.xml:255(filename)
-#: userdel.8.xml:103(filename) useradd.8.xml:366(filename)
+#: vipw.8.xml:106(filename) usermod.8.xml:269(filename)
+#: userdel.8.xml:104(filename) useradd.8.xml:374(filename)
 #: su.1.xml:179(filename) sg.1.xml:46(filename) shadow.5.xml:108(filename)
 #: pwck.8.xml:154(filename) passwd.5.xml:90(filename)
-#: passwd.1.xml:325(filename) newgrp.1.xml:57(filename)
-#: login.1.xml:213(filename) grpck.8.xml:102(filename)
-#: expiry.1.xml:35(filename) chsh.1.xml:88(filename) chfn.1.xml:69(filename)
+#: passwd.1.xml:327(filename) newusers.8.xml:99(filename)
+#: newgrp.1.xml:57(filename) login.1.xml:213(filename)
+#: grpck.8.xml:102(filename) expiry.1.xml:35(filename) chsh.1.xml:88(filename)
+#: chpasswd.8.xml:251(filename) chfn.1.xml:69(filename)
 #: chage.1.xml:181(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:108(para) usermod.8.xml:257(para) userdel.8.xml:105(para)
-#: useradd.8.xml:368(para) su.1.xml:181(para) sg.1.xml:48(para)
+#: vipw.8.xml:108(para) usermod.8.xml:271(para) userdel.8.xml:106(para)
+#: useradd.8.xml:376(para) su.1.xml:181(para) sg.1.xml:48(para)
 #: shadow.5.xml:110(para) pwck.8.xml:156(para) passwd.5.xml:92(para)
-#: passwd.1.xml:327(para) newgrp.1.xml:59(para) login.1.xml:215(para)
-#: grpck.8.xml:104(para) expiry.1.xml:37(para) chsh.1.xml:90(para)
-#: chfn.1.xml:71(para) chage.1.xml:184(para)
+#: passwd.1.xml:329(para) newusers.8.xml:101(para) newgrp.1.xml:59(para)
+#: login.1.xml:215(para) grpck.8.xml:104(para) expiry.1.xml:37(para)
+#: chsh.1.xml:90(para) chpasswd.8.xml:253(para) chfn.1.xml:71(para)
+#: chage.1.xml:184(para)
 msgid "User account information."
 msgstr "содержит информацию о пользователях"
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: vipw.8.xml:112(filename) usermod.8.xml:261(filename)
-#: userdel.8.xml:109(filename) useradd.8.xml:372(filename)
+#: vipw.8.xml:112(filename) usermod.8.xml:275(filename)
+#: userdel.8.xml:110(filename) useradd.8.xml:380(filename)
 #: su.1.xml:185(filename) sg.1.xml:52(filename) shadow.5.xml:114(filename)
 #: shadow.3.xml:175(filename) pwck.8.xml:160(filename)
-#: passwd.5.xml:96(filename) passwd.1.xml:331(filename)
-#: newgrp.1.xml:63(filename) login.1.xml:219(filename)
-#: expiry.1.xml:41(filename) chage.1.xml:189(filename)
+#: passwd.5.xml:96(filename) passwd.1.xml:333(filename)
+#: newusers.8.xml:105(filename) newgrp.1.xml:63(filename)
+#: login.1.xml:219(filename) expiry.1.xml:41(filename)
+#: chpasswd.8.xml:257(filename) chage.1.xml:189(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:114(para) usermod.8.xml:263(para) userdel.8.xml:111(para)
-#: useradd.8.xml:374(para) su.1.xml:187(para) sg.1.xml:54(para)
+#: vipw.8.xml:114(para) usermod.8.xml:277(para) userdel.8.xml:112(para)
+#: useradd.8.xml:382(para) su.1.xml:187(para) sg.1.xml:54(para)
 #: shadow.5.xml:116(para) shadow.3.xml:177(para) pwck.8.xml:162(para)
-#: passwd.1.xml:333(para) newgrp.1.xml:65(para) login.1.xml:221(para)
-#: expiry.1.xml:43(para) chage.1.xml:192(para)
+#: passwd.1.xml:335(para) newusers.8.xml:107(para) newgrp.1.xml:65(para)
+#: login.1.xml:221(para) expiry.1.xml:43(para) chpasswd.8.xml:259(para)
+#: chage.1.xml:192(para)
 msgid "Secure user account information."
 msgstr "содержит защищаемую информацию о пользователях"
 
 # type: Content of: <refentry><refsect1><title>
-#: vipw.8.xml:120(title) usermod.8.xml:270(title) userdel.8.xml:190(title)
-#: useradd.8.xml:474(title) suauth.5.xml:168(title) su.1.xml:194(title)
+#: vipw.8.xml:120(title) usermod.8.xml:284(title) userdel.8.xml:191(title)
+#: useradd.8.xml:482(title) suauth.5.xml:168(title) su.1.xml:194(title)
 #: sg.1.xml:73(title) shadow.5.xml:123(title) shadow.3.xml:184(title)
 #: pwconv.8.xml:121(title) pwck.8.xml:169(title) porttime.5.xml:88(title)
-#: passwd.5.xml:105(title) passwd.1.xml:391(title) nologin.8.xml:35(title)
-#: newusers.8.xml:102(title) newgrp.1.xml:84(title)
-#: login.defs.5.xml:256(title) login.access.5.xml:78(title)
-#: login.1.xml:252(title) limits.5.xml:117(title) gshadow.5.xml:79(title)
-#: grpck.8.xml:111(title) groups.1.xml:58(title) groupmod.8.xml:158(title)
+#: passwd.5.xml:105(title) passwd.1.xml:393(title) nologin.8.xml:35(title)
+#: newusers.8.xml:132(title) newgrp.1.xml:84(title)
+#: login.defs.5.xml:412(title) login.access.5.xml:78(title)
+#: login.1.xml:252(title) limits.5.xml:120(title) gshadow.5.xml:79(title)
+#: grpck.8.xml:111(title) groups.1.xml:58(title) groupmod.8.xml:161(title)
 #: groupmems.8.xml:121(title) groupdel.8.xml:100(title)
-#: groupadd.8.xml:199(title) gpasswd.1.xml:111(title) faillog.8.xml:144(title)
+#: groupadd.8.xml:204(title) gpasswd.1.xml:196(title) faillog.8.xml:144(title)
 #: faillog.5.xml:50(title) expiry.1.xml:50(title) chsh.1.xml:109(title)
-#: chpasswd.8.xml:85(title) chgpasswd.8.xml:84(title) chfn.1.xml:78(title)
+#: chpasswd.8.xml:272(title) chgpasswd.8.xml:149(title) chfn.1.xml:78(title)
 #: chage.1.xml:232(title)
 msgid "SEE ALSO"
 msgstr "СМОТРИТЕ ТАКЖЕ"
@@ -315,7 +325,7 @@
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
 #: usermod.8.xml:5(refentrytitle) usermod.8.xml:10(refname)
-#: usermod.8.xml:16(command) login.defs.5.xml:229(term)
+#: usermod.8.xml:16(command) login.defs.5.xml:385(term)
 msgid "usermod"
 msgstr "usermod"
 
@@ -359,7 +369,7 @@
 "Добавить пользователя в дополнительную группу(ы). Использовать только вместе "
 "с параметром <option>-G</option>."
 
-#: usermod.8.xml:51(term) useradd.8.xml:52(term)
+#: usermod.8.xml:51(term) useradd.8.xml:53(term)
 msgid ""
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
@@ -378,7 +388,7 @@
 "изменяют с помощью программы <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: usermod.8.xml:65(term) useradd.8.xml:80(term)
+#: usermod.8.xml:65(term) useradd.8.xml:92(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -397,7 +407,7 @@
 "option>, то содержимое текущего домашнего каталога будет перемещено в новый "
 "домашний каталог, который будет создан, если он ещё не существует."
 
-#: usermod.8.xml:79(term) useradd.8.xml:97(term) useradd.8.xml:281(term)
+#: usermod.8.xml:79(term) useradd.8.xml:109(term) useradd.8.xml:294(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -406,7 +416,7 @@
 "option><replaceable>ДАТА_УСТАРЕВАНИЯ</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:84(para) useradd.8.xml:102(para)
+#: usermod.8.xml:84(para) useradd.8.xml:114(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>."
@@ -414,7 +424,7 @@
 "Дата, когда учётная запись пользователя будет заблокирована. Дата задаётся в "
 "формате <emphasis remap=\"I\">ГГГГ-ММ-ДД</emphasis>."
 
-#: usermod.8.xml:91(term) useradd.8.xml:109(term) useradd.8.xml:290(term)
+#: usermod.8.xml:91(term) useradd.8.xml:121(term) useradd.8.xml:303(term)
 msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -423,7 +433,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:96(para) useradd.8.xml:114(para)
+#: usermod.8.xml:96(para) useradd.8.xml:126(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 "
@@ -434,9 +444,11 @@
 "блокируется сразу после устаревания пароля, а при значении -1 данная "
 "возможность не используется. По умолчанию используется значение -1."
 
-#: usermod.8.xml:105(term) useradd.8.xml:123(term) useradd.8.xml:302(term)
-msgid "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
-msgstr "<option>-g</option>, <option>--gid</option><replaceable>ГРУППА</replaceable>"
+#: usermod.8.xml:105(term) useradd.8.xml:135(term) useradd.8.xml:315(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:110(para)
@@ -449,7 +461,7 @@
 "таким именем должна существовать. Идентификатор группы должен указывать на "
 "уже существующую группу. По умолчанию идентификатор группы установлен в 1."
 
-#: usermod.8.xml:118(term) useradd.8.xml:137(term)
+#: usermod.8.xml:118(term) useradd.8.xml:149(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -461,14 +473,15 @@
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: usermod.8.xml:123(para)
+#, fuzzy
 msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
 "The groups are subject to the same restrictions as the group given with the "
 "<option>-g</option> option. If the user is currently a member of a group "
 "which is not listed, the user will be removed from the group. This behaviour "
-"can be changed via <option>-a</option> option, which appends user to the "
-"current supplementary group list."
+"can be changed via the <option>-a</option> option, which appends the user to "
+"the current supplementary group list."
 msgstr ""
 "Список дополнительных групп, в которых числится пользователь. Перечисление "
 "групп осуществляется через запятую, без промежуточных пробелов. На указанные "
@@ -489,11 +502,12 @@
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: usermod.8.xml:141(para)
+#, fuzzy
 msgid ""
 "The name of the user will be changed from <emphasis remap=\"I\">LOGIN</"
 "emphasis> to <emphasis remap=\"I\">NEW_LOGIN</emphasis>. Nothing else is "
 "changed. In particular, the user's home directory name should probably be "
-"changed to reflect the new login name."
+"changed manually to reflect the new login name."
 msgstr ""
 "Имя пользователя будет изменено с emphasis remap=\"I\">ИМЯ</emphasis> на "
 "<emphasis remap=\"I\">НОВОЕ_ИМЯ</emphasis>. Больше ничего не меняется. В "
@@ -516,12 +530,19 @@
 "используйте этот параметр вместе с <option>-p</option> или <option>-U</"
 "option>."
 
-#: usermod.8.xml:164(term) useradd.8.xml:206(term) groupmod.8.xml:75(term)
+#: usermod.8.xml:161(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:170(term) useradd.8.xml:218(term) groupmod.8.xml:78(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:168(para)
+#: usermod.8.xml:174(para)
 msgid ""
 "When used with the <option>-u</option> option, this option allows to change "
 "the user ID to a non-unique value."
@@ -529,7 +550,7 @@
 "При использовании с параметром <option>-u</option>, этот параметр позволяет "
 "указывать не уникальный числовой идентификатор пользователя."
 
-#: usermod.8.xml:175(term) useradd.8.xml:214(term)
+#: usermod.8.xml:181(term) useradd.8.xml:226(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -537,7 +558,7 @@
 "<option>-p</option>, <option>--password</option><replaceable>ПАРОЛЬ</"
 "replaceable>"
 
-#: usermod.8.xml:180(para)
+#: usermod.8.xml:186(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
@@ -546,15 +567,16 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>."
 
-#: usermod.8.xml:188(term) useradd.8.xml:227(term) useradd.8.xml:315(term)
+#: usermod.8.xml:194(term) useradd.8.xml:239(term) useradd.8.xml:328(term)
 #: su.1.xml:108(term) chsh.1.xml:50(term)
-msgid "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
+msgid ""
+"<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>ОБОЛОЧКА</"
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:193(para) chsh.1.xml:54(para)
+#: usermod.8.xml:199(para) chsh.1.xml:54(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."
@@ -562,12 +584,14 @@
 "Имя новой регистрационной оболочки пользователя. Если задать пустое "
 "значение, то будет использована регистрационная оболочка по умолчанию."
 
-#: usermod.8.xml:200(term) useradd.8.xml:240(term)
-msgid "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
-msgstr "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+#: usermod.8.xml:206(term) useradd.8.xml:252(term)
+msgid ""
+"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:205(para)
+#: usermod.8.xml:211(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. Values "
@@ -584,12 +608,12 @@
 "изменён автоматически. Для файлов, расположенных вне домашнего каталога "
 "идентификатор нужно изменять вручную."
 
-#: usermod.8.xml:218(term)
+#: usermod.8.xml:224(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:222(para)
+#: usermod.8.xml:228(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</"
@@ -599,17 +623,26 @@
 "начала шифрованного пароля. Не используйте этот параметр вместе с <option>-"
 "p</option> или <option>-L</option>."
 
+#: usermod.8.xml:233(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 <replaceable>EXPIRE</"
+"replaceable> value from <filename>/etc/default/useradd</filename>)."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><title>
-#: usermod.8.xml:233(title) userdel.8.xml:169(title) useradd.8.xml:343(title)
-#: su.1.xml:168(title) shadow.3.xml:164(title) passwd.1.xml:311(title)
+#: usermod.8.xml:247(title) userdel.8.xml:170(title) useradd.8.xml:351(title)
+#: su.1.xml:168(title) shadow.3.xml:164(title) passwd.1.xml:313(title)
 #: newusers.8.xml:82(title) login.1.xml:164(title) lastlog.8.xml:125(title)
-#: groupdel.8.xml:36(title) groupadd.8.xml:136(title) faillog.8.xml:121(title)
-#: chpasswd.8.xml:77(title) chgpasswd.8.xml:76(title)
+#: groupdel.8.xml:36(title) groupadd.8.xml:138(title) gpasswd.1.xml:166(title)
+#: faillog.8.xml:121(title) chpasswd.8.xml:118(title)
+#: chgpasswd.8.xml:117(title)
 msgid "CAVEATS"
 msgstr "ПРЕДОСТЕРЕЖЕНИЯ"
 
 # type: Content of: <refentry><refsect1><para>
-#: usermod.8.xml:234(para)
+#: usermod.8.xml:248(para)
 msgid ""
 "<command>usermod</command> will not allow you to change the name of a user "
 "who is logged in. You must make certain that the named user is not executing "
@@ -627,7 +660,7 @@
 "нужно изменять вручную. Также вручную нужно сделать все изменения связанные "
 "с NIS на сервере NIS."
 
-#: usermod.8.xml:271(para)
+#: usermod.8.xml:285(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -667,7 +700,7 @@
 
 # type: Content of: <refentry><refsect1><para><command>
 #: userdel.8.xml:5(refentrytitle) userdel.8.xml:10(refname)
-#: userdel.8.xml:15(command) login.defs.5.xml:221(term)
+#: userdel.8.xml:15(command) login.defs.5.xml:377(term)
 msgid "userdel"
 msgstr "userdel"
 
@@ -677,10 +710,11 @@
 msgstr "удаляет учётную запись и файлы пользователя"
 
 #: userdel.8.xml:25(para)
+#, fuzzy
 msgid ""
 "The <command>userdel</command> command modifies the system account files, "
-"deleting all entries that refer to <emphasis remap=\"I\">login_name</"
-"emphasis>. The named user must exist."
+"deleting all entries that refer to the user name <emphasis remap=\"I"
+"\">LOGIN</emphasis>. The named user must exist."
 msgstr ""
 "Команда <command>userdel</command> изменяет системные файлы учётных записей, "
 "удаляя все записи, относящиеся к указанному <emphasis remap=\"I"
@@ -697,11 +731,12 @@
 msgstr "<option>-f</option>, <option>--force</option>"
 
 #: userdel.8.xml:43(para)
+#, fuzzy
 msgid ""
-"This option forces the removal of the user, even if she is still logged in. "
-"It also forces <command>userdel</command> to remove the user's home "
-"directory or her mail spool, even if another user uses the same home "
-"directory or if the mail spool is not owned by the specified user. If "
+"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 "
 "<emphasis>USERGROUPS_ENAB</emphasis> 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 "
@@ -718,7 +753,7 @@
 "если она всё ещё является первичной группой другого пользователя."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:55(para)
+#: userdel.8.xml:56(para)
 msgid ""
 "<emphasis>Note:</emphasis> This option is dangerous and may leave your "
 "system in an inconsistent state."
@@ -726,12 +761,12 @@
 "<emphasis>Примечание:</emphasis> Этот параметр опасно использовать; он может "
 "привести систему в нерабочее состояние."
 
-#: userdel.8.xml:68(term)
+#: userdel.8.xml:69(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:72(para)
+#: userdel.8.xml:73(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 "
@@ -741,7 +776,7 @@
 "каталогом и почтовым ящиком. Пользовательские файлы, расположенные в других "
 "файловых системах, нужно искать и удалять вручную."
 
-#: userdel.8.xml:78(para)
+#: userdel.8.xml:79(para)
 msgid ""
 "The mail spool is defined by the <emphasis>MAIL_DIR</emphasis> variable in "
 "the <filename>login.defs</filename> file."
@@ -750,47 +785,49 @@
 "в файле <filename>login.defs</filename>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: userdel.8.xml:97(filename) useradd.8.xml:396(filename)
-#: pwconv.8.xml:112(filename) newusers.8.xml:93(filename)
-#: login.access.5.xml:69(filename) groupadd.8.xml:127(filename)
-#: chsh.1.xml:100(filename) chfn.1.xml:63(filename)
+#: userdel.8.xml:98(filename) useradd.8.xml:404(filename)
+#: pwconv.8.xml:112(filename) newusers.8.xml:123(filename)
+#: login.access.5.xml:69(filename) groupadd.8.xml:129(filename)
+#: chsh.1.xml:100(filename) chpasswd.8.xml:263(filename)
+#: chgpasswd.8.xml:140(filename) chfn.1.xml:63(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:99(para) useradd.8.xml:398(para) pwconv.8.xml:114(para)
-#: newusers.8.xml:95(para) login.access.5.xml:71(para)
-#: groupadd.8.xml:129(para) chsh.1.xml:102(para) chfn.1.xml:65(para)
+#: userdel.8.xml:100(para) useradd.8.xml:406(para) pwconv.8.xml:114(para)
+#: newusers.8.xml:125(para) login.access.5.xml:71(para)
+#: groupadd.8.xml:131(para) chsh.1.xml:102(para) chpasswd.8.xml:265(para)
+#: chgpasswd.8.xml:142(para) chfn.1.xml:65(para)
 msgid "Shadow password suite configuration."
 msgstr "содержит конфигурацию подсистемы теневых паролей"
 
 # type: Content of: <refentry><refsect1><title>
-#: userdel.8.xml:118(title) useradd.8.xml:405(title) pwck.8.xml:186(title)
-#: passwd.1.xml:340(title) grpck.8.xml:129(title) groupmod.8.xml:107(title)
-#: groupdel.8.xml:61(title) groupadd.8.xml:154(title) chage.1.xml:199(title)
+#: userdel.8.xml:119(title) useradd.8.xml:413(title) pwck.8.xml:186(title)
+#: passwd.1.xml:342(title) grpck.8.xml:129(title) groupmod.8.xml:110(title)
+#: groupdel.8.xml:61(title) groupadd.8.xml:159(title) chage.1.xml:199(title)
 msgid "EXIT VALUES"
 msgstr "ВОЗВРАЩАЕМЫЕ ЗНАЧЕНИЯ"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:123(replaceable) useradd.8.xml:410(replaceable)
-#: pwck.8.xml:191(replaceable) passwd.1.xml:345(replaceable)
-#: grpck.8.xml:134(replaceable) groupmod.8.xml:112(replaceable)
-#: groupdel.8.xml:66(replaceable) groupadd.8.xml:159(replaceable)
+#: userdel.8.xml:124(replaceable) useradd.8.xml:418(replaceable)
+#: pwck.8.xml:191(replaceable) passwd.1.xml:347(replaceable)
+#: grpck.8.xml:134(replaceable) groupmod.8.xml:115(replaceable)
+#: groupdel.8.xml:66(replaceable) groupadd.8.xml:164(replaceable)
 #: chage.1.xml:204(replaceable)
 msgid "0"
 msgstr "0"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:125(para) useradd.8.xml:412(para) pwck.8.xml:193(para)
-#: passwd.1.xml:347(para) grpck.8.xml:136(para) groupmod.8.xml:114(para)
-#: groupdel.8.xml:68(para) groupadd.8.xml:161(para) chage.1.xml:206(para)
+#: userdel.8.xml:126(para) useradd.8.xml:420(para) pwck.8.xml:193(para)
+#: passwd.1.xml:349(para) grpck.8.xml:136(para) groupmod.8.xml:117(para)
+#: groupdel.8.xml:68(para) groupadd.8.xml:166(para) chage.1.xml:206(para)
 msgid "success"
 msgstr "успешное выполнение"
 
 # type: Content of: <refentry><refmeta><manvolnum>
-#: userdel.8.xml:129(replaceable) useradd.8.xml:416(replaceable)
+#: userdel.8.xml:130(replaceable) useradd.8.xml:424(replaceable)
 #: su.1.xml:6(manvolnum) sg.1.xml:6(manvolnum) pwck.8.xml:197(replaceable)
-#: passwd.1.xml:6(manvolnum) passwd.1.xml:351(replaceable)
+#: passwd.1.xml:6(manvolnum) passwd.1.xml:353(replaceable)
 #: newgrp.1.xml:6(manvolnum) login.1.xml:6(manvolnum)
 #: grpck.8.xml:140(replaceable) groups.1.xml:6(manvolnum)
 #: gpasswd.1.xml:6(manvolnum) expiry.1.xml:6(manvolnum)
@@ -800,68 +837,68 @@
 msgstr "1"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:131(para) useradd.8.xml:418(para)
+#: userdel.8.xml:132(para) useradd.8.xml:426(para)
 msgid "can't update password file"
 msgstr "не удалось изменить файл паролей"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:135(replaceable) useradd.8.xml:422(replaceable)
-#: pwck.8.xml:203(replaceable) passwd.1.xml:357(replaceable)
-#: grpck.8.xml:146(replaceable) groupmod.8.xml:118(replaceable)
-#: groupdel.8.xml:72(replaceable) groupadd.8.xml:165(replaceable)
+#: userdel.8.xml:136(replaceable) useradd.8.xml:430(replaceable)
+#: pwck.8.xml:203(replaceable) passwd.1.xml:359(replaceable)
+#: grpck.8.xml:146(replaceable) groupmod.8.xml:121(replaceable)
+#: groupdel.8.xml:72(replaceable) groupadd.8.xml:170(replaceable)
 #: chage.1.xml:216(replaceable)
 msgid "2"
 msgstr "2"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:137(para) useradd.8.xml:424(para) pwck.8.xml:199(para)
-#: grpck.8.xml:142(para) groupmod.8.xml:120(para) groupdel.8.xml:74(para)
-#: groupadd.8.xml:167(para) chage.1.xml:218(para)
+#: userdel.8.xml:138(para) useradd.8.xml:432(para) pwck.8.xml:199(para)
+#: grpck.8.xml:142(para) groupmod.8.xml:123(para) groupdel.8.xml:74(para)
+#: groupadd.8.xml:172(para) chage.1.xml:218(para)
 msgid "invalid command syntax"
 msgstr "ошибка в параметрах команды"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:141(replaceable) useradd.8.xml:440(replaceable)
-#: passwd.1.xml:381(replaceable) groupmod.8.xml:136(replaceable)
+#: userdel.8.xml:142(replaceable) useradd.8.xml:448(replaceable)
+#: passwd.1.xml:383(replaceable) groupmod.8.xml:139(replaceable)
 #: groupdel.8.xml:78(replaceable)
 msgid "6"
 msgstr "6"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:143(para)
+#: userdel.8.xml:144(para)
 msgid "specified user doesn't exist"
 msgstr "указанный пользователь не существует"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:149(para)
+#: userdel.8.xml:150(para)
 msgid "user currently logged in"
 msgstr "пользователь сейчас работает в системе"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:153(replaceable) useradd.8.xml:452(replaceable)
-#: groupmod.8.xml:148(replaceable) groupdel.8.xml:90(replaceable)
-#: groupadd.8.xml:189(replaceable)
+#: userdel.8.xml:154(replaceable) useradd.8.xml:460(replaceable)
+#: groupmod.8.xml:151(replaceable) groupdel.8.xml:90(replaceable)
+#: groupadd.8.xml:194(replaceable)
 msgid "10"
 msgstr "10"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:155(para) useradd.8.xml:454(para) groupmod.8.xml:150(para)
-#: groupdel.8.xml:92(para) groupadd.8.xml:191(para)
+#: userdel.8.xml:156(para) useradd.8.xml:462(para) groupmod.8.xml:153(para)
+#: groupdel.8.xml:92(para) groupadd.8.xml:196(para)
 msgid "can't update group file"
 msgstr "не удалось изменить файл групп"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:159(replaceable) useradd.8.xml:458(replaceable)
+#: userdel.8.xml:160(replaceable) useradd.8.xml:466(replaceable)
 msgid "12"
 msgstr "12"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:161(para)
+#: userdel.8.xml:162(para)
 msgid "can't remove home directory"
 msgstr "не удалось удалить домашний каталог"
 
 # type: Content of: <refentry><refsect1><para>
-#: userdel.8.xml:119(para)
+#: userdel.8.xml:120(para)
 msgid ""
 "The <command>userdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -870,7 +907,7 @@
 "значения: <placeholder-1/>"
 
 # type: Content of: <refentry><refsect1><para>
-#: userdel.8.xml:170(para)
+#: userdel.8.xml:171(para)
 msgid ""
 "<command>userdel</command> will not allow you to remove an account if the "
 "user is currently logged in. You must kill any running processes which "
@@ -881,7 +918,7 @@
 "запущенные процессы, принадлежащие учётной записи, которую нужно удалить."
 
 # type: Content of: <refentry><refsect1><para>
-#: userdel.8.xml:175(para)
+#: userdel.8.xml:176(para)
 msgid ""
 "You may not remove any NIS attributes on a NIS client. This must be "
 "performed on the NIS server."
@@ -889,7 +926,7 @@
 "Нельзя удалить NIS атрибуты клиента NIS. Это необходимо сделать на NIS "
 "сервере."
 
-#: userdel.8.xml:178(para)
+#: userdel.8.xml:179(para)
 msgid ""
 "If <emphasis>USERGROUPS_ENAB</emphasis> is defined to <emphasis remap=\"I"
 "\">yes</emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -908,7 +945,7 @@
 "предупреждение без удаления, если такое случится. Параметр <option>-f</"
 "option> поможет удалить группу в любом случае."
 
-#: userdel.8.xml:191(para)
+#: userdel.8.xml:192(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -945,7 +982,7 @@
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
 #: useradd.8.xml:5(refentrytitle) useradd.8.xml:10(refname)
 #: useradd.8.xml:15(command) useradd.8.xml:22(command)
-#: useradd.8.xml:26(command) login.defs.5.xml:210(term)
+#: useradd.8.xml:26(command) login.defs.5.xml:366(term)
 msgid "useradd"
 msgstr "useradd"
 
@@ -957,18 +994,20 @@
 "новых пользователях"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: useradd.8.xml:23(arg) useradd.8.xml:27(arg)
+#: useradd.8.xml:23(arg) useradd.8.xml:27(arg) useradd.8.xml:83(option)
 msgid "-D"
 msgstr "-D"
 
 # type: Content of: <refentry><refsect1><para>
 #: useradd.8.xml:36(para)
+#, fuzzy
 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 and the default values from the system. Depending on "
-"command line options, the useradd command will update system files and may "
-"also create the new user's home directory and copy initial files."
+"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 ""
 "При запуске без параметра <option>-D</option>, команда <command>useradd</"
 "command> создаёт новую учётную запись пользователя, используя значения из "
@@ -978,12 +1017,12 @@
 "настроек."
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:48(para)
+#: useradd.8.xml:49(para)
 msgid "The options which apply to the <command>useradd</command> command are:"
 msgstr "Параметры команды <command>useradd</command>:"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:57(para)
+#: useradd.8.xml:58(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."
@@ -991,7 +1030,7 @@
 "Любая текстовая строка. Обычно, здесь коротко описывается учётная запись, и "
 "в настоящее время используется как поле для имени и фамилии пользователя."
 
-#: useradd.8.xml:65(term) useradd.8.xml:266(term)
+#: useradd.8.xml:66(term) useradd.8.xml:279(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
@@ -999,12 +1038,14 @@
 "<option>-b</option>, <option>--base-dir</"
 "option><replaceable>БАЗОВЫЙ_КАТАЛОГ</replaceable>"
 
-#: useradd.8.xml:70(para)
+#: useradd.8.xml:71(para)
+#, fuzzy
 msgid ""
-"The default base directory for the system if <option>-d</option> dir 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."
+"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 ""
 "Базовый системный каталог по умолчанию, если другой каталог не указан с "
 "помощью параметра <option>-d</option>. <replaceable>БАЗОВЫЙ_КАТАЛОГ</"
@@ -1012,7 +1053,13 @@
 "каталога. Если не используется параметр <option>-m</option>, то "
 "<replaceable>БАЗОВЫЙ_КАТАЛОГ</replaceable> должен существовать."
 
-#: useradd.8.xml:85(para)
+# type: Content of: <refentry><refsect1><refsect2><title>
+#: useradd.8.xml:86(para)
+#, fuzzy
+msgid "See below, the subsection \"Changing the default values\"."
+msgstr "Изменение значений по умолчанию"
+
+#: useradd.8.xml:97(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 "
@@ -1030,7 +1077,7 @@
 "и не будет создан, если его нет."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:128(para)
+#: useradd.8.xml:140(para)
 msgid ""
 "The group name or number of the user's initial login group. The group name "
 "must exist. A group number must refer to an already existing group. The "
@@ -1043,7 +1090,7 @@
 "значению указанному в файле <filename>/etc/default/useradd</filename>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:142(para)
+#: useradd.8.xml:154(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. "
@@ -1057,11 +1104,11 @@
 "<option>-g</option>. По умолчанию пользователь входит только в начальную "
 "группу."
 
-#: useradd.8.xml:159(term)
+#: useradd.8.xml:171(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:163(para)
+#: useradd.8.xml:175(para)
 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 "
@@ -1083,7 +1130,7 @@
 "с параметром <option>-m</option>. По умолчанию, домашний каталог не "
 "создаётся и файлы не копируются."
 
-#: useradd.8.xml:179(term)
+#: useradd.8.xml:191(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -1091,7 +1138,7 @@
 "<option>-K</option>, <option>--key</option><replaceable>КЛЮЧ</"
 "replaceable>=<replaceable>ЗНАЧЕНИЕ</replaceable>"
 
-#: useradd.8.xml:184(para)
+#: useradd.8.xml:196(para)
 msgid ""
 "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS "
 "and others). <placeholder-1/> Example: <option>-K </"
@@ -1114,7 +1161,7 @@
 "replaceable><option> -K </option><replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable>"
 
-#: useradd.8.xml:198(para)
+#: useradd.8.xml:210(para)
 msgid ""
 "Note: <option>-K </option><replaceable>UID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
@@ -1125,11 +1172,11 @@
 "replaceable>=<replaceable>499</replaceable> пока не работает."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:210(para)
+#: useradd.8.xml:222(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr "Позволяет создать учётную запись с уже имеющимся (не уникальным) UID."
 
-#: useradd.8.xml:219(para)
+#: useradd.8.xml:231(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
@@ -1140,7 +1187,7 @@
 "citerefentry>. По умолчанию учётная запись заблокирована."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:232(para)
+#: useradd.8.xml:244(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."
@@ -1149,7 +1196,7 @@
 "будет использована регистрационная оболочка по умолчанию."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:245(para)
+#: useradd.8.xml:257(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -1164,28 +1211,31 @@
 "до 999 обычно зарезервированы для системных учётных записей."
 
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: useradd.8.xml:257(title)
+#: useradd.8.xml:269(title)
 msgid "Changing the default values"
 msgstr "Изменение значений по умолчанию"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: useradd.8.xml:258(para)
+#: useradd.8.xml:270(para)
+#, fuzzy
 msgid ""
-"When invoked with the <option>-D</option> option, <command>useradd</command> "
-"will either display the current default values, or update the default values "
-"from the command line. The valid options are"
+"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 ""
 "При запуске программы с параметром <option>-D</option> команда "
 "<command>useradd</command> показывает текущие значения по умолчанию или "
 "изменяет их, если указаны дополнительные параметры в командной строке. "
 "Допустимые параметры:"
 
-#: useradd.8.xml:271(para)
+#: useradd.8.xml:284(para)
+#, fuzzy
 msgid ""
-"The initial path prefix for a new user's home directory. The user's name "
-"will be affixed to the end of <replaceable>HOME_DIR</replaceable> to create "
-"the new directory name if the <option>-d</option> option is not used when "
-"creating a new account."
+"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 ""
 "Начальная часть пути нового домашнего каталога пользователя. Имя "
 "пользователя будет добавлено в конец <replaceable>ДОМАШНЕГО_КАТАЛОГА</"
@@ -1193,12 +1243,12 @@
 "<option>-d</option> при создании новой учётной записи."
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:286(para)
+#: useradd.8.xml:299(para)
 msgid "The date on which the user account is disabled."
 msgstr "Дата, когда учётная запись пользователя заблокирована."
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:295(para)
+#: useradd.8.xml:308(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
@@ -1207,7 +1257,7 @@
 "учётная запись будет заблокирована."
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:307(para)
+#: useradd.8.xml:320(para)
 msgid ""
 "The group name or ID for a new user's initial group. The named group must "
 "exist, and a numerical group ID must have an existing entry."
@@ -1216,30 +1266,17 @@
 "таким именем должна существовать и для числового идентификатора должна быть "
 "запись."
 
-# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:320(para)
-msgid ""
-"The name of the new user's login shell. The named program will be used for "
-"all future new user accounts."
+#: useradd.8.xml:333(para)
+msgid "The name of a new user's login shell."
 msgstr ""
-"Имя новой регистрационной оболочки пользователя. Данная программа будет "
-"использована для всех новых пользовательских учётных записей."
 
-#: useradd.8.xml:328(para)
-msgid ""
-"If no options are specified, <command>useradd</command> displays the current "
-"default values."
-msgstr ""
-"Если программа запущена без параметров, <command>useradd</command> покажет "
-"текущие значения по умолчанию."
-
 # type: Content of: <refentry><refsect1><title>
-#: useradd.8.xml:336(title)
+#: useradd.8.xml:344(title)
 msgid "NOTES"
 msgstr "ЗАМЕЧАНИЯ"
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:337(para)
+#: useradd.8.xml:345(para)
 msgid ""
 "The system administrator is responsible for placing the default user files "
 "in the <filename>/etc/skel/</filename> directory."
@@ -1248,27 +1285,29 @@
 "<filename>/etc/skel/</filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:344(para)
+#: useradd.8.xml:352(para)
+#, fuzzy
 msgid ""
-"You may not add a user to a NIS group. This must be performed on the NIS "
-"server."
+"You may not add a user to a NIS or LDAP group. This must be performed on the "
+"corresponding server."
 msgstr ""
 "Нельзя добавить пользователя в NIS группу. Это необходимо делать на NIS "
 "сервере."
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:349(para)
+#: useradd.8.xml:357(para)
+#, fuzzy
 msgid ""
 "Similarly, if the username already exists in an external user database such "
-"as NIS, <command>useradd</command> will deny the user account creation "
-"request."
+"as NIS or LDAP, <command>useradd</command> will deny the user account "
+"creation request."
 msgstr ""
 "Также, если имя пользователя уже существует во внешней базе данных такой как "
 "NIS, то <command>useradd</command> не станет создавать учётную запись "
 "пользователя."
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:355(para)
+#: useradd.8.xml:363(para)
 msgid ""
 "Usernames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
@@ -1280,85 +1319,85 @@
 "выражением: [a-z_][a-z0-9_-]*[$]"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: useradd.8.xml:384(filename)
+#: useradd.8.xml:392(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:386(para)
+#: useradd.8.xml:394(para)
 msgid "Default values for account creation."
 msgstr "содержит защищаемую информацию о пользователях"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: useradd.8.xml:390(filename)
+#: useradd.8.xml:398(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:392(para)
+#: useradd.8.xml:400(para)
 msgid "Directory containing default files."
 msgstr "каталог, содержащий пользовательские файлы по умолчанию"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: useradd.8.xml:428(replaceable) shadow.3.xml:6(manvolnum)
-#: pwck.8.xml:209(replaceable) passwd.1.xml:363(replaceable)
-#: grpck.8.xml:152(replaceable) groupmod.8.xml:124(replaceable)
-#: groupadd.8.xml:171(replaceable)
+#: useradd.8.xml:436(replaceable) shadow.3.xml:6(manvolnum)
+#: pwck.8.xml:209(replaceable) passwd.1.xml:365(replaceable)
+#: grpck.8.xml:152(replaceable) groupmod.8.xml:127(replaceable)
+#: groupadd.8.xml:176(replaceable)
 msgid "3"
 msgstr "3"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:430(para) passwd.1.xml:383(para) groupmod.8.xml:126(para)
-#: groupadd.8.xml:173(para)
+#: useradd.8.xml:438(para) passwd.1.xml:385(para) groupmod.8.xml:129(para)
+#: groupadd.8.xml:178(para)
 msgid "invalid argument to option"
 msgstr "недопустимое значение параметра"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: useradd.8.xml:434(replaceable) pwck.8.xml:215(replaceable)
-#: passwd.1.xml:369(replaceable) grpck.8.xml:158(replaceable)
-#: groupmod.8.xml:130(replaceable) groupadd.8.xml:177(replaceable)
+#: useradd.8.xml:442(replaceable) pwck.8.xml:215(replaceable)
+#: passwd.1.xml:371(replaceable) grpck.8.xml:158(replaceable)
+#: groupmod.8.xml:133(replaceable) groupadd.8.xml:182(replaceable)
 msgid "4"
 msgstr "4"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:436(para)
+#: useradd.8.xml:444(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:442(para) groupmod.8.xml:132(para) groupmod.8.xml:138(para)
+#: useradd.8.xml:450(para) groupmod.8.xml:135(para) groupmod.8.xml:141(para)
 #: groupdel.8.xml:80(para)
 msgid "specified group doesn't exist"
 msgstr "указанная группа не существует"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: useradd.8.xml:446(replaceable) groupmod.8.xml:142(replaceable)
-#: groupadd.8.xml:183(replaceable)
+#: useradd.8.xml:454(replaceable) groupmod.8.xml:145(replaceable)
+#: groupadd.8.xml:188(replaceable)
 msgid "9"
 msgstr "9"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:448(para)
+#: useradd.8.xml:456(para)
 msgid "username already in use"
 msgstr "имя пользователя уже существует"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:460(para)
+#: useradd.8.xml:468(para)
 msgid "can't create home directory"
 msgstr "не удалось создать домашний каталог"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: useradd.8.xml:464(replaceable)
+#: useradd.8.xml:472(replaceable)
 msgid "13"
 msgstr "13"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:466(para)
+#: useradd.8.xml:474(para)
 msgid "can't create mail spool"
 msgstr "не удалось создать почтовый ящик"
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:406(para)
+#: useradd.8.xml:414(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1366,7 +1405,7 @@
 "Команда <command>useradd</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: useradd.8.xml:475(para)
+#: useradd.8.xml:483(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1412,7 +1451,7 @@
 # type: Content of: <refentry><refsect1><para><citerefentry><manvolnum>
 #: suauth.5.xml:6(manvolnum) shadow.5.xml:6(manvolnum)
 #: pwck.8.xml:221(replaceable) porttime.5.xml:6(manvolnum)
-#: passwd.5.xml:6(manvolnum) passwd.1.xml:375(replaceable)
+#: passwd.5.xml:6(manvolnum) passwd.1.xml:377(replaceable)
 #: login.defs.5.xml:6(manvolnum) login.access.5.xml:6(manvolnum)
 #: limits.5.xml:6(manvolnum) gshadow.5.xml:6(manvolnum)
 #: grpck.8.xml:164(replaceable) faillog.5.xml:6(manvolnum)
@@ -1463,7 +1502,8 @@
 # type: Content of: <refentry><refsect1><para>
 #. .fi
 #: suauth.5.xml:33(para)
-msgid "2) the user executing the su command (or any groups he might be a member of)"
+msgid ""
+"2) the user executing the su command (or any groups he might be a member of)"
 msgstr ""
 "2) пользователя, запустившего команду su (или группы, членом которой он "
 "может быть)"
@@ -1540,7 +1580,8 @@
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: suauth.5.xml:83(para)
-msgid "The attempt to su is automatically successful; no password is asked for."
+msgid ""
+"The attempt to su is automatically successful; no password is asked for."
 msgstr "Команда su выполняется без запроса пароля."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><emphasis>
@@ -1628,7 +1669,7 @@
 "    "
 
 # type: Content of: <refentry><refsect1><title>
-#: suauth.5.xml:149(title) pwconv.8.xml:98(title) login.defs.5.xml:239(title)
+#: suauth.5.xml:149(title) pwconv.8.xml:98(title) login.defs.5.xml:395(title)
 msgid "BUGS"
 msgstr "ОШИБКИ РЕАЛИЗАЦИИ"
 
@@ -1695,10 +1736,10 @@
 msgstr ""
 "Программа <command>su</command> используется для того, чтобы пользователь "
 "мог стать другим пользователем в текущей сессии. Если <command>su</command> "
-"вызывается без <option>имени_пользователя</option>, то это по умолчанию делает "
-"пользователя суперпользователем. Необязательный параметр <option>-</option> "
-"можно использовать для воссоздания рабочей среды, такой же как если бы "
-"настоящий пользователь выполнял вход в систему."
+"вызывается без <option>имени_пользователя</option>, то это по умолчанию "
+"делает пользователя суперпользователем. Необязательный параметр <option>-</"
+"option> можно использовать для воссоздания рабочей среды, такой же как если "
+"бы настоящий пользователь выполнял вход в систему."
 
 #: su.1.xml:38(para)
 msgid ""
@@ -1743,8 +1784,8 @@
 "<emphasis>ENV_SUPATH</emphasis> definitions in <filename>/etc/login.defs</"
 "filename>."
 msgstr ""
-"Текущая рабочая среда передаётся новой оболочке. Значение <envar>$PATH</envar> "
-"устанавливается равным <filename>/bin:/usr/bin</filename> для обычных "
+"Текущая рабочая среда передаётся новой оболочке. Значение <envar>$PATH</"
+"envar> устанавливается равным <filename>/bin:/usr/bin</filename> для обычных "
 "пользователей, или <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> для "
 "суперпользователя. Эти значения можно изменить в переменных "
 "<emphasis>ENV_PATH</emphasis> и <emphasis>ENV_SUPATH</emphasis> в файле "
@@ -1844,7 +1885,8 @@
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: su.1.xml:114(para)
-msgid "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
+msgid ""
+"The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 "Запущенная оболочка выбирается из (в порядке убывания приоритета): "
 "<placeholder-1/>"
@@ -2060,9 +2102,10 @@
 
 # type: Content of: <refentry><refsect1><para>
 #: shadow.5.xml:51(para)
+#, fuzzy
 msgid ""
 "The password field must be filled. The encrypted password consists of 13 to "
-"24 characters from the 64 characters alphabet a thru z, A thru Z, 0 thru 9, "
+"24 characters from the 64 character alphabet a thru z, A thru Z, 0 thru 9, "
 "\\. and /. Optionally it can start with a \"$\" character. This means the "
 "encrypted password was generated using another (not DES) algorithm. For "
 "example if it starts with \"$1$\" it means the MD5-based algorithm was used."
@@ -2327,7 +2370,8 @@
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: shadow.3.xml:88(para)
 msgid "sp_pwdp - pointer to null-terminated password"
-msgstr "sp_pwdp - указатель на строку с паролем, завершающуюся нулевым символом"
+msgstr ""
+"sp_pwdp - указатель на строку с паролем, завершающуюся нулевым символом"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: shadow.3.xml:91(para)
@@ -2463,7 +2507,7 @@
 
 # type: Content of: <refentry><refsect1><para><command>
 #: pwconv.8.xml:5(refentrytitle) pwconv.8.xml:10(refname)
-#: pwconv.8.xml:19(command) login.defs.5.xml:204(term)
+#: pwconv.8.xml:19(command) login.defs.5.xml:360(term)
 msgid "pwconv"
 msgstr "pwconv"
 
@@ -2652,7 +2696,7 @@
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
 #: pwck.8.xml:31(arg) pwck.8.xml:114(option) login.1.xml:148(option)
-#: grpck.8.xml:16(arg)
+#: grpck.8.xml:16(arg) gpasswd.1.xml:112(option)
 msgid "-r"
 msgstr "-r"
 
@@ -3374,15 +3418,17 @@
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: passwd.1.xml:215(para)
+#, fuzzy
 msgid ""
 "Lock the named account. This option disables an account by changing the "
-"password to a value which matches no possible encrypted value."
+"password to a value which matches no possible encrypted value, and by "
+"setting the account expiry field to 1."
 msgstr ""
 "Заблокировать указанную учётную запись. Этот параметр блокирует учётную "
 "запись изменяя значение пароля на вариант, который не может быть шифрованным "
 "паролем."
 
-#: passwd.1.xml:222(term) chage.1.xml:109(term)
+#: passwd.1.xml:223(term) chage.1.xml:109(term)
 msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -3391,7 +3437,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:226(para) chage.1.xml:113(para)
+#: passwd.1.xml:227(para) chage.1.xml:113(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -3401,7 +3447,7 @@
 "пароля. Нулевое значение этого поля указывает на то, что пользователь может "
 "менять свой пароль когда захочет."
 
-#: passwd.1.xml:244(term)
+#: passwd.1.xml:245(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -3409,16 +3455,16 @@
 "<option>-r</option>, <option>--repository</option><replaceable>РЕПОЗИТОРИЙ</"
 "replaceable>"
 
-#: passwd.1.xml:248(para)
+#: passwd.1.xml:249(para)
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr "Изменить пароль в <replaceable>РЕПОЗИТОРИИ</replaceable>."
 
-#: passwd.1.xml:254(term)
+#: passwd.1.xml:255(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:258(para)
+#: passwd.1.xml:259(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 "
@@ -3435,22 +3481,23 @@
 "выдачи предупреждения и период неактивности пароля. Эти сроки измеряются в "
 "днях."
 
-#: passwd.1.xml:271(term)
+#: passwd.1.xml:272(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:275(para)
+#: passwd.1.xml:276(para)
+#, fuzzy
 msgid ""
 "Unlock the named account. This option re-enables an account by changing the "
 "password back to its previous value (to value before using <option>-l</"
-"option> option)."
+"option> option), and by resetting the account expiry field."
 msgstr ""
 "Разблокировать указанную учётную запись. Этот параметр активирует учётную "
 "запись изменяя пароль на прежнее значение (которое было перед использованием "
 "параметра <option>-l</option>)."
 
-#: passwd.1.xml:283(term)
+#: passwd.1.xml:285(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -3459,7 +3506,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:287(para)
+#: passwd.1.xml:289(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 "
@@ -3471,7 +3518,7 @@
 "дней перед тем как пароль устареет, в течении которых пользователю будут "
 "напоминать, что пароль скоро устареет."
 
-#: passwd.1.xml:296(term)
+#: passwd.1.xml:298(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -3480,7 +3527,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:300(para)
+#: passwd.1.xml:302(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -3489,7 +3536,7 @@
 "рабочим. После <replaceable>МАКС_ДНЕЙ</replaceable> пароль нужно изменить."
 
 # type: Content of: <refentry><refsect1><para>
-#: passwd.1.xml:312(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Not all options may be supported. Password complexity checking may vary from "
 "site to site. The user is urged to select a password as complex as he or she "
@@ -3502,32 +3549,34 @@
 "свои пароли в системе, если включён NIS и они не вошли на сервер NIS."
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:353(para) chage.1.xml:212(para)
+#: passwd.1.xml:355(para) chage.1.xml:212(para)
 msgid "permission denied"
 msgstr "доступ запрещён"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:359(para)
+#: passwd.1.xml:361(para)
 msgid "invalid combination of options"
 msgstr "недопустимая комбинация параметров"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:365(para)
+#: passwd.1.xml:367(para)
 msgid "unexpected failure, nothing done"
 msgstr "неожиданная ошибка при работе, ничего не сделано"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:371(para)
+#: passwd.1.xml:373(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
-msgstr "неожиданная ошибка при работе, отсутствует файл <filename>passwd</filename>"
+msgstr ""
+"неожиданная ошибка при работе, отсутствует файл <filename>passwd</filename>"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:377(para)
+#: passwd.1.xml:379(para)
 msgid "<filename>passwd</filename> file busy, try again"
-msgstr "файл <filename>passwd</filename> занят другой программой, попробуйте ещё раз"
+msgstr ""
+"файл <filename>passwd</filename> занят другой программой, попробуйте ещё раз"
 
 # type: Content of: <refentry><refsect1><para>
-#: passwd.1.xml:341(para)
+#: passwd.1.xml:343(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -3535,7 +3584,7 @@
 "Программа <command>passwd</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: passwd.1.xml:392(para)
+#: passwd.1.xml:394(para)
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -3569,8 +3618,8 @@
 msgstr ""
 "Программа <command>nologin</command> выдаёт сообщение, что учётная запись "
 "недоступна и завершает работу с ненулевым кодом возврата. Она предназначена "
-"для замены оболочки командной строки в поле оболочки у заблокированных учётных "
-"записей."
+"для замены оболочки командной строки в поле оболочки у заблокированных "
+"учётных записей."
 
 #: nologin.8.xml:27(para)
 msgid ""
@@ -3603,14 +3652,15 @@
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: newusers.8.xml:5(refentrytitle) newusers.8.xml:10(refname)
-#: newusers.8.xml:16(command) login.defs.5.xml:196(term)
+#: newusers.8.xml:16(command) login.defs.5.xml:352(term)
 msgid "newusers"
 msgstr "newusers"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
 #: newusers.8.xml:11(refpurpose)
 msgid "update and create new users in batch"
-msgstr "обновляет и создаёт новые учётные записи пользователей в пакетном режиме"
+msgstr ""
+"обновляет и создаёт новые учётные записи пользователей в пакетном режиме"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: newusers.8.xml:18(replaceable)
@@ -3629,10 +3679,9 @@
 msgstr ""
 "Программа <command>newusers</command> читает файл с парами имя пользователя/"
 "нешифрованный пароль и использует эту информацию для обновления группы "
-"существующих или создания новых учётных записей. Каждая строка "
-"имеет формат стандартного файла паролей (смотрите "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>) за исключением:"
+"существующих или создания новых учётных записей. Каждая строка имеет формат "
+"стандартного файла паролей (смотрите <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>) за исключением:"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
 #: newusers.8.xml:37(emphasis)
@@ -3660,9 +3709,9 @@
 "specified, a new group will be created. In the case of a non-existent group "
 "number, both the name and the number of the new group will be this number."
 msgstr ""
-"Это поле должно содержать имя (или номер). Пользователь будет добавлен "
-"в эту группу. Если указан числовой идентификатор или имя несуществующей "
-"группы, то будет создана новая группа с данным именем и номером."
+"Это поле должно содержать имя (или номер). Пользователь будет добавлен в эту "
+"группу. Если указан числовой идентификатор или имя несуществующей группы, то "
+"будет создана новая группа с данным именем и номером."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><emphasis>
 #: newusers.8.xml:62(emphasis)
@@ -3691,13 +3740,21 @@
 
 # type: Content of: <refentry><refsect1><para>
 #: newusers.8.xml:83(para)
-msgid "The input file must be protected since it contains unencrypted passwords."
+msgid ""
+"The input file must be protected since it contains unencrypted passwords."
 msgstr ""
 "Файл с входными данными должен быть защищён, так как в нём содержатся не "
 "шифрованные пароли."
 
-#: newusers.8.xml:103(para)
+#: newusers.8.xml:87(para) chpasswd.8.xml:123(para)
 msgid ""
+"PAM is not used to update the passwords. Only <filename>/etc/passwd</"
+"filename> and <filename>/etc/shadow</filename> are updated, and the various "
+"checks or options provided by PAM modules are not used."
+msgstr ""
+
+#: newusers.8.xml:133(para)
+msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
@@ -3724,9 +3781,7 @@
 # type: Content of: <refentry><refsect1><para><emphasis>
 #: newgrp.1.xml:17(replaceable) grpck.8.xml:18(replaceable)
 #: groupdel.8.xml:18(replaceable) groupadd.8.xml:24(replaceable)
-#: gpasswd.1.xml:18(replaceable) gpasswd.1.xml:24(replaceable)
-#: gpasswd.1.xml:29(replaceable) gpasswd.1.xml:33(replaceable)
-#: gpasswd.1.xml:37(replaceable) gpasswd.1.xml:43(replaceable)
+#: gpasswd.1.xml:26(replaceable)
 msgid "group"
 msgstr "группа"
 
@@ -3783,12 +3838,14 @@
 "используется запись из файла <filename>/etc/group</filename>."
 
 #: newgrp.1.xml:85(para)
+#, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"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>, <citerefentry><refentrytitle>gshadow</"
@@ -3797,12 +3854,13 @@
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<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>, <citerefentry><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
 # type: Content of: <refentry><refsect1><para><command>
 #: logoutd.8.xml:5(refentrytitle) logoutd.8.xml:10(refname)
@@ -3884,15 +3942,17 @@
 
 # type: Content of: <refentry><refsect1><para>
 #: login.defs.5.xml:31(para)
+#, fuzzy
 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 \"yes\" or \"no\". An undefined boolean parameter or one "
-"with a value other than these will be given a \"no\" value. Numbers (both "
+"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 \"0\") or hexadecimal values (precede the value with \"0x\"). The "
-"maximum value of the regular and long numeric parameters is machine-"
-"dependent."
+"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 ""
 "Значения параметров могут быть четырёх типов: строки, логические значения, "
 "числа и длинные числа. Строки состоят из любых печатных символов. Под "
@@ -3905,19 +3965,21 @@
 "архитектуры компьютера."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:42(para)
+#: login.defs.5.xml:46(para)
 msgid "The following configuration items are provided:"
 msgstr "Возможны следующие параметры конфигурации:"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:46(term)
-msgid "CHFN_AUTH (boolean)"
+#: login.defs.5.xml:50(term)
+#, fuzzy
+msgid "<option>CHFN_AUTH</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:48(para)
+#: login.defs.5.xml:52(para)
+#, fuzzy
 msgid ""
-"If <emphasis remap=\"I\">yes</emphasis>, the <command>chfn</command> and "
+"If <replaceable>yes</replaceable>, the <command>chfn</command> and "
 "<command>chsh</command> programs will require authentication before making "
 "any changes, unless run by the superuser."
 msgstr ""
@@ -3927,22 +3989,25 @@
 "суперпользователем."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:57(term)
-msgid "CHFN_RESTRICT (string)"
+#: login.defs.5.xml:61(term)
+#, fuzzy
+msgid "<option>CHFN_RESTRICT</option> (string)"
 msgstr "CHFN_RESTRICT (строка)"
 
-#: login.defs.5.xml:59(para)
+#: login.defs.5.xml:63(para)
+#, fuzzy
 msgid ""
 "This parameter specifies which values in the <emphasis remap=\"I\">gecos</"
 "emphasis> field of the <filename>/etc/passwd</filename> file may be changed "
 "by regular users using the <command>chfn</command> program. It can be any "
-"combination of letters <emphasis remap=\"I\">f</emphasis> ,<emphasis remap="
-"\"I\">r</emphasis>, <emphasis remap=\"I\">w</emphasis>, <emphasis remap=\"I"
-"\">h</emphasis>, for Full name, Room number, Work phone, and Home phone, "
-"respectively. For backward compatibility, \"yes\" is equivalent to \"rwh\" "
-"and \"no\" is equivalent to \"frwh\". If not specified, only the superuser "
-"can make any changes. The most restrictive setting is better achieved by not "
-"installing <filename>chfn</filename> SUID."
+"combination of letters <replaceable>f</replaceable>, <replaceable>r</"
+"replaceable>, <replaceable>w</replaceable>, <replaceable>h</replaceable>, "
+"for Full name, Room number, Work phone, and Home phone, respectively. For "
+"backward compatibility, <replaceable>yes</replaceable> is equivalent to "
+"<replaceable>rwh</replaceable> and <replaceable>no</replaceable> is "
+"equivalent to <replaceable>frwh</replaceable>. If not specified, only the "
+"superuser can make any changes. The most restrictive setting is better "
+"achieved by not installing <command>chfn</command> SUID."
 msgstr ""
 "В этом параметре указывается, какие части поля <emphasis remap=\"I\">gecos</"
 "emphasis> из файла <filename>/etc/passwd</filename> могут изменять обычные "
@@ -3956,17 +4021,61 @@
 "может выполнять любые изменения. Наиболее ограничительная настройка "
 "достигается снятием SUID бита с файла <filename>chfn</filename>."
 
+#: login.defs.5.xml:83(term) chpasswd.8.xml:175(term)
+msgid "<option>ENCRYPT_METHOD</option> (string)"
+msgstr ""
+
+#: login.defs.5.xml:85(para) chpasswd.8.xml:177(para)
+msgid ""
+"This defines the system default encryption algorithm for encrypting "
+"passwords (if no algorithm are specified on the command line)."
+msgstr ""
+
+#: login.defs.5.xml:94(para) chpasswd.8.xml:186(para)
+msgid "<replaceable>DES</replaceable> (default)"
+msgstr ""
+
+#: login.defs.5.xml:97(replaceable) chpasswd.8.xml:189(replaceable)
+msgid "MD5"
+msgstr ""
+
+#: login.defs.5.xml:100(replaceable) chpasswd.8.xml:192(replaceable)
+msgid "SHA256"
+msgstr ""
+
+#: login.defs.5.xml:103(replaceable) chpasswd.8.xml:195(replaceable)
+msgid "SHA512"
+msgstr ""
+
+#: login.defs.5.xml:90(para) chpasswd.8.xml:182(para)
+msgid "It can take one of these values: <placeholder-1/>"
+msgstr ""
+
+#: login.defs.5.xml:107(para) chpasswd.8.xml:199(para)
+msgid ""
+"Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option> variable."
+msgstr ""
+
+#: login.defs.5.xml:111(para) login.defs.5.xml:192(para)
+#: chpasswd.8.xml:168(para) chpasswd.8.xml:203(para)
+msgid ""
+"Note: if you use PAM, it is recommended to set this variable consistently "
+"with the PAM modules configuration."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:76(term)
-msgid "GID_MAX (number)"
+#: login.defs.5.xml:118(term)
+#, fuzzy
+msgid "<option>GID_MAX</option> (number)"
 msgstr "GID_MAX (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:77(term)
-msgid "GID_MIN (number)"
+#: login.defs.5.xml:119(term)
+#, fuzzy
+msgid "<option>GID_MIN</option> (number)"
 msgstr "GID_MIN (число)"
 
-#: login.defs.5.xml:79(para)
+#: login.defs.5.xml:121(para)
 msgid ""
 "Range of group IDs to choose from for the <command>useradd</command> and "
 "<command>groupadd</command> programs."
@@ -3975,12 +4084,13 @@
 "command> и <command>groupadd</command>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:87(term)
-msgid "MAIL_DIR (string)"
+#: login.defs.5.xml:129(term)
+#, fuzzy
+msgid "<option>MAIL_DIR</option> (string)"
 msgstr "MAIL_DIR (строка)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:89(para)
+#: login.defs.5.xml:131(para)
 msgid ""
 "The mail spool directory. This is needed to manipulate the mailbox when its "
 "corresponding user account is modified or deleted. If not specified, a "
@@ -3990,13 +4100,76 @@
 "изменении или удалении учётной записи пользователя. Если параметр не задан, "
 "то используется значение указанное при сборке."
 
+#: login.defs.5.xml:139(term)
+msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:141(para)
+msgid ""
+"Maximum members per group entry. When the maximum is reached, a new group "
+"entry (line) is started in <filename>/etc/group</filename> (with the same "
+"name, same password, and same GID)."
+msgstr ""
+
+#: login.defs.5.xml:147(para)
+msgid ""
+"The default value is 0, meaning that there are no limits in the number of "
+"members in a group."
+msgstr ""
+
+#. Note: on HP, split groups have the same ID, but different
+#. 	             names.
+#: login.defs.5.xml:153(para)
+msgid ""
+"This feature (split group) permits to limit the length of lines in the group "
+"file. This is useful to make sure that lines for NIS groups are not larger "
+"than 1024 characters."
+msgstr ""
+
+#: login.defs.5.xml:158(para)
+msgid "If you need to enforce such limit, you can use 25."
+msgstr ""
+
+#: login.defs.5.xml:161(para)
+msgid ""
+"Note: split groups may not be supported by all tools (even in the Shadow "
+"toolsuite. You should not use this variable unless you really need it."
+msgstr ""
+
+#: login.defs.5.xml:169(term) chpasswd.8.xml:145(term)
+msgid "<option>MD5_CRYPT_ENAB</option> (boolean)"
+msgstr ""
+
+#: login.defs.5.xml:171(para) chpasswd.8.xml:147(para)
+msgid ""
+"Indicate if passwords must be encrypted using the MD5-based algorithm. If "
+"set to <replaceable>yes</replaceable>, new passwords will be encrypted using "
+"the MD5-based algorithm compatible with the one used by recent releases of "
+"FreeBSD. It supports passwords of unlimited length and longer salt strings. "
+"Set to <replaceable>no</replaceable> if you need to copy encrypted passwords "
+"to other systems which don't understand the new algorithm. Default is "
+"<replaceable>no</replaceable>."
+msgstr ""
+
+#: login.defs.5.xml:183(para)
+msgid ""
+"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"or by any command line option used to configure the encryption algorithm."
+msgstr ""
+
+#: login.defs.5.xml:188(para) chpasswd.8.xml:164(para)
+msgid ""
+"This variable is deprecated. You should use <option>ENCRYPT_METHOD</option>."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:97(term)
-msgid "PASS_MAX_DAYS (number)"
+#: login.defs.5.xml:199(term)
+#, fuzzy
+msgid "<option>PASS_MAX_DAYS</option> (number)"
 msgstr "PASS_MAX_DAYS (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:99(para)
+#: login.defs.5.xml:201(para)
 msgid ""
 "The maximum number of days a password may be used. If the password is older "
 "than this, a password change will be forced. If not specified, -1 will be "
@@ -4007,12 +4180,13 @@
 "предполагается значение -1 (то есть возможность ограничения не используется)."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:108(term)
-msgid "PASS_MIN_DAYS (number)"
+#: login.defs.5.xml:210(term)
+#, fuzzy
+msgid "<option>PASS_MIN_DAYS</option> (number)"
 msgstr "PASS_MIN_DAYS (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:110(para)
+#: login.defs.5.xml:212(para)
 msgid ""
 "The minimum number of days allowed between password changes. Any password "
 "changes attempted sooner than this will be rejected. If not specified, -1 "
@@ -4023,12 +4197,13 @@
 "предполагается значение -1 (то есть возможность ограничения не используется)."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:119(term)
-msgid "PASS_WARN_AGE (number)"
+#: login.defs.5.xml:221(term)
+#, fuzzy
+msgid "<option>PASS_WARN_AGE</option> (number)"
 msgstr "PASS_WARN_AGE (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:121(para)
+#: login.defs.5.xml:223(para)
 msgid ""
 "The number of days warning given before a password expires. A zero means "
 "warning is given only upon the day of expiration, a negative value means no "
@@ -4040,40 +4215,89 @@
 "Если значение не задано, выдача предупреждения отключается."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:131(para)
+#: login.defs.5.xml:233(para)
+#, fuzzy
 msgid ""
-"PASS_MAX_DAYS, PASS_MIN_DAYS and PASS_WARN_AGE are only used at the time of "
-"account creation. Any changes to these settings won't affect existing "
-"accounts."
+"<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 ""
 "Параметры PASS_MAX_DAYS, PASS_MIN_DAYS и PASS_WARN_AGE используются только "
 "при создании учётной записи. Любые изменения этих параметров не влияют на "
 "уже существующие учётные записи."
 
+#: login.defs.5.xml:241(term) chpasswd.8.xml:210(term)
+msgid "<option>SHA_CRYPT_MIN_ROUNDS</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:242(term) chpasswd.8.xml:211(term)
+msgid "<option>SHA_CRYPT_MAX_ROUNDS</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:244(para) chpasswd.8.xml:213(para)
+msgid ""
+"When <option>ENCRYPT_METHOD</option> is set to <replaceable>SHA256</"
+"replaceable> or <replaceable>SHA512</replaceable>, this defines the number "
+"of SHA rounds used by the encryption algorithm by default (when the number "
+"of rounds is not specified on the command line)."
+msgstr ""
+
+#: login.defs.5.xml:251(para) chpasswd.8.xml:220(para)
+msgid ""
+"With a lot of rounds, it is more difficult to brute forcing the password. "
+"But note also that more CPU resources will be needed to authenticate users."
+msgstr ""
+
+#: login.defs.5.xml:256(para) chpasswd.8.xml:225(para)
+msgid ""
+"If not specified, the libc will choose the default number of rounds (5000)."
+msgstr ""
+
+#: login.defs.5.xml:260(para) chpasswd.8.xml:229(para)
+msgid "The values must be inside the 1000-999999999 range."
+msgstr ""
+
+#: login.defs.5.xml:263(para) chpasswd.8.xml:232(para)
+msgid ""
+"If only one of the <option>SHA_CRYPT_MIN_ROUNDS</option> or "
+"<option>SHA_CRYPT_MAX_ROUNDS</option> values is set, then this value will be "
+"used."
+msgstr ""
+
+#: login.defs.5.xml:268(para) chpasswd.8.xml:237(para)
+msgid ""
+"If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</"
+"option>, the highest value will be used."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:138(term)
-msgid "UID_MAX (number)"
+#: login.defs.5.xml:276(term)
+#, fuzzy
+msgid "<option>UID_MAX</option> (number)"
 msgstr "UID_MAX (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:139(term)
-msgid "UID_MIN (number)"
+#: login.defs.5.xml:277(term)
+#, fuzzy
+msgid "<option>UID_MIN</option> (number)"
 msgstr "UID_MIN (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:141(para)
-msgid "Range of user IDs to choose from for the <command>useradd</command> program."
+#: login.defs.5.xml:279(para)
+msgid ""
+"Range of user IDs to choose from for the <command>useradd</command> program."
 msgstr ""
 "Диапазон идентификаторов пользователей, используемый программой "
 "<command>useradd</command>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:148(term)
-msgid "UMASK (number)"
+#: login.defs.5.xml:286(term)
+#, fuzzy
+msgid "<option>UMASK</option> (number)"
 msgstr "UMASK (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:150(para)
+#: login.defs.5.xml:288(para)
 msgid ""
 "The permission mask is initialized to this value. If not specified, the "
 "permission mask will be initialized to 022."
@@ -4082,12 +4306,13 @@
 "устанавливается в 022."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:157(term)
-msgid "USERDEL_CMD (string)"
+#: login.defs.5.xml:295(term)
+#, fuzzy
+msgid "<option>USERDEL_CMD</option> (string)"
 msgstr "USERDEL_CMD (строка)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:159(para)
+#: login.defs.5.xml:297(para)
 msgid ""
 "If defined, this command is run when removing a user. It should remove any "
 "at/cron/print jobs etc. owned by the user to be removed (passed as the first "
@@ -4098,12 +4323,12 @@
 "(передаётся в качестве первого аргумента)."
 
 # type: Content of: <refentry><refsect1><title>
-#: login.defs.5.xml:170(title)
+#: login.defs.5.xml:308(title)
 msgid "CROSS REFERENCE"
 msgstr "ПЕРЕКРЁСТНАЯ ССЫЛКА"
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:171(para)
+#: login.defs.5.xml:309(para)
 msgid ""
 "The following cross reference shows which programs in the shadow password "
 "suite use which parameters."
@@ -4112,50 +4337,72 @@
 "параметры."
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:178(term) chfn.1.xml:5(refentrytitle)
+#: login.defs.5.xml:316(term) chfn.1.xml:5(refentrytitle)
 #: chfn.1.xml:10(refname) chfn.1.xml:16(command)
 msgid "chfn"
 msgstr "chfn"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:180(para)
+#: login.defs.5.xml:318(para)
 msgid "CHFN_AUTH CHFN_RESTRICT"
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
+# type: Content of: <refentry><refsect1><para><command>
+#: login.defs.5.xml:322(term) chgpasswd.8.xml:5(refentrytitle)
+#: chgpasswd.8.xml:10(refname) chgpasswd.8.xml:16(command)
+msgid "chgpasswd"
+msgstr "chgpasswd"
+
+#: login.defs.5.xml:324(para)
+msgid ""
+"MD5_CRYPT_ENAB ENCRYPT_METHOD SHA_CRYPT_MIN_ROUNDS SHA_CRYPT_MAX_ROUNDS "
+"MAX_MEMBERS_PER_GROUP"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para><command>
+#: login.defs.5.xml:331(term) chpasswd.8.xml:5(refentrytitle)
+#: chpasswd.8.xml:10(refname) chpasswd.8.xml:16(command)
+msgid "chpasswd"
+msgstr "chpasswd"
+
+#: login.defs.5.xml:333(para)
+msgid "MD5_CRYPT_ENAB ENCRYPT_METHOD SHA_CRYPT_MIN_ROUNDS SHA_CRYPT_MAX_ROUNDS"
+msgstr ""
+
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:184(term) chsh.1.xml:5(refentrytitle)
+#: login.defs.5.xml:340(term) chsh.1.xml:5(refentrytitle)
 #: chsh.1.xml:10(refname) chsh.1.xml:16(command)
 msgid "chsh"
 msgstr "chsh"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:186(para)
+#: login.defs.5.xml:342(para)
 msgid "CHFN_AUTH"
 msgstr "CHFN_AUTH"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:190(term) groupadd.8.xml:5(refentrytitle)
+#: login.defs.5.xml:346(term) groupadd.8.xml:5(refentrytitle)
 #: groupadd.8.xml:10(refname) groupadd.8.xml:16(command)
 msgid "groupadd"
 msgstr "groupadd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:192(para)
+#: login.defs.5.xml:348(para)
 msgid "GID_MAX GID_MIN"
 msgstr "GID_MAX GID_MIN"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:198(para)
+#: login.defs.5.xml:354(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:206(para)
+#: login.defs.5.xml:362(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:212(para)
+#: login.defs.5.xml:368(para)
 msgid ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
@@ -4164,16 +4411,16 @@
 "UMASK"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:223(para)
+#: login.defs.5.xml:379(para)
 msgid "MAIL_DIR USERDEL_CMD"
 msgstr "MAIL_DIR USERDEL_CMD"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><emphasis>
-#: login.defs.5.xml:231(para)
+#: login.defs.5.xml:387(para)
 msgid "MAIL_DIR"
 msgstr "MAIL_DIR"
 
-#: login.defs.5.xml:240(para)
+#: login.defs.5.xml:396(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 "
@@ -4193,7 +4440,7 @@
 "citerefentry>. Настройку данных программ следует выполнять в файлах "
 "конфигурации PAM."
 
-#: login.defs.5.xml:257(para)
+#: login.defs.5.xml:413(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4299,7 +4546,8 @@
 msgid ""
 "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
 "compact rules."
-msgstr "Оператор <emphasis>EXCEPT</emphasis> помогает в написании компактных правил."
+msgstr ""
+"Оператор <emphasis>EXCEPT</emphasis> помогает в написании компактных правил."
 
 # type: Content of: <refentry><refsect1><para>
 #: login.access.5.xml:58(para)
@@ -4353,7 +4601,7 @@
 msgid "-f <placeholder-1/>"
 msgstr "-f <placeholder-1/>"
 
-#: login.1.xml:31(arg) gpasswd.1.xml:37(arg) chfn.1.xml:18(arg)
+#: login.1.xml:31(arg) chfn.1.xml:18(arg)
 msgid "-r <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
@@ -4372,12 +4620,12 @@
 "системе. Как правило, эта программа вызывается автоматически и выводит "
 "приглашение <emphasis remap=\"I\">login:</emphasis> на терминал "
 "пользователя. Программа <command>login</command> может восприниматься "
-"оболочкой командной строки не как простая программа и вызываться не "
-"как подпроцесс. Обычно, оболочка запускает <command>login</"
-"command> посредством вызова <emphasis remap=\"B\">exec login</emphasis>, что "
-"приводит к завершению работы пользователя в текущей оболочке. Попытка "
-"запустить <command>login</command> из любой оболочки, отличной от "
-"регистрационной, приводит к сообщению об ошибке."
+"оболочкой командной строки не как простая программа и вызываться не как "
+"подпроцесс. Обычно, оболочка запускает <command>login</command> посредством "
+"вызова <emphasis remap=\"B\">exec login</emphasis>, что приводит к "
+"завершению работы пользователя в текущей оболочке. Попытка запустить "
+"<command>login</command> из любой оболочки, отличной от регистрационной, "
+"приводит к сообщению об ошибке."
 
 # type: Content of: <refentry><refsect1><para>
 #: login.1.xml:49(para)
@@ -4535,16 +4783,18 @@
 
 # type: Content of: <refentry><refsect1><para>
 #: login.1.xml:170(para)
-msgid "The location of files is subject to differences in system configuration."
+msgid ""
+"The location of files is subject to differences in system configuration."
 msgstr "Расположение файлов может отличаться на разных системах."
 
 # type: Content of: <refentry><refsect1><para>
 #: login.1.xml:186(para)
+#, fuzzy
 msgid ""
-"As any program, <command>login</command> appearance could be faked. If non-"
-"trusted users have a physical access to the machine, an attacker could use "
-"this to obtain the password of the next person sitting in front of the "
-"machine. Under Linux, the SAK mecanism can be used by users to initiate of a "
+"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 ""
 "Как и для любой программы, запуск <command>login</command> может быть "
@@ -4582,7 +4832,8 @@
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: login.1.xml:233(para)
 msgid "Prevent non-root users from logging in."
-msgstr "при существовании файла блокируется доступ в систему обычным пользователям"
+msgstr ""
+"при существовании файла блокируется доступ в систему обычным пользователям"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
 #: login.1.xml:237(filename)
@@ -4602,7 +4853,8 @@
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: login.1.xml:245(para)
 msgid "Suppress printing of system messages."
-msgstr "при существовании файла системные сообщения при входе в систему не выводятся"
+msgstr ""
+"при существовании файла системные сообщения при входе в систему не выводятся"
 
 #: login.1.xml:253(para)
 msgid ""
@@ -4756,7 +5008,8 @@
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: limits.5.xml:61(para)
 msgid "L: max number of logins for this user"
-msgstr "L: максимальное число возможных регистраций в системе этого пользователя"
+msgstr ""
+"L: максимальное число возможных регистраций в системе этого пользователя"
 
 #: limits.5.xml:62(para)
 msgid ""
@@ -4767,7 +5020,15 @@
 "<citerefentry><refentrytitle>setpriority</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
+#: limits.5.xml:67(para)
+msgid "I: max nice value (0..39 which translates to 20..-19)"
+msgstr ""
+
 #: limits.5.xml:69(para)
+msgid "O: max real time priority"
+msgstr ""
+
+#: limits.5.xml:72(para)
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
 "<emphasis>LIMITS_STRING </emphasis>. For reading convenience, the following "
@@ -4778,7 +5039,7 @@
 "записи эквивалентны:"
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:75(programlisting)
+#: limits.5.xml:78(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -4792,7 +5053,7 @@
 "    "
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:80(para)
+#: limits.5.xml:83(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 "
@@ -4804,7 +5065,7 @@
 "Неправильная строка ограничений будет отброшена (не учтена) программой "
 "<command>login</command>."
 
-#: limits.5.xml:87(para)
+#: limits.5.xml:90(para)
 msgid ""
 "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
 "have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
@@ -4816,7 +5077,7 @@
 "файле <emphasis>LIMITS_FILE</emphasis>, то будет использоваться последняя."
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:94(para)
+#: limits.5.xml:97(para)
 msgid ""
 "To completely disable limits for a user, a single dash \"<emphasis>-</"
 "emphasis>\" will do."
@@ -4825,7 +5086,7 @@
 "тире \"<emphasis>-</emphasis> \"."
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:99(para)
+#: limits.5.xml:102(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 "
@@ -4836,11 +5097,11 @@
 "глобальные ограничения и появятся, но пока это только в планах ;)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: limits.5.xml:110(filename)
+#: limits.5.xml:113(filename)
 msgid "/etc/limits"
 msgstr "/etc/limits"
 
-#: limits.5.xml:118(para)
+#: limits.5.xml:121(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>setpriority</"
@@ -4888,28 +5149,37 @@
 msgstr "Параметры команды <command>lastlog</command>:"
 
 #: lastlog.8.xml:42(term)
-msgid "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
-msgstr "<option>-b</option>, <option>--before</option><replaceable>ДНЕЙ</replaceable>"
+msgid ""
+"<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
+msgstr ""
+"<option>-b</option>, <option>--before</option><replaceable>ДНЕЙ</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: lastlog.8.xml:46(para)
-msgid "Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
-msgstr "Показать записи lastlog за последние <emphasis remap=\"I\">ДНЕЙ</emphasis>."
+msgid ""
+"Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
+msgstr ""
+"Показать записи lastlog за последние <emphasis remap=\"I\">ДНЕЙ</emphasis>."
 
 #: lastlog.8.xml:60(term) faillog.8.xml:93(term)
-msgid "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
-msgstr "<option>-t</option>, <option>--time</option><replaceable>ДНЕЙ</replaceable>"
+msgid ""
+"<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>ДНЕЙ</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: lastlog.8.xml:65(para)
 msgid ""
 "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
 "emphasis>."
-msgstr "Показать записи lastlog новее чем <emphasis remap=\"I\">ДНЕЙ</emphasis>."
+msgstr ""
+"Показать записи lastlog новее чем <emphasis remap=\"I\">ДНЕЙ</emphasis>."
 
 #: lastlog.8.xml:72(term) faillog.8.xml:105(term)
-msgid "<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>"
-msgstr "<option>-u</option>, <option>--user</option><replaceable>ИМЯ</replaceable>"
+msgid ""
+"<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--user</option><replaceable>ИМЯ</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: lastlog.8.xml:77(para)
@@ -4922,7 +5192,8 @@
 
 #: lastlog.8.xml:85(term)
 msgid "The <option>-t</option> flag overrides the use of <option>-u</option>."
-msgstr "Параметр <option>-t</option> отменяет действие параметра <option>-u</option>."
+msgstr ""
+"Параметр <option>-t</option> отменяет действие параметра <option>-u</option>."
 
 #: lastlog.8.xml:94(para)
 msgid ""
@@ -5085,9 +5356,9 @@
 "uncorrectable errors."
 msgstr ""
 "Программа <command>grpck</command> проверяет корректность аутентификационной "
-"информации в системе. Проверяется формат всех записей файлов <filename>/etc/group</"
-"filename> и <filename>/etc/gshadow</filename>, а также допустимость данных "
-"каждого поля. В случае обнаружения ошибок пользователю предлагается "
+"информации в системе. Проверяется формат всех записей файлов <filename>/etc/"
+"group</filename> и <filename>/etc/gshadow</filename>, а также допустимость "
+"данных каждого поля. В случае обнаружения ошибок пользователю предлагается "
 "подтвердить удаление записей, имеющих неверный формат или восстановление "
 "которых невозможно."
 
@@ -5214,8 +5485,8 @@
 msgstr "показывает имена групп запустившего программу пользователя"
 
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: groups.1.xml:18(replaceable) gpasswd.1.xml:23(replaceable)
-#: gpasswd.1.xml:28(replaceable) chfn.1.xml:22(replaceable)
+#: groups.1.xml:18(replaceable) gpasswd.1.xml:86(replaceable)
+#: gpasswd.1.xml:99(replaceable) chfn.1.xml:22(replaceable)
 msgid "user"
 msgstr "имя"
 
@@ -5230,10 +5501,9 @@
 "Команда <command>groups</command> показывает имена групп запустившего "
 "программу пользователя или их числовые идентификаторы (ID). Если для номера "
 "группы нет соответствующей записи в файле <filename>/etc/group</filename>, "
-"то отображается числовое значение. При указании необязательного "
-"параметра <emphasis remap=\"I\">имя</emphasis> выводятся "
-"группы для учётной записи с указанным <emphasis remap=\"I\">именем</"
-"emphasis>."
+"то отображается числовое значение. При указании необязательного параметра "
+"<emphasis remap=\"I\">имя</emphasis> выводятся группы для учётной записи с "
+"указанным <emphasis remap=\"I\">именем</emphasis>."
 
 #: groups.1.xml:37(para)
 msgid ""
@@ -5293,18 +5563,22 @@
 msgstr "Параметры команды <command>groupmod</command>:"
 
 #: groupmod.8.xml:41(term)
-msgid "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
-msgstr "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
+msgid ""
+"<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
+msgstr ""
+"<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: groupmod.8.xml:45(para)
+#, fuzzy
 msgid ""
-"Specify the new group ID for the <replaceable>GROUP</replaceable>. The "
-"numerical value of the <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. Any files which the old group ID is the file group ID must have the "
-"file group ID changed manually."
+"The group ID of the given <replaceable>GROUP</replaceable> will be changed "
+"to <replaceable>GID</replaceable>. 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. 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 ""
 "Указывается новый ID группы для <replaceable>ГРУППЫ</replaceable>. Числовое "
 "значение <replaceable>GID</replaceable> должно быть неотрицательным "
@@ -5313,7 +5587,7 @@
 "системные группы. Изменение принадлежности всех файлов старой группе "
 "необходимо выполнять вручную."
 
-#: groupmod.8.xml:63(term)
+#: groupmod.8.xml:66(term)
 msgid ""
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
@@ -5321,7 +5595,7 @@
 "<option>-n</option>, <option>--new-name</option><replaceable>НОВАЯ_ГРУППА</"
 "replaceable>"
 
-#: groupmod.8.xml:68(para)
+#: groupmod.8.xml:71(para)
 msgid ""
 "The name of the group will be changed from <replaceable>GROUP</replaceable> "
 "to <replaceable>NEW_GROUP</replaceable> name."
@@ -5330,21 +5604,22 @@
 "<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmod.8.xml:79(para)
+#: groupmod.8.xml:82(para)
+#, fuzzy
 msgid ""
-"When used with the <option>-g</option> option allow to change the group "
-"<replaceable>GID</replaceable> to non-unique value."
+"When used with the <option>-g</option> option, allow to change the group "
+"<replaceable>GID</replaceable> to a non-unique value."
 msgstr ""
 "При использовании с параметром <option>-g</option> разрешается изменять "
 "<replaceable>GID</replaceable> группы не уникальным значением."
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: groupmod.8.xml:144(para)
+#: groupmod.8.xml:147(para)
 msgid "group name already in use"
 msgstr "такое имя группы уже используется"
 
 # type: Content of: <refentry><refsect1><para>
-#: groupmod.8.xml:108(para)
+#: groupmod.8.xml:111(para)
 msgid ""
 "The <command>groupmod</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5352,7 +5627,7 @@
 "Команда <command>groupmod</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: groupmod.8.xml:159(para)
+#: groupmod.8.xml:162(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -5401,11 +5676,11 @@
 msgid "user_name"
 msgstr "имя_пользователя"
 
-#: groupmems.8.xml:18(arg) gpasswd.1.xml:23(arg)
+#: groupmems.8.xml:18(arg)
 msgid "-a <placeholder-1/>"
 msgstr "-a <placeholder-1/>"
 
-#: groupmems.8.xml:19(arg) gpasswd.1.xml:28(arg)
+#: groupmems.8.xml:19(arg)
 msgid "-d <placeholder-1/>"
 msgstr "-d <placeholder-1/>"
 
@@ -5445,11 +5720,12 @@
 "<command>groupmems</command>, чтобы изменить список членов не своей группы."
 
 #: groupmems.8.xml:43(para)
-msgid "The options which apply to the <command>groupmems</command> command are:"
+msgid ""
+"The options which apply to the <command>groupmems</command> command are:"
 msgstr "Параметры команды <command>groupmems</command>:"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: groupmems.8.xml:49(option)
+#: groupmems.8.xml:49(option) gpasswd.1.xml:86(option)
 msgid "-a"
 msgstr "-a"
 
@@ -5459,7 +5735,7 @@
 msgstr "Добавить нового пользователя в группу."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: groupmems.8.xml:55(option)
+#: groupmems.8.xml:55(option) gpasswd.1.xml:99(option)
 msgid "-d"
 msgstr "-d"
 
@@ -5474,7 +5750,7 @@
 msgstr "Вычистить всех пользователей из списка членов группы."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: groupmems.8.xml:67(option) groupadd.8.xml:59(option)
+#: groupmems.8.xml:67(option) groupadd.8.xml:61(option)
 msgid "-g"
 msgstr "-g"
 
@@ -5652,34 +5928,35 @@
 msgstr "создаёт новую группу"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
-#: groupadd.8.xml:18(replaceable) groupadd.8.xml:59(replaceable)
+#: groupadd.8.xml:18(replaceable) groupadd.8.xml:61(replaceable)
 msgid "GID"
 msgstr "GID"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><option>
-#: groupadd.8.xml:19(arg) groupadd.8.xml:100(option)
+#: groupadd.8.xml:19(arg) groupadd.8.xml:102(option)
 msgid "-o"
 msgstr "-o"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
-#: groupadd.8.xml:22(replaceable) groupadd.8.xml:79(replaceable)
+#: groupadd.8.xml:22(replaceable) groupadd.8.xml:81(replaceable)
 msgid "KEY"
 msgstr "КЛЮЧ"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
-#: groupadd.8.xml:22(replaceable) groupadd.8.xml:79(replaceable)
+#: groupadd.8.xml:22(replaceable) groupadd.8.xml:81(replaceable)
 msgid "VALUE"
 msgstr "ЗНАЧЕНИЕ"
 
-#: groupadd.8.xml:22(arg) groupadd.8.xml:79(option)
+#: groupadd.8.xml:22(arg) groupadd.8.xml:81(option)
 msgid "-K <placeholder-1/>=<placeholder-2/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
 # type: Content of: <refentry><refsect1><para>
 #: groupadd.8.xml:31(para)
+#, fuzzy
 msgid ""
 "The <command>groupadd</command> command creates a new group account using "
-"the values specified on the command line and the default values from the "
+"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 ""
 "Программа <command>groupadd</command> создаёт новую группу, согласно "
@@ -5691,10 +5968,12 @@
 msgstr "Параметры команды <command>groupadd</command>:"
 
 #: groupadd.8.xml:50(para)
+#, fuzzy
 msgid ""
-"This option causes to just exit with success status if the specified group "
-"already exists. With <option>-g</option>, if specified GID already exists, "
-"other (unique) GID is chosen (i.e. <option>-g</option> is turned off)."
+"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 ""
 "Вернуть статус успешного выполнения, если группа уже существует. Если "
 "используется вместе с параметром <option>-g</option> и указанный GID уже "
@@ -5702,7 +5981,7 @@
 "g</option> игнорируется)."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupadd.8.xml:62(para)
+#: groupadd.8.xml:64(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 "
@@ -5717,7 +5996,7 @@
 "зарезервированы под системные группы."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupadd.8.xml:82(para)
+#: groupadd.8.xml:84(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (GID_MIN, GID_MAX "
 "and others). Multiple <option>-K</option> options can be specified."
@@ -5726,7 +6005,7 @@
 "в файле <filename>/etc/login.defs</filename>. Можно указать несколько "
 "параметров <option>-K</option>."
 
-#: groupadd.8.xml:87(para)
+#: groupadd.8.xml:89(para)
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option> -K </"
@@ -5736,7 +6015,7 @@
 "replaceable>=<replaceable>100</replaceable><option> -K </"
 "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: groupadd.8.xml:91(para)
+#: groupadd.8.xml:93(para)
 msgid ""
 "Note: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
@@ -5747,12 +6026,13 @@
 "replaceable>=<replaceable>499</replaceable> пока не работает."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupadd.8.xml:103(para)
-msgid "This option permits to add group with non-unique GID."
+#: groupadd.8.xml:105(para)
+#, fuzzy
+msgid "This option permits to add a group with a non-unique GID."
 msgstr "Разрешить добавление группы с не уникальным GID."
 
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:137(para)
+#: groupadd.8.xml:139(para)
 msgid ""
 "Groupnames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
@@ -5763,30 +6043,41 @@
 "доллара. Это можно описать регулярным выражением: [a-z_][a-z0-9_-]*[$]"
 
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:141(para) groupadd.8.xml:149(para)
+#: groupadd.8.xml:144(para)
 msgid "Groupnames may only be up to 16 characters long."
 msgstr "Имена групп могут быть длиной не более 16 знаков."
 
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:143(para)
+#: groupadd.8.xml:147(para)
+#, fuzzy
 msgid ""
-"If the groupname already exists in an external group database such as NIS, "
-"<command>groupadd</command> will deny the group creation request."
+"You may not add a NIS or LDAP group. This must be performed on the "
+"corresponding server."
 msgstr ""
+"Нельзя добавить пользователя в NIS группу. Это необходимо делать на NIS "
+"сервере."
+
+# type: Content of: <refentry><refsect1><para>
+#: groupadd.8.xml:151(para)
+#, fuzzy
+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 ""
 "Если имя группы уже существует во внешней базе данных групп, например в NIS, "
 "то <command>groupadd</command> не станет создавать группу."
 
-#: groupadd.8.xml:179(para)
+#: groupadd.8.xml:184(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:185(para)
+#: groupadd.8.xml:190(para)
 msgid "group name not unique"
 msgstr "не уникальное имя группы"
 
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:155(para)
+#: groupadd.8.xml:160(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5794,7 +6085,7 @@
 "Программа <command>groupadd</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: groupadd.8.xml:200(para)
+#: groupadd.8.xml:205(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -5830,42 +6121,52 @@
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
 #: gpasswd.1.xml:5(refentrytitle) gpasswd.1.xml:10(refname)
-#: gpasswd.1.xml:16(command) gpasswd.1.xml:22(command)
-#: gpasswd.1.xml:27(command) gpasswd.1.xml:32(command)
-#: gpasswd.1.xml:36(command) gpasswd.1.xml:40(command)
+#: gpasswd.1.xml:21(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
-# type: Content of: <refentry><refnamediv><refpurpose>
+#: gpasswd.1.xml:13(phrase)
+#, fuzzy
+msgid "and <placeholder-1/> files"
+msgstr "-a <placeholder-1/>"
+
+#: gpasswd.1.xml:15(phrase)
+msgid "file"
+msgstr ""
+
 #: gpasswd.1.xml:11(refpurpose)
-msgid "administer the <placeholder-1/> file"
-msgstr "управляет файлом <placeholder-1/>"
+#, fuzzy
+msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
+msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:33(arg)
-msgid "-R <placeholder-1/>"
-msgstr "-R <placeholder-1/>"
-
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: gpasswd.1.xml:41(replaceable) gpasswd.1.xml:42(replaceable)
-msgid "user,"
-msgstr "пользователь,"
+#: gpasswd.1.xml:23(replaceable)
+#, fuzzy
+msgid "option"
+msgstr "параметры"
 
-#: gpasswd.1.xml:41(arg)
-msgid "-A <placeholder-1/>"
-msgstr "-A <placeholder-1/>"
+#: gpasswd.1.xml:33(para)
+#, fuzzy
+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 ""
+"Программа <command>gpasswd</command> используется для управления файлом "
+"<filename>/etc/group</filename> (а также файлом <filename>/etc/gshadow</"
+"filename>, если программа была собрана с параметром SHADOWGRP). Каждая "
+"группа может иметь администраторов, членов и пароль. Системный администратор "
+"может использовать параметр <option>-A</option>, чтобы назначить группе "
+"администратора(ов) и параметр <option>-M</option> для определения списка "
+"членов, а также имеет все права администраторов и членов группы."
 
-#: gpasswd.1.xml:42(arg)
-msgid "-M <placeholder-1/>"
-msgstr "-M <placeholder-1/>"
-
-#: gpasswd.1.xml:49(para)
+#: gpasswd.1.xml:41(para)
+#, fuzzy
 msgid ""
-"The <command>gpasswd</command> command is used to administer the <filename>/"
-"etc/group</filename> file (and <filename>/etc/gshadow</filename> file if "
-"compiled with SHADOWGRP defined). Every group can have administrators, "
-"members and a password. System administrator can use <option>-A</option> "
-"option to define group administrator(s) and <option>-M</option> option to "
-"define members and has all rights of group administrators and members."
+"System administrator can use the <option>-A</option> option to define group "
+"administrator(s) and the <option>-M</option> option to define members and "
+"has all rights of group administrators and members."
 msgstr ""
 "Программа <command>gpasswd</command> используется для управления файлом "
 "<filename>/etc/group</filename> (а также файлом <filename>/etc/gshadow</"
@@ -5875,13 +6176,34 @@
 "администратора(ов) и параметр <option>-M</option> для определения списка "
 "членов, а также имеет все права администраторов и членов группы."
 
+#: gpasswd.1.xml:46(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:53(para)
+#, fuzzy
+msgid ""
+"If a password is set the members can still "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry> without a password, and non-members must supply the password."
+msgstr ""
+"Программа <command>gpasswd</command>, запущенная администратором группы с "
+"именем группы, служит для смены пароля группы. Если пароль не пустой,то для "
+"членов группы вызов <citerefentry><refentrytitle>newgrp</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry> пароля не требует, а "
+"не члены группы должны ввести пароль."
+
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: gpasswd.1.xml:60(title)
+#: gpasswd.1.xml:61(title)
 msgid "Notes about group passwords"
 msgstr "Замечания о паролях групп"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: gpasswd.1.xml:61(para)
+#: gpasswd.1.xml:62(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 "
@@ -5891,52 +6213,111 @@
 "более одного человека. Однако, группы являются полезным инструментом "
 "совместной работы различных пользователей."
 
-#: gpasswd.1.xml:72(para)
+#: gpasswd.1.xml:73(para)
+#, fuzzy
 msgid ""
-"Group administrator can add and delete users using <option>-a</option> and "
-"<option>-d</option> options respectively. Administrators can use <option>-r</"
-"option> option to remove group password. When no password is set only group "
-"members can use <command>newgrp</command> to join the group. Option <option>-"
-"R</option> disables access via a password to the group through "
-"<command>newgrp</command> command (however members will still be able to "
-"switch to this group)."
+"Except for the <option>-A</option> and <option>-M</option> options, the "
+"options cannot be combined."
 msgstr ""
-"Администратор группы может добавлять и удалять пользователей с помощью "
-"параметров <option>-a</option> и <option>-d</option> соответственно. "
-"Администраторы могут использовать параметр <option>-r</option> для удаления "
-"пароля группы. Если пароль не задан, то только члены группы с помощью "
-"команды <command>newgrp</command> могут войти в группу. Указав параметр "
-"<option>-R</option> можно запретить доступ в группу по паролю с помощью "
-"команды <command>newgrp</command> (однако на членов группы это не "
-"распространяется)."
+"Параметры <option>-r</option>, <option>-h</option> и <option>-f</option> "
+"используются только если <command>login</command> запускается "
+"суперпользователем."
 
-#: gpasswd.1.xml:82(para)
+#: gpasswd.1.xml:77(para)
+msgid "The options cannot be combined."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: gpasswd.1.xml:80(para)
+#, fuzzy
+msgid "The options which apply to the <command>gpasswd</command> command are:"
+msgstr "Параметры команды <command>passwd</command>:"
+
+#: gpasswd.1.xml:89(para)
+#, fuzzy
 msgid ""
-"<command>gpasswd</command> called by a group administrator with group name "
-"only prompts for the group password. If password is set the members can "
-"still <citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry> without a password, non-members must supply the "
-"password."
+"Add the <replaceable>user</replaceable> to the named <replaceable>group</"
+"replaceable>."
 msgstr ""
-"Программа <command>gpasswd</command>, запущенная администратором группы с "
-"именем группы, служит для смены пароля группы. Если пароль не пустой,то для "
-"членов группы вызов <citerefentry><refentrytitle>newgrp</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry> пароля не требует, а "
-"не члены группы должны ввести пароль."
+"Имя группы будет изменено с <emphasis remap=\"I\">ГРУППА</emphasis> на "
+"<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
 
-#: gpasswd.1.xml:112(para)
+#: gpasswd.1.xml:102(para)
+#, fuzzy
 msgid ""
+"Remove the <replaceable>user</replaceable> from the named "
+"<replaceable>group</replaceable>."
+msgstr ""
+"Имя группы будет изменено с <emphasis remap=\"I\">ГРУППА</emphasis> на "
+"<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
+
+#: gpasswd.1.xml:115(para)
+msgid ""
+"Remove the password from the named <replaceable>group</replaceable>. Only "
+"group members will be allowed to use <command>newgrp</command> to join the "
+"named <replaceable>group</replaceable>."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><option>
+#: gpasswd.1.xml:127(option)
+#, fuzzy
+msgid "-R"
+msgstr "-"
+
+#: gpasswd.1.xml:130(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:141(term)
+#, fuzzy
+msgid "<option>-A</option><replaceable>user</replaceable>,..."
+msgstr ""
+"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: gpasswd.1.xml:145(para)
+#, fuzzy
+msgid "Set the list of administrative users."
+msgstr "список администраторов группы, перечисленных через запятую"
+
+#: gpasswd.1.xml:153(term)
+#, fuzzy
+msgid "<option>-M</option><replaceable>user</replaceable>,..."
+msgstr ""
+"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: gpasswd.1.xml:157(para)
+#, fuzzy
+msgid "Set the list of group members."
+msgstr "список членов группы, перечисленных через запятую"
+
+#: gpasswd.1.xml:167(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:197(para)
+#, fuzzy
+msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</"
+"citerefentry>, <citerefentry><refentrytitle>groupadd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>grpck</"
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</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 ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
@@ -5998,13 +6379,15 @@
 "replaceable>"
 
 #: faillog.8.xml:59(para)
-msgid "Lock account to <replaceable>SEC</replaceable> seconds after failed login."
+msgid ""
+"Lock account to <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
 "Блокировать учётную запись на <replaceable>СЕКУНД</replaceable> после "
 "неудачной попытки входа."
 
 #: faillog.8.xml:66(term)
-msgid "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
+msgid ""
+"<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--maximum</option><replaceable>МАКС_ЧИСЛО</"
 "replaceable>"
@@ -6161,9 +6544,9 @@
 "current password expiration and forces (<option>-f</option>) changes when "
 "required. It is callable as a normal user command."
 msgstr ""
-"Программа <command>expiry</command> проверяет (параметр <option>-c</"
-"option>) сколько ещё времени будет работоспособен текущий пароль и вынуждает "
-"изменить его (параметр <option>-f</option>), если это требуется. Она может "
+"Программа <command>expiry</command> проверяет (параметр <option>-c</option>) "
+"сколько ещё времени будет работоспособен текущий пароль и вынуждает изменить "
+"его (параметр <option>-f</option>), если это требуется. Она может "
 "запускаться обычным пользователем."
 
 #: expiry.1.xml:51(para) chage.1.xml:233(para)
@@ -6258,12 +6641,6 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-# type: Content of: <refentry><refsect1><para><command>
-#: chpasswd.8.xml:5(refentrytitle) chpasswd.8.xml:10(refname)
-#: chpasswd.8.xml:16(command)
-msgid "chpasswd"
-msgstr "chpasswd"
-
 # type: Content of: <refentry><refnamediv><refpurpose>
 #: chpasswd.8.xml:11(refpurpose)
 msgid "update passwords in batch mode"
@@ -6290,42 +6667,67 @@
 
 # type: Content of: <refentry><refsect1><para>
 #: chpasswd.8.xml:34(para)
+#, fuzzy
 msgid ""
-"By default the supplied password must be in clear-text. Default encryption "
-"algorithm is DES. Also the password age will be updated, if present."
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chpasswd</command>. Also the password age will be updated, if "
+"present."
 msgstr ""
 "По умолчанию, передаваемый пароль должен быть в виде обычного текста. "
 "Алгоритмом шифрования по умолчанию является DES. Также, если есть срок "
 "устаревания пароля, то он будет обновлён."
 
-# type: Content of: <refentry><refsect1><para>
 #: chpasswd.8.xml:39(para) chgpasswd.8.xml:38(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."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: chpasswd.8.xml:45(para) chgpasswd.8.xml:44(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:47(para)
+#: chpasswd.8.xml:53(para)
 msgid "The options which apply to the <command>chpasswd</command> command are:"
 msgstr "Параметры команды <command>chpasswd</command>:"
 
-#: chpasswd.8.xml:53(term) chgpasswd.8.xml:52(term)
+#: chpasswd.8.xml:59(term) chgpasswd.8.xml:58(term)
+#, fuzzy
+msgid "<option>-c</option>, <option>--crypt-method</option>"
+msgstr "<option>-e</option>, <option>--encrypted</option>"
+
+#: chpasswd.8.xml:61(para) chgpasswd.8.xml:60(para)
+msgid "Use the specified method to encrypt the passwords."
+msgstr ""
+
+#: chpasswd.8.xml:62(para) chgpasswd.8.xml:61(para)
+msgid ""
+"The available methods are DES, MD5, and SHA256 or SHA512 if compiled with "
+"the ENCRYPTMETHOD_SELECT flag."
+msgstr ""
+
+#: chpasswd.8.xml:69(term) chgpasswd.8.xml:68(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:55(para) chgpasswd.8.xml:54(para)
+#: chpasswd.8.xml:71(para) chgpasswd.8.xml:70(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Передаваемые пароли заданы в шифрованном виде."
 
-#: chpasswd.8.xml:65(term) chgpasswd.8.xml:64(term)
+#: chpasswd.8.xml:81(term) chgpasswd.8.xml:80(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:67(para) chgpasswd.8.xml:66(para)
+#: chpasswd.8.xml:83(para) chgpasswd.8.xml:82(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -6333,8 +6735,38 @@
 "Использовать алгоритм шифрования MD5 вместо DES, если пароли передаются не "
 "шифрованными."
 
+#: chpasswd.8.xml:90(term) chgpasswd.8.xml:89(term)
+#, fuzzy
+msgid "<option>-s</option>, <option>--sha-rounds</option>"
+msgstr "<option>-s</option>, <option>--shadow</option>"
+
+#: chpasswd.8.xml:92(para) chgpasswd.8.xml:91(para)
+msgid "Use the specified number of rounds to encrypt the passwords."
+msgstr ""
+
+#: chpasswd.8.xml:95(para) chgpasswd.8.xml:94(para)
+msgid ""
+"The value 0 means that the system will choose the default number of rounds "
+"for the crypt method (5000)."
+msgstr ""
+
+#: chpasswd.8.xml:99(para) chgpasswd.8.xml:98(para)
+msgid ""
+"A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
+msgstr ""
+
+#: chpasswd.8.xml:103(para) chgpasswd.8.xml:102(para)
+msgid "You can only use this option with the SHA256 or SHA512 crypt method."
+msgstr ""
+
+#: chpasswd.8.xml:107(para) chgpasswd.8.xml:106(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>
-#: chpasswd.8.xml:78(para) chgpasswd.8.xml:77(para)
+#: chpasswd.8.xml:119(para) chgpasswd.8.xml:118(para)
 msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
@@ -6342,26 +6774,39 @@
 "Не забудьте установить права или umask, чтобы не позволить чтение "
 "нешифрованных файлов другими пользователями."
 
-#: chpasswd.8.xml:86(para)
+#: chpasswd.8.xml:132(title)
+msgid "CONFIGURATION"
+msgstr ""
+
+#: chpasswd.8.xml:133(para)
 msgid ""
+"The following configuration variables in <filename>/etc/login.defs</"
+"filename> change the behavior of this tool:"
+msgstr ""
+
+#: chpasswd.8.xml:159(para)
+msgid ""
+"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"or by any command line option."
+msgstr ""
+
+#: chpasswd.8.xml:273(para)
+#, fuzzy
+msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>newusers</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<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><para><command>
-#: chgpasswd.8.xml:5(refentrytitle) chgpasswd.8.xml:10(refname)
-#: chgpasswd.8.xml:16(command)
-msgid "chgpasswd"
-msgstr "chgpasswd"
-
 # type: Content of: <refentry><refnamediv><refpurpose>
 #: chgpasswd.8.xml:11(refpurpose)
 msgid "update group passwords in batch mode"
@@ -6375,8 +6820,8 @@
 "of existing groups. Each line is of the format:"
 msgstr ""
 "Программа <command>chgpasswd</command> читает список пар \"группа пароль\" "
-"из стандартного входного потока и обновляет информацию о существующих группах. "
-"Каждая строка имеет вид:"
+"из стандартного входного потока и обновляет информацию о существующих "
+"группах. Каждая строка имеет вид:"
 
 #: chgpasswd.8.xml:30(para)
 msgid ""
@@ -6388,26 +6833,33 @@
 
 # type: Content of: <refentry><refsect1><para>
 #: chgpasswd.8.xml:34(para)
+#, fuzzy
 msgid ""
-"By default the supplied password must be in clear-text. Default encryption "
-"algorithm is DES."
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chgpasswd</command>."
 msgstr ""
 "По умолчанию, передаваемый пароль должен быть в виде обычного текста. "
 "Алгоритмом шифрования по умолчанию является DES."
 
-#: chgpasswd.8.xml:46(para)
-msgid "The options which apply to the <command>chgpasswd</command> command are:"
+#: chgpasswd.8.xml:52(para)
+msgid ""
+"The options which apply to the <command>chgpasswd</command> command are:"
 msgstr "Параметры команды <command>chgpasswd</command>:"
 
-#: chgpasswd.8.xml:85(para)
+#: chgpasswd.8.xml:150(para)
+#, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
 #: chfn.1.xml:11(refpurpose)
@@ -6711,7 +7163,8 @@
 msgid ""
 "The <command>chage</command> program requires a shadow password file to be "
 "available."
-msgstr "Программа <command>chage</command> требует наличия файла теневых паролей."
+msgstr ""
+"Программа <command>chage</command> требует наличия файла теневых паролей."
 
 # type: Content of: <refentry><refsect1><para>
 #: chage.1.xml:169(para)
@@ -6749,3 +7202,95 @@
 msgid "translator-credits"
 msgstr "Yuri Kozlov <kozlov.y at gmail.com>, 2005, 2006"
 
+# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "The name of the new user's login shell. The named program will be used "
+#~ "for all future new user accounts."
+#~ msgstr ""
+#~ "Имя новой регистрационной оболочки пользователя. Данная программа будет "
+#~ "использована для всех новых пользовательских учётных записей."
+
+#~ msgid ""
+#~ "If no options are specified, <command>useradd</command> displays the "
+#~ "current default values."
+#~ msgstr ""
+#~ "Если программа запущена без параметров, <command>useradd</command> "
+#~ "покажет текущие значения по умолчанию."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+
+# type: Content of: <refentry><refnamediv><refpurpose>
+#~ msgid "administer the <placeholder-1/> file"
+#~ msgstr "управляет файлом <placeholder-1/>"
+
+#~ msgid "-R <placeholder-1/>"
+#~ msgstr "-R <placeholder-1/>"
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
+#~ msgid "user,"
+#~ msgstr "пользователь,"
+
+#~ msgid "-A <placeholder-1/>"
+#~ msgstr "-A <placeholder-1/>"
+
+#~ msgid "-M <placeholder-1/>"
+#~ msgstr "-M <placeholder-1/>"
+
+#~ msgid ""
+#~ "Group administrator can add and delete users using <option>-a</option> "
+#~ "and <option>-d</option> options respectively. Administrators can use "
+#~ "<option>-r</option> option to remove group password. When no password is "
+#~ "set only group members can use <command>newgrp</command> to join the "
+#~ "group. Option <option>-R</option> disables access via a password to the "
+#~ "group through <command>newgrp</command> command (however members will "
+#~ "still be able to switch to this group)."
+#~ msgstr ""
+#~ "Администратор группы может добавлять и удалять пользователей с помощью "
+#~ "параметров <option>-a</option> и <option>-d</option> соответственно. "
+#~ "Администраторы могут использовать параметр <option>-r</option> для "
+#~ "удаления пароля группы. Если пароль не задан, то только члены группы с "
+#~ "помощью команды <command>newgrp</command> могут войти в группу. Указав "
+#~ "параметр <option>-R</option> можно запретить доступ в группу по паролю с "
+#~ "помощью команды <command>newgrp</command> (однако на членов группы это не "
+#~ "распространяется)."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."

Modified: upstream/trunk/man/po/sv.po
===================================================================
--- upstream/trunk/man/po/sv.po	2007-11-25 21:06:49 UTC (rev 1464)
+++ upstream/trunk/man/po/sv.po	2007-11-25 21:28:26 UTC (rev 1465)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: man pages for shadow 4.0.18\n"
-"POT-Creation-Date: 2007-11-10 23:24+0100\n"
+"POT-Creation-Date: 2007-11-25 20:28+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"
@@ -73,7 +73,7 @@
 #: login.access.5.xml:15(title) login.1.xml:36(title) limits.5.xml:16(title)
 #: lastlog.8.xml:24(title) gshadow.5.xml:15(title) grpck.8.xml:25(title)
 #: groups.1.xml:24(title) groupmod.8.xml:25(title) groupmems.8.xml:27(title)
-#: groupdel.8.xml:24(title) groupadd.8.xml:30(title) gpasswd.1.xml:27(title)
+#: groupdel.8.xml:24(title) groupadd.8.xml:30(title) gpasswd.1.xml:32(title)
 #: faillog.8.xml:24(title) faillog.5.xml:15(title) expiry.1.xml:23(title)
 #: chsh.1.xml:27(title) chpasswd.8.xml:24(title) chgpasswd.8.xml:24(title)
 #: chfn.1.xml:27(title) chage.1.xml:26(title)
@@ -109,8 +109,8 @@
 #: useradd.8.xml:48(title) su.1.xml:74(title) pwck.8.xml:96(title)
 #: passwd.1.xml:140(title) login.1.xml:119(title) lastlog.8.xml:36(title)
 #: grpck.8.xml:69(title) groupmod.8.xml:34(title) groupmems.8.xml:42(title)
-#: groupadd.8.xml:39(title) gpasswd.1.xml:58(title) faillog.8.xml:35(title)
-#: chsh.1.xml:38(title) chpasswd.8.xml:46(title) chgpasswd.8.xml:45(title)
+#: groupadd.8.xml:39(title) gpasswd.1.xml:72(title) faillog.8.xml:35(title)
+#: chsh.1.xml:38(title) chpasswd.8.xml:52(title) chgpasswd.8.xml:51(title)
 #: chage.1.xml:36(title)
 msgid "OPTIONS"
 msgstr "FLAGGOR"
@@ -131,17 +131,17 @@
 msgid "Edit group database."
 msgstr "Redigera gruppdatabasen."
 
-#: vipw.8.xml:64(term) userdel.8.xml:63(term) useradd.8.xml:164(term)
+#: vipw.8.xml:64(term) userdel.8.xml:63(term) useradd.8.xml:165(term)
 #: passwd.1.xml:180(term) lastlog.8.xml:52(term) groupmod.8.xml:60(term)
 #: groupadd.8.xml:74(term) faillog.8.xml:48(term) chsh.1.xml:44(term)
-#: chpasswd.8.xml:59(term) chgpasswd.8.xml:58(term) chage.1.xml:74(term)
+#: chpasswd.8.xml:75(term) chgpasswd.8.xml:74(term) chage.1.xml:74(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
-#: vipw.8.xml:66(para) userdel.8.xml:65(para) useradd.8.xml:166(para)
+#: vipw.8.xml:66(para) userdel.8.xml:65(para) useradd.8.xml:167(para)
 #: passwd.1.xml:182(para) lastlog.8.xml:56(para) groupmod.8.xml:62(para)
 #: groupadd.8.xml:76(para) faillog.8.xml:50(para) chsh.1.xml:46(para)
-#: chpasswd.8.xml:61(para) chgpasswd.8.xml:60(para) chage.1.xml:76(para)
+#: chpasswd.8.xml:77(para) chgpasswd.8.xml:76(para) chage.1.xml:76(para)
 msgid "Display help message and exit."
 msgstr "Visa hjälpmeddelande och avsluta."
 
@@ -153,11 +153,11 @@
 msgid "Edit passwd database."
 msgstr "Redigera lösenordsdatabasen."
 
-#: vipw.8.xml:76(term) passwd.1.xml:234(term)
+#: vipw.8.xml:76(term) passwd.1.xml:235(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:78(para) passwd.1.xml:238(para)
+#: vipw.8.xml:78(para) passwd.1.xml:239(para)
 msgid "Quiet mode."
 msgstr "Tyst läge."
 
@@ -169,105 +169,114 @@
 msgid "Edit shadow or gshadow database."
 msgstr "Redigera shadow- eller gshadow-databasen."
 
-#: vipw.8.xml:91(title) usermod.8.xml:246(title) userdel.8.xml:89(title)
-#: useradd.8.xml:370(title) suauth.5.xml:139(title) su.1.xml:176(title)
+#: vipw.8.xml:91(title) usermod.8.xml:260(title) userdel.8.xml:89(title)
+#: useradd.8.xml:371(title) suauth.5.xml:139(title) su.1.xml:176(title)
 #: sg.1.xml:43(title) shadow.5.xml:105(title) shadow.3.xml:172(title)
 #: pwconv.8.xml:109(title) pwck.8.xml:145(title) porttime.5.xml:76(title)
-#: passwd.5.xml:87(title) passwd.1.xml:322(title) newusers.8.xml:90(title)
+#: passwd.5.xml:87(title) passwd.1.xml:324(title) newusers.8.xml:96(title)
 #: newgrp.1.xml:54(title) logoutd.8.xml:35(title) login.access.5.xml:66(title)
 #: login.1.xml:198(title) limits.5.xml:110(title) lastlog.8.xml:113(title)
 #: gshadow.5.xml:61(title) grpck.8.xml:87(title) groups.1.xml:46(title)
 #: groupmod.8.xml:92(title) groupmems.8.xml:103(title)
-#: groupdel.8.xml:43(title) groupadd.8.xml:114(title) gpasswd.1.xml:147(title)
+#: groupdel.8.xml:43(title) groupadd.8.xml:114(title) gpasswd.1.xml:178(title)
 #: faillog.8.xml:132(title) faillog.5.xml:38(title) expiry.1.xml:32(title)
-#: chsh.1.xml:85(title) chfn.1.xml:60(title) chage.1.xml:177(title)
+#: chsh.1.xml:85(title) chpasswd.8.xml:248(title) chgpasswd.8.xml:125(title)
+#: chfn.1.xml:60(title) chage.1.xml:177(title)
 msgid "FILES"
 msgstr "FILER"
 
-#: vipw.8.xml:94(filename) usermod.8.xml:249(filename)
-#: userdel.8.xml:92(filename) useradd.8.xml:385(filename)
-#: sg.1.xml:58(filename) pwck.8.xml:148(filename) newgrp.1.xml:69(filename)
-#: gshadow.5.xml:64(filename) grpck.8.xml:90(filename)
-#: groups.1.xml:49(filename) groupmod.8.xml:95(filename)
-#: groupmems.8.xml:106(filename) groupdel.8.xml:46(filename)
-#: groupadd.8.xml:117(filename) gpasswd.1.xml:11(filename)
-#: gpasswd.1.xml:150(filename)
+#: vipw.8.xml:94(filename) usermod.8.xml:263(filename)
+#: userdel.8.xml:92(filename) useradd.8.xml:386(filename)
+#: sg.1.xml:58(filename) pwck.8.xml:148(filename) newusers.8.xml:111(filename)
+#: newgrp.1.xml:69(filename) gshadow.5.xml:64(filename)
+#: grpck.8.xml:90(filename) groups.1.xml:49(filename)
+#: groupmod.8.xml:95(filename) groupmems.8.xml:106(filename)
+#: groupdel.8.xml:46(filename) groupadd.8.xml:117(filename)
+#: gpasswd.1.xml:12(filename) gpasswd.1.xml:181(filename)
+#: chgpasswd.8.xml:128(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
-#: vipw.8.xml:96(para) usermod.8.xml:251(para) userdel.8.xml:94(para)
-#: useradd.8.xml:387(para) sg.1.xml:60(para) pwck.8.xml:150(para)
-#: newgrp.1.xml:71(para) gshadow.5.xml:66(para) grpck.8.xml:92(para)
-#: groups.1.xml:51(para) groupmod.8.xml:97(para) groupmems.8.xml:108(para)
-#: groupdel.8.xml:48(para) groupadd.8.xml:119(para) gpasswd.1.xml:152(para)
+#: vipw.8.xml:96(para) usermod.8.xml:265(para) userdel.8.xml:94(para)
+#: useradd.8.xml:388(para) sg.1.xml:60(para) pwck.8.xml:150(para)
+#: newusers.8.xml:113(para) newgrp.1.xml:71(para) gshadow.5.xml:66(para)
+#: grpck.8.xml:92(para) groups.1.xml:51(para) groupmod.8.xml:97(para)
+#: groupmems.8.xml:108(para) groupdel.8.xml:48(para) groupadd.8.xml:119(para)
+#: gpasswd.1.xml:183(para) chgpasswd.8.xml:130(para)
 msgid "Group account information."
 msgstr "Gruppkontoinformation."
 
-#: vipw.8.xml:100(filename) sg.1.xml:64(filename) newgrp.1.xml:75(filename)
-#: gshadow.5.xml:70(filename) grpck.8.xml:96(filename)
-#: groupmod.8.xml:101(filename) groupmems.8.xml:112(filename)
-#: groupdel.8.xml:52(filename) groupadd.8.xml:123(filename)
-#: gpasswd.1.xml:156(filename)
+#: vipw.8.xml:100(filename) sg.1.xml:64(filename) newusers.8.xml:117(filename)
+#: newgrp.1.xml:75(filename) gshadow.5.xml:70(filename)
+#: grpck.8.xml:96(filename) groupmod.8.xml:101(filename)
+#: groupmems.8.xml:112(filename) groupdel.8.xml:52(filename)
+#: groupadd.8.xml:123(filename) gpasswd.1.xml:13(filename)
+#: gpasswd.1.xml:187(filename) chgpasswd.8.xml:134(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
-#: vipw.8.xml:102(para) sg.1.xml:66(para) newgrp.1.xml:77(para)
-#: gshadow.5.xml:72(para) grpck.8.xml:98(para) groupmod.8.xml:103(para)
-#: groupdel.8.xml:54(para) groupadd.8.xml:125(para) gpasswd.1.xml:158(para)
+#: vipw.8.xml:102(para) sg.1.xml:66(para) newusers.8.xml:119(para)
+#: newgrp.1.xml:77(para) gshadow.5.xml:72(para) grpck.8.xml:98(para)
+#: groupmod.8.xml:103(para) groupdel.8.xml:54(para) groupadd.8.xml:125(para)
+#: gpasswd.1.xml:189(para) chgpasswd.8.xml:136(para)
 msgid "Secure group account information."
 msgstr "Säker gruppkontoinformation."
 
-#: vipw.8.xml:106(filename) usermod.8.xml:255(filename)
-#: userdel.8.xml:104(filename) useradd.8.xml:373(filename)
+#: vipw.8.xml:106(filename) usermod.8.xml:269(filename)
+#: userdel.8.xml:104(filename) useradd.8.xml:374(filename)
 #: su.1.xml:179(filename) sg.1.xml:46(filename) shadow.5.xml:108(filename)
 #: pwck.8.xml:154(filename) passwd.5.xml:90(filename)
-#: passwd.1.xml:325(filename) newgrp.1.xml:57(filename)
-#: login.1.xml:213(filename) grpck.8.xml:102(filename)
-#: expiry.1.xml:35(filename) chsh.1.xml:88(filename) chfn.1.xml:69(filename)
+#: passwd.1.xml:327(filename) newusers.8.xml:99(filename)
+#: newgrp.1.xml:57(filename) login.1.xml:213(filename)
+#: grpck.8.xml:102(filename) expiry.1.xml:35(filename) chsh.1.xml:88(filename)
+#: chpasswd.8.xml:251(filename) chfn.1.xml:69(filename)
 #: chage.1.xml:181(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
-#: vipw.8.xml:108(para) usermod.8.xml:257(para) userdel.8.xml:106(para)
-#: useradd.8.xml:375(para) su.1.xml:181(para) sg.1.xml:48(para)
+#: vipw.8.xml:108(para) usermod.8.xml:271(para) userdel.8.xml:106(para)
+#: useradd.8.xml:376(para) su.1.xml:181(para) sg.1.xml:48(para)
 #: shadow.5.xml:110(para) pwck.8.xml:156(para) passwd.5.xml:92(para)
-#: passwd.1.xml:327(para) newgrp.1.xml:59(para) login.1.xml:215(para)
-#: grpck.8.xml:104(para) expiry.1.xml:37(para) chsh.1.xml:90(para)
-#: chfn.1.xml:71(para) chage.1.xml:184(para)
+#: passwd.1.xml:329(para) newusers.8.xml:101(para) newgrp.1.xml:59(para)
+#: login.1.xml:215(para) grpck.8.xml:104(para) expiry.1.xml:37(para)
+#: chsh.1.xml:90(para) chpasswd.8.xml:253(para) chfn.1.xml:71(para)
+#: chage.1.xml:184(para)
 msgid "User account information."
 msgstr "Användarkontoinformation."
 
-#: vipw.8.xml:112(filename) usermod.8.xml:261(filename)
-#: userdel.8.xml:110(filename) useradd.8.xml:379(filename)
+#: vipw.8.xml:112(filename) usermod.8.xml:275(filename)
+#: userdel.8.xml:110(filename) useradd.8.xml:380(filename)
 #: su.1.xml:185(filename) sg.1.xml:52(filename) shadow.5.xml:114(filename)
 #: shadow.3.xml:175(filename) pwck.8.xml:160(filename)
-#: passwd.5.xml:96(filename) passwd.1.xml:331(filename)
-#: newgrp.1.xml:63(filename) login.1.xml:219(filename)
-#: expiry.1.xml:41(filename) chage.1.xml:189(filename)
+#: passwd.5.xml:96(filename) passwd.1.xml:333(filename)
+#: newusers.8.xml:105(filename) newgrp.1.xml:63(filename)
+#: login.1.xml:219(filename) expiry.1.xml:41(filename)
+#: chpasswd.8.xml:257(filename) chage.1.xml:189(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
-#: vipw.8.xml:114(para) usermod.8.xml:263(para) userdel.8.xml:112(para)
-#: useradd.8.xml:381(para) su.1.xml:187(para) sg.1.xml:54(para)
+#: vipw.8.xml:114(para) usermod.8.xml:277(para) userdel.8.xml:112(para)
+#: useradd.8.xml:382(para) su.1.xml:187(para) sg.1.xml:54(para)
 #: shadow.5.xml:116(para) shadow.3.xml:177(para) pwck.8.xml:162(para)
-#: passwd.1.xml:333(para) newgrp.1.xml:65(para) login.1.xml:221(para)
-#: expiry.1.xml:43(para) chage.1.xml:192(para)
+#: passwd.1.xml:335(para) newusers.8.xml:107(para) newgrp.1.xml:65(para)
+#: login.1.xml:221(para) expiry.1.xml:43(para) chpasswd.8.xml:259(para)
+#: chage.1.xml:192(para)
 msgid "Secure user account information."
 msgstr "Säker användarkontoinformation."
 
-#: vipw.8.xml:120(title) usermod.8.xml:270(title) userdel.8.xml:191(title)
-#: useradd.8.xml:481(title) suauth.5.xml:168(title) su.1.xml:194(title)
+#: vipw.8.xml:120(title) usermod.8.xml:284(title) userdel.8.xml:191(title)
+#: useradd.8.xml:482(title) suauth.5.xml:168(title) su.1.xml:194(title)
 #: sg.1.xml:73(title) shadow.5.xml:123(title) shadow.3.xml:184(title)
 #: pwconv.8.xml:121(title) pwck.8.xml:169(title) porttime.5.xml:88(title)
-#: passwd.5.xml:105(title) passwd.1.xml:391(title) nologin.8.xml:35(title)
-#: newusers.8.xml:102(title) newgrp.1.xml:84(title)
-#: login.defs.5.xml:256(title) login.access.5.xml:78(title)
+#: passwd.5.xml:105(title) passwd.1.xml:393(title) nologin.8.xml:35(title)
+#: newusers.8.xml:132(title) newgrp.1.xml:84(title)
+#: login.defs.5.xml:412(title) login.access.5.xml:78(title)
 #: login.1.xml:252(title) limits.5.xml:120(title) gshadow.5.xml:79(title)
 #: grpck.8.xml:111(title) groups.1.xml:58(title) groupmod.8.xml:161(title)
 #: groupmems.8.xml:121(title) groupdel.8.xml:100(title)
-#: groupadd.8.xml:197(title) gpasswd.1.xml:165(title) faillog.8.xml:144(title)
+#: groupadd.8.xml:204(title) gpasswd.1.xml:196(title) faillog.8.xml:144(title)
 #: faillog.5.xml:50(title) expiry.1.xml:50(title) chsh.1.xml:109(title)
-#: chpasswd.8.xml:85(title) chgpasswd.8.xml:84(title) chfn.1.xml:78(title)
+#: chpasswd.8.xml:272(title) chgpasswd.8.xml:149(title) chfn.1.xml:78(title)
 #: chage.1.xml:232(title)
 msgid "SEE ALSO"
 msgstr "SE OCKSÅ"
@@ -293,7 +302,7 @@
 "citerefentry>."
 
 #: usermod.8.xml:5(refentrytitle) usermod.8.xml:10(refname)
-#: usermod.8.xml:16(command) login.defs.5.xml:229(term)
+#: usermod.8.xml:16(command) login.defs.5.xml:385(term)
 msgid "usermod"
 msgstr "usermod"
 
@@ -350,7 +359,7 @@
 "ändras det med verktyget <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: usermod.8.xml:65(term) useradd.8.xml:91(term)
+#: usermod.8.xml:65(term) useradd.8.xml:92(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -365,7 +374,7 @@
 "directory, which is created if it does not already exist."
 msgstr ""
 
-#: usermod.8.xml:79(term) useradd.8.xml:108(term) useradd.8.xml:293(term)
+#: usermod.8.xml:79(term) useradd.8.xml:109(term) useradd.8.xml:294(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -373,13 +382,13 @@
 "<option>-e</option>, <option>--expiredate</option><replaceable>UTGÅNGSDATUM</"
 "replaceable>"
 
-#: usermod.8.xml:84(para) useradd.8.xml:113(para)
+#: usermod.8.xml:84(para) useradd.8.xml:114(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:91(term) useradd.8.xml:120(term) useradd.8.xml:302(term)
+#: usermod.8.xml:91(term) useradd.8.xml:121(term) useradd.8.xml:303(term)
 msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -387,14 +396,14 @@
 "<option>-f</option>, <option>--inactive</option><replaceable>INAKTIV</"
 "replaceable>"
 
-#: usermod.8.xml:96(para) useradd.8.xml:125(para)
+#: usermod.8.xml:96(para) useradd.8.xml:126(para)
 msgid ""
 "The number of days after a password expires until the account is permanently "
 "disabled. A value of 0 disables the account as soon as the password has "
 "expired, and a value of -1 disables the feature. The default value is -1."
 msgstr ""
 
-#: usermod.8.xml:105(term) useradd.8.xml:134(term) useradd.8.xml:314(term)
+#: usermod.8.xml:105(term) useradd.8.xml:135(term) useradd.8.xml:315(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
@@ -407,7 +416,7 @@
 "default group number is 1."
 msgstr ""
 
-#: usermod.8.xml:118(term) useradd.8.xml:148(term)
+#: usermod.8.xml:118(term) useradd.8.xml:149(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -458,17 +467,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:164(term) useradd.8.xml:217(term) groupmod.8.xml:78(term)
+#: usermod.8.xml:161(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:170(term) useradd.8.xml:218(term) groupmod.8.xml:78(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
-#: usermod.8.xml:168(para)
+#: usermod.8.xml:174(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:175(term) useradd.8.xml:225(term)
+#: usermod.8.xml:181(term) useradd.8.xml:226(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -476,7 +492,7 @@
 "<option>-p</option>, <option>--password</option><replaceable>LÖSENORD</"
 "replaceable>"
 
-#: usermod.8.xml:180(para)
+#: usermod.8.xml:186(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
@@ -485,26 +501,26 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>."
 
-#: usermod.8.xml:188(term) useradd.8.xml:238(term) useradd.8.xml:327(term)
+#: usermod.8.xml:194(term) useradd.8.xml:239(term) useradd.8.xml:328(term)
 #: su.1.xml:108(term) chsh.1.xml:50(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SKAL</replaceable>"
 
-#: usermod.8.xml:193(para) chsh.1.xml:54(para)
+#: usermod.8.xml:199(para) chsh.1.xml:54(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:200(term) useradd.8.xml:251(term)
+#: usermod.8.xml:206(term) useradd.8.xml:252(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: usermod.8.xml:205(para)
+#: usermod.8.xml:211(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. Values "
@@ -514,11 +530,11 @@
 "Files outside of the user's home directory must be altered manually."
 msgstr ""
 
-#: usermod.8.xml:218(term)
+#: usermod.8.xml:224(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:222(para)
+#: usermod.8.xml:228(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</"
@@ -528,15 +544,24 @@
 "krypterade lösenordet. Du kan inte använda denna flagga med <option>-p</"
 "option> eller <option>-L</option>."
 
-#: usermod.8.xml:233(title) userdel.8.xml:170(title) useradd.8.xml:350(title)
-#: su.1.xml:168(title) shadow.3.xml:164(title) passwd.1.xml:311(title)
+#: usermod.8.xml:233(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 <replaceable>EXPIRE</"
+"replaceable> value from <filename>/etc/default/useradd</filename>)."
+msgstr ""
+
+#: usermod.8.xml:247(title) userdel.8.xml:170(title) useradd.8.xml:351(title)
+#: su.1.xml:168(title) shadow.3.xml:164(title) passwd.1.xml:313(title)
 #: newusers.8.xml:82(title) login.1.xml:164(title) lastlog.8.xml:125(title)
-#: groupdel.8.xml:36(title) groupadd.8.xml:138(title) faillog.8.xml:121(title)
-#: chpasswd.8.xml:77(title) chgpasswd.8.xml:76(title)
+#: groupdel.8.xml:36(title) groupadd.8.xml:138(title) gpasswd.1.xml:166(title)
+#: faillog.8.xml:121(title) chpasswd.8.xml:118(title)
+#: chgpasswd.8.xml:117(title)
 msgid "CAVEATS"
 msgstr "TÄNK PÅ"
 
-#: usermod.8.xml:234(para)
+#: usermod.8.xml:248(para)
 msgid ""
 "<command>usermod</command> will not allow you to change the name of a user "
 "who is logged in. You must make certain that the named user is not executing "
@@ -547,7 +572,7 @@
 "server."
 msgstr ""
 
-#: usermod.8.xml:271(para)
+#: usermod.8.xml:285(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -586,7 +611,7 @@
 "manvolnum></citerefentry>."
 
 #: userdel.8.xml:5(refentrytitle) userdel.8.xml:10(refname)
-#: userdel.8.xml:15(command) login.defs.5.xml:221(term)
+#: userdel.8.xml:15(command) login.defs.5.xml:377(term)
 msgid "userdel"
 msgstr "userdel"
 
@@ -650,42 +675,44 @@
 "the <filename>login.defs</filename> file."
 msgstr ""
 
-#: userdel.8.xml:98(filename) useradd.8.xml:403(filename)
-#: pwconv.8.xml:112(filename) newusers.8.xml:93(filename)
+#: userdel.8.xml:98(filename) useradd.8.xml:404(filename)
+#: pwconv.8.xml:112(filename) newusers.8.xml:123(filename)
 #: login.access.5.xml:69(filename) groupadd.8.xml:129(filename)
-#: chsh.1.xml:100(filename) chfn.1.xml:63(filename)
+#: chsh.1.xml:100(filename) chpasswd.8.xml:263(filename)
+#: chgpasswd.8.xml:140(filename) chfn.1.xml:63(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:100(para) useradd.8.xml:405(para) pwconv.8.xml:114(para)
-#: newusers.8.xml:95(para) login.access.5.xml:71(para)
-#: groupadd.8.xml:131(para) chsh.1.xml:102(para) chfn.1.xml:65(para)
+#: userdel.8.xml:100(para) useradd.8.xml:406(para) pwconv.8.xml:114(para)
+#: newusers.8.xml:125(para) login.access.5.xml:71(para)
+#: groupadd.8.xml:131(para) chsh.1.xml:102(para) chpasswd.8.xml:265(para)
+#: chgpasswd.8.xml:142(para) chfn.1.xml:65(para)
 msgid "Shadow password suite configuration."
 msgstr ""
 
-#: userdel.8.xml:119(title) useradd.8.xml:412(title) pwck.8.xml:186(title)
-#: passwd.1.xml:340(title) grpck.8.xml:129(title) groupmod.8.xml:110(title)
-#: groupdel.8.xml:61(title) groupadd.8.xml:152(title) chage.1.xml:199(title)
+#: userdel.8.xml:119(title) useradd.8.xml:413(title) pwck.8.xml:186(title)
+#: passwd.1.xml:342(title) grpck.8.xml:129(title) groupmod.8.xml:110(title)
+#: groupdel.8.xml:61(title) groupadd.8.xml:159(title) chage.1.xml:199(title)
 msgid "EXIT VALUES"
 msgstr "AVSLUTNINGSVÄRDEN"
 
-#: userdel.8.xml:124(replaceable) useradd.8.xml:417(replaceable)
-#: pwck.8.xml:191(replaceable) passwd.1.xml:345(replaceable)
+#: userdel.8.xml:124(replaceable) useradd.8.xml:418(replaceable)
+#: pwck.8.xml:191(replaceable) passwd.1.xml:347(replaceable)
 #: grpck.8.xml:134(replaceable) groupmod.8.xml:115(replaceable)
-#: groupdel.8.xml:66(replaceable) groupadd.8.xml:157(replaceable)
+#: groupdel.8.xml:66(replaceable) groupadd.8.xml:164(replaceable)
 #: chage.1.xml:204(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:126(para) useradd.8.xml:419(para) pwck.8.xml:193(para)
-#: passwd.1.xml:347(para) grpck.8.xml:136(para) groupmod.8.xml:117(para)
-#: groupdel.8.xml:68(para) groupadd.8.xml:159(para) chage.1.xml:206(para)
+#: userdel.8.xml:126(para) useradd.8.xml:420(para) pwck.8.xml:193(para)
+#: passwd.1.xml:349(para) grpck.8.xml:136(para) groupmod.8.xml:117(para)
+#: groupdel.8.xml:68(para) groupadd.8.xml:166(para) chage.1.xml:206(para)
 msgid "success"
 msgstr "lyckad"
 
-#: userdel.8.xml:130(replaceable) useradd.8.xml:423(replaceable)
+#: userdel.8.xml:130(replaceable) useradd.8.xml:424(replaceable)
 #: su.1.xml:6(manvolnum) sg.1.xml:6(manvolnum) pwck.8.xml:197(replaceable)
-#: passwd.1.xml:6(manvolnum) passwd.1.xml:351(replaceable)
+#: passwd.1.xml:6(manvolnum) passwd.1.xml:353(replaceable)
 #: newgrp.1.xml:6(manvolnum) login.1.xml:6(manvolnum)
 #: grpck.8.xml:140(replaceable) groups.1.xml:6(manvolnum)
 #: gpasswd.1.xml:6(manvolnum) expiry.1.xml:6(manvolnum)
@@ -694,26 +721,26 @@
 msgid "1"
 msgstr "1"
 
-#: userdel.8.xml:132(para) useradd.8.xml:425(para)
+#: userdel.8.xml:132(para) useradd.8.xml:426(para)
 msgid "can't update password file"
 msgstr "kan inte uppdatera lösenordsfilen"
 
-#: userdel.8.xml:136(replaceable) useradd.8.xml:429(replaceable)
-#: pwck.8.xml:203(replaceable) passwd.1.xml:357(replaceable)
+#: userdel.8.xml:136(replaceable) useradd.8.xml:430(replaceable)
+#: pwck.8.xml:203(replaceable) passwd.1.xml:359(replaceable)
 #: grpck.8.xml:146(replaceable) groupmod.8.xml:121(replaceable)
-#: groupdel.8.xml:72(replaceable) groupadd.8.xml:163(replaceable)
+#: groupdel.8.xml:72(replaceable) groupadd.8.xml:170(replaceable)
 #: chage.1.xml:216(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:138(para) useradd.8.xml:431(para) pwck.8.xml:199(para)
+#: userdel.8.xml:138(para) useradd.8.xml:432(para) pwck.8.xml:199(para)
 #: grpck.8.xml:142(para) groupmod.8.xml:123(para) groupdel.8.xml:74(para)
-#: groupadd.8.xml:165(para) chage.1.xml:218(para)
+#: groupadd.8.xml:172(para) chage.1.xml:218(para)
 msgid "invalid command syntax"
 msgstr "ogiltig kommandosyntax"
 
-#: userdel.8.xml:142(replaceable) useradd.8.xml:447(replaceable)
-#: passwd.1.xml:381(replaceable) groupmod.8.xml:139(replaceable)
+#: userdel.8.xml:142(replaceable) useradd.8.xml:448(replaceable)
+#: passwd.1.xml:383(replaceable) groupmod.8.xml:139(replaceable)
 #: groupdel.8.xml:78(replaceable)
 msgid "6"
 msgstr "6"
@@ -726,18 +753,18 @@
 msgid "user currently logged in"
 msgstr "användaren är för närvarande inloggad"
 
-#: userdel.8.xml:154(replaceable) useradd.8.xml:459(replaceable)
+#: userdel.8.xml:154(replaceable) useradd.8.xml:460(replaceable)
 #: groupmod.8.xml:151(replaceable) groupdel.8.xml:90(replaceable)
-#: groupadd.8.xml:187(replaceable)
+#: groupadd.8.xml:194(replaceable)
 msgid "10"
 msgstr "10"
 
-#: userdel.8.xml:156(para) useradd.8.xml:461(para) groupmod.8.xml:153(para)
-#: groupdel.8.xml:92(para) groupadd.8.xml:189(para)
+#: userdel.8.xml:156(para) useradd.8.xml:462(para) groupmod.8.xml:153(para)
+#: groupdel.8.xml:92(para) groupadd.8.xml:196(para)
 msgid "can't update group file"
 msgstr "kan inte uppdatera gruppfilen"
 
-#: userdel.8.xml:160(replaceable) useradd.8.xml:465(replaceable)
+#: userdel.8.xml:160(replaceable) useradd.8.xml:466(replaceable)
 msgid "12"
 msgstr "12"
 
@@ -815,7 +842,7 @@
 
 #: useradd.8.xml:5(refentrytitle) useradd.8.xml:10(refname)
 #: useradd.8.xml:15(command) useradd.8.xml:22(command)
-#: useradd.8.xml:26(command) login.defs.5.xml:210(term)
+#: useradd.8.xml:26(command) login.defs.5.xml:366(term)
 msgid "useradd"
 msgstr "useradd"
 
@@ -824,7 +851,7 @@
 msgstr ""
 "skapa en ny användare eller uppdatera standardinformation för nya användare"
 
-#: useradd.8.xml:23(arg) useradd.8.xml:27(arg) useradd.8.xml:82(option)
+#: useradd.8.xml:23(arg) useradd.8.xml:27(arg) useradd.8.xml:83(option)
 msgid "-D"
 msgstr "-D"
 
@@ -848,7 +875,7 @@
 "currently used as the field for the user's full name."
 msgstr ""
 
-#: useradd.8.xml:66(term) useradd.8.xml:278(term)
+#: useradd.8.xml:66(term) useradd.8.xml:279(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
@@ -856,18 +883,19 @@
 
 #: useradd.8.xml:71(para)
 msgid ""
-"The default base directory for the system if <option>-d</option> dir 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."
+"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:85(para)
+#: useradd.8.xml:86(para)
 #, fuzzy
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr "Ändrar standardvärden"
 
-#: useradd.8.xml:96(para)
+#: useradd.8.xml:97(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 "
@@ -877,7 +905,7 @@
 "created if it is missing."
 msgstr ""
 
-#: useradd.8.xml:139(para)
+#: useradd.8.xml:140(para)
 msgid ""
 "The group name or number of the user's initial login group. The group name "
 "must exist. A group number must refer to an already existing group. The "
@@ -885,7 +913,7 @@
 "useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:153(para)
+#: useradd.8.xml:154(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. "
@@ -894,11 +922,11 @@
 "the initial group."
 msgstr ""
 
-#: useradd.8.xml:170(term)
+#: useradd.8.xml:171(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:174(para)
+#: useradd.8.xml:175(para)
 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 "
@@ -911,7 +939,7 @@
 "to not copy any files."
 msgstr ""
 
-#: useradd.8.xml:190(term)
+#: useradd.8.xml:191(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -919,7 +947,7 @@
 "<option>-K</option>, <option>--key</option><replaceable>NYCKEL</"
 "replaceable>=<replaceable>VÄRDE</replaceable>"
 
-#: useradd.8.xml:195(para)
+#: useradd.8.xml:196(para)
 msgid ""
 "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS "
 "and others). <placeholder-1/> Example: <option>-K </"
@@ -941,7 +969,7 @@
 "replaceable><option> -K </option><replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable>"
 
-#: useradd.8.xml:209(para)
+#: useradd.8.xml:210(para)
 msgid ""
 "Note: <option>-K </option><replaceable>UID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
@@ -951,24 +979,24 @@
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable> fungerar ännu inte."
 
-#: useradd.8.xml:221(para)
+#: useradd.8.xml:222(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr ""
 
-#: useradd.8.xml:230(para)
+#: useradd.8.xml:231(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
 "disable the account."
 msgstr ""
 
-#: useradd.8.xml:243(para)
+#: useradd.8.xml:244(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."
 msgstr ""
 
-#: useradd.8.xml:256(para)
+#: useradd.8.xml:257(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -977,11 +1005,11 @@
 "accounts."
 msgstr ""
 
-#: useradd.8.xml:268(title)
+#: useradd.8.xml:269(title)
 msgid "Changing the default values"
 msgstr "Ändrar standardvärden"
 
-#: useradd.8.xml:269(para)
+#: useradd.8.xml:270(para)
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
 "command> will display the current default values. When invoked with <option>-"
@@ -989,7 +1017,7 @@
 "default values for the specified options. Valid default-changing options are:"
 msgstr ""
 
-#: useradd.8.xml:283(para)
+#: useradd.8.xml:284(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 "
@@ -997,11 +1025,11 @@
 "when creating a new account."
 msgstr ""
 
-#: useradd.8.xml:298(para)
+#: useradd.8.xml:299(para)
 msgid "The date on which the user account is disabled."
 msgstr "Datumet när användarkontot blir inaktiverat."
 
-#: useradd.8.xml:307(para)
+#: useradd.8.xml:308(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
@@ -1009,21 +1037,21 @@
 "Antalet dagar efter att ett lösenord har gått ut innan kontot kommer att "
 "inaktiveras."
 
-#: useradd.8.xml:319(para)
+#: useradd.8.xml:320(para)
 msgid ""
 "The group name or ID for a new user's initial group. The named group must "
 "exist, and a numerical group ID must have an existing entry."
 msgstr ""
 
-#: useradd.8.xml:332(para)
+#: useradd.8.xml:333(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
-#: useradd.8.xml:343(title)
+#: useradd.8.xml:344(title)
 msgid "NOTES"
 msgstr "NOTERINGAR"
 
-#: useradd.8.xml:344(para)
+#: useradd.8.xml:345(para)
 msgid ""
 "The system administrator is responsible for placing the default user files "
 "in the <filename>/etc/skel/</filename> directory."
@@ -1031,22 +1059,23 @@
 "Systemadministratören är ansvarig för att placera standardanvändarfiler i "
 "katalogen <filename>/etc/skel/</filename>."
 
-#: useradd.8.xml:351(para)
+#: useradd.8.xml:352(para)
+#, fuzzy
 msgid ""
-"You may not add a user to a NIS group. This must be performed on the NIS "
-"server."
+"You may not add a user to a NIS or LDAP group. This must be performed on the "
+"corresponding server."
 msgstr ""
 "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:356(para)
+#: useradd.8.xml:357(para)
 msgid ""
 "Similarly, if the username already exists in an external user database such "
-"as NIS, <command>useradd</command> will deny the user account creation "
-"request."
+"as NIS or LDAP, <command>useradd</command> will deny the user account "
+"creation request."
 msgstr ""
 
-#: useradd.8.xml:362(para)
+#: useradd.8.xml:363(para)
 msgid ""
 "Usernames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
@@ -1056,71 +1085,71 @@
 "endast innehålla gemener, understreck, minustecken och på slutet ett dollar-"
 "tecken. I reguljära uttryckstermer: [a-z_][a-z0-9_-]*[$]"
 
-#: useradd.8.xml:391(filename)
+#: useradd.8.xml:392(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
-#: useradd.8.xml:393(para)
+#: useradd.8.xml:394(para)
 msgid "Default values for account creation."
 msgstr "Standardvärden för skapande av konto."
 
-#: useradd.8.xml:397(filename)
+#: useradd.8.xml:398(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
-#: useradd.8.xml:399(para)
+#: useradd.8.xml:400(para)
 msgid "Directory containing default files."
 msgstr "Katalog som innehåller standardfiler."
 
-#: useradd.8.xml:435(replaceable) shadow.3.xml:6(manvolnum)
-#: pwck.8.xml:209(replaceable) passwd.1.xml:363(replaceable)
+#: useradd.8.xml:436(replaceable) shadow.3.xml:6(manvolnum)
+#: pwck.8.xml:209(replaceable) passwd.1.xml:365(replaceable)
 #: grpck.8.xml:152(replaceable) groupmod.8.xml:127(replaceable)
-#: groupadd.8.xml:169(replaceable)
+#: groupadd.8.xml:176(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:437(para) passwd.1.xml:383(para) groupmod.8.xml:129(para)
-#: groupadd.8.xml:171(para)
+#: useradd.8.xml:438(para) passwd.1.xml:385(para) groupmod.8.xml:129(para)
+#: groupadd.8.xml:178(para)
 msgid "invalid argument to option"
 msgstr "ogiltigt argument till flagga"
 
-#: useradd.8.xml:441(replaceable) pwck.8.xml:215(replaceable)
-#: passwd.1.xml:369(replaceable) grpck.8.xml:158(replaceable)
-#: groupmod.8.xml:133(replaceable) groupadd.8.xml:175(replaceable)
+#: useradd.8.xml:442(replaceable) pwck.8.xml:215(replaceable)
+#: passwd.1.xml:371(replaceable) grpck.8.xml:158(replaceable)
+#: groupmod.8.xml:133(replaceable) groupadd.8.xml:182(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:443(para)
+#: useradd.8.xml:444(para)
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr "UID används redan (och inget <option>-o</option>)"
 
-#: useradd.8.xml:449(para) groupmod.8.xml:135(para) groupmod.8.xml:141(para)
+#: useradd.8.xml:450(para) groupmod.8.xml:135(para) groupmod.8.xml:141(para)
 #: groupdel.8.xml:80(para)
 msgid "specified group doesn't exist"
 msgstr "angiven grupp finns inte"
 
-#: useradd.8.xml:453(replaceable) groupmod.8.xml:145(replaceable)
-#: groupadd.8.xml:181(replaceable)
+#: useradd.8.xml:454(replaceable) groupmod.8.xml:145(replaceable)
+#: groupadd.8.xml:188(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:455(para)
+#: useradd.8.xml:456(para)
 msgid "username already in use"
 msgstr "användarnamnet används redan"
 
-#: useradd.8.xml:467(para)
+#: useradd.8.xml:468(para)
 msgid "can't create home directory"
 msgstr "kan inte skapa hemkatalog"
 
-#: useradd.8.xml:471(replaceable)
+#: useradd.8.xml:472(replaceable)
 msgid "13"
 msgstr "13"
 
-#: useradd.8.xml:473(para)
+#: useradd.8.xml:474(para)
 msgid "can't create mail spool"
 msgstr "kan inte skapa postkö"
 
-#: useradd.8.xml:413(para)
+#: useradd.8.xml:414(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1128,7 +1157,7 @@
 "Kommandot <command>useradd</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: useradd.8.xml:482(para)
+#: useradd.8.xml:483(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1172,7 +1201,7 @@
 
 #: suauth.5.xml:6(manvolnum) shadow.5.xml:6(manvolnum)
 #: pwck.8.xml:221(replaceable) porttime.5.xml:6(manvolnum)
-#: passwd.5.xml:6(manvolnum) passwd.1.xml:375(replaceable)
+#: passwd.5.xml:6(manvolnum) passwd.1.xml:377(replaceable)
 #: login.defs.5.xml:6(manvolnum) login.access.5.xml:6(manvolnum)
 #: limits.5.xml:6(manvolnum) gshadow.5.xml:6(manvolnum)
 #: grpck.8.xml:164(replaceable) faillog.5.xml:6(manvolnum)
@@ -1360,7 +1389,7 @@
 "      #\n"
 "    "
 
-#: suauth.5.xml:149(title) pwconv.8.xml:98(title) login.defs.5.xml:239(title)
+#: suauth.5.xml:149(title) pwconv.8.xml:98(title) login.defs.5.xml:395(title)
 msgid "BUGS"
 msgstr "FEL"
 
@@ -1996,7 +2025,7 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 #: pwconv.8.xml:5(refentrytitle) pwconv.8.xml:10(refname)
-#: pwconv.8.xml:19(command) login.defs.5.xml:204(term)
+#: pwconv.8.xml:19(command) login.defs.5.xml:360(term)
 msgid "pwconv"
 msgstr "pwconv"
 
@@ -2130,7 +2159,7 @@
 msgstr "passwd"
 
 #: pwck.8.xml:31(arg) pwck.8.xml:114(option) login.1.xml:148(option)
-#: grpck.8.xml:16(arg) gpasswd.1.xml:93(option)
+#: grpck.8.xml:16(arg) gpasswd.1.xml:112(option)
 msgid "-r"
 msgstr "-r"
 
@@ -2730,14 +2759,16 @@
 msgstr "<option>-l</option>, <option>--lock</option>"
 
 #: passwd.1.xml:215(para)
+#, fuzzy
 msgid ""
 "Lock the named account. This option disables an account by changing the "
-"password to a value which matches no possible encrypted value."
+"password to a value which matches no possible encrypted value, and by "
+"setting the account expiry field to 1."
 msgstr ""
 "Lås angivet konto. Denna flagga inaktiverar ett konto genom att ändra "
 "lösenordet till ett värde som inte matchar något möjligt krypterat värde."
 
-#: passwd.1.xml:222(term) chage.1.xml:109(term)
+#: passwd.1.xml:223(term) chage.1.xml:109(term)
 msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
@@ -2745,7 +2776,7 @@
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAGAR</"
 "replaceable>"
 
-#: passwd.1.xml:226(para) chage.1.xml:113(para)
+#: passwd.1.xml:227(para) chage.1.xml:113(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -2755,7 +2786,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:244(term)
+#: passwd.1.xml:245(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -2763,16 +2794,16 @@
 "<option>-r</option>, <option>--repository</option><replaceable>FÖRRÅD</"
 "replaceable>"
 
-#: passwd.1.xml:248(para)
+#: passwd.1.xml:249(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:254(term)
+#: passwd.1.xml:255(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
-#: passwd.1.xml:258(para)
+#: passwd.1.xml:259(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 "
@@ -2789,21 +2820,22 @@
 "varningsperiod och inaktivitetsperiod för lösenordet. Dessa åldrar anges i "
 "dagar."
 
-#: passwd.1.xml:271(term)
+#: passwd.1.xml:272(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
-#: passwd.1.xml:275(para)
+#: passwd.1.xml:276(para)
+#, fuzzy
 msgid ""
 "Unlock the named account. This option re-enables an account by changing the "
 "password back to its previous value (to value before using <option>-l</"
-"option> option)."
+"option> option), and by resetting the account expiry field."
 msgstr ""
 "Lås upp angivet konto. Denna flagga återaktiverar ett konto genom att ändra "
 "tillbaka lösenordet till dess tidigare värde (till värdet före användning av "
 "flaggan <option>-l</option>)."
 
-#: passwd.1.xml:283(term)
+#: passwd.1.xml:285(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -2811,7 +2843,7 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>VARN_DAGAR</"
 "replaceable>"
 
-#: passwd.1.xml:287(para)
+#: passwd.1.xml:289(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 "
@@ -2822,7 +2854,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:296(term)
+#: passwd.1.xml:298(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -2830,7 +2862,7 @@
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAGAR</"
 "replaceable>"
 
-#: passwd.1.xml:300(para)
+#: passwd.1.xml:302(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -2838,7 +2870,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:312(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Not all options may be supported. Password complexity checking may vary from "
 "site to site. The user is urged to select a password as complex as he or she "
@@ -2851,27 +2883,27 @@
 "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:353(para) chage.1.xml:212(para)
+#: passwd.1.xml:355(para) chage.1.xml:212(para)
 msgid "permission denied"
 msgstr "åtkomst nekad"
 
-#: passwd.1.xml:359(para)
+#: passwd.1.xml:361(para)
 msgid "invalid combination of options"
 msgstr "ogiltig kombination av flaggor"
 
-#: passwd.1.xml:365(para)
+#: passwd.1.xml:367(para)
 msgid "unexpected failure, nothing done"
 msgstr "oväntat fel, ingenting har genomförts"
 
-#: passwd.1.xml:371(para)
+#: passwd.1.xml:373(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr "oväntat fel, filen <filename>passwd</filename> saknas"
 
-#: passwd.1.xml:377(para)
+#: passwd.1.xml:379(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr "Filen <filename>passwd</filename> är upptagen, försök igen"
 
-#: passwd.1.xml:341(para)
+#: passwd.1.xml:343(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -2879,7 +2911,7 @@
 "Kommandot <command>passwd</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: passwd.1.xml:392(para)
+#: passwd.1.xml:394(para)
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -2941,7 +2973,7 @@
 msgstr "Kommandot <command>nologin</command> dök upp i BSD 4.4."
 
 #: newusers.8.xml:5(refentrytitle) newusers.8.xml:10(refname)
-#: newusers.8.xml:16(command) login.defs.5.xml:196(term)
+#: newusers.8.xml:16(command) login.defs.5.xml:352(term)
 msgid "newusers"
 msgstr "newusers"
 
@@ -3012,8 +3044,15 @@
 msgstr ""
 "Inmatningsfilen måste skyddas eftersom den innehåller okrypterade lösenord."
 
-#: newusers.8.xml:103(para)
+#: newusers.8.xml:87(para) chpasswd.8.xml:123(para)
 msgid ""
+"PAM is not used to update the passwords. Only <filename>/etc/passwd</"
+"filename> and <filename>/etc/shadow</filename> are updated, and the various "
+"checks or options provided by PAM modules are not used."
+msgstr ""
+
+#: newusers.8.xml:133(para)
+msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
@@ -3037,7 +3076,7 @@
 
 #: newgrp.1.xml:17(replaceable) grpck.8.xml:18(replaceable)
 #: groupdel.8.xml:18(replaceable) groupadd.8.xml:24(replaceable)
-#: gpasswd.1.xml:21(replaceable)
+#: gpasswd.1.xml:26(replaceable)
 msgid "group"
 msgstr "grupp"
 
@@ -3079,21 +3118,23 @@
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"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>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"<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>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
-"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>, <citerefentry><refentrytitle>gshadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
 #: logoutd.8.xml:5(refentrytitle) logoutd.8.xml:10(refname)
 #: logoutd.8.xml:16(command)
@@ -3152,195 +3193,378 @@
 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 \"yes\" or \"no\". An undefined boolean parameter or one "
-"with a value other than these will be given a \"no\" value. Numbers (both "
+"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 \"0\") or hexadecimal values (precede the value with \"0x\"). The "
-"maximum value of the regular and long numeric parameters is machine-"
-"dependent."
+"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:42(para)
+#: login.defs.5.xml:46(para)
 msgid "The following configuration items are provided:"
 msgstr "Följande konfigurationsposter tillhandahålls:"
 
-#: login.defs.5.xml:46(term)
-msgid "CHFN_AUTH (boolean)"
+#: login.defs.5.xml:50(term)
+#, fuzzy
+msgid "<option>CHFN_AUTH</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: login.defs.5.xml:48(para)
+#: login.defs.5.xml:52(para)
 msgid ""
-"If <emphasis remap=\"I\">yes</emphasis>, the <command>chfn</command> and "
+"If <replaceable>yes</replaceable>, the <command>chfn</command> and "
 "<command>chsh</command> programs will require authentication before making "
 "any changes, unless run by the superuser."
 msgstr ""
 
-#: login.defs.5.xml:57(term)
-msgid "CHFN_RESTRICT (string)"
+#: login.defs.5.xml:61(term)
+#, fuzzy
+msgid "<option>CHFN_RESTRICT</option> (string)"
 msgstr "CHFN_RESTRICT (sträng)"
 
-#: login.defs.5.xml:59(para)
+#: login.defs.5.xml:63(para)
 msgid ""
 "This parameter specifies which values in the <emphasis remap=\"I\">gecos</"
 "emphasis> field of the <filename>/etc/passwd</filename> file may be changed "
 "by regular users using the <command>chfn</command> program. It can be any "
-"combination of letters <emphasis remap=\"I\">f</emphasis> ,<emphasis remap="
-"\"I\">r</emphasis>, <emphasis remap=\"I\">w</emphasis>, <emphasis remap=\"I"
-"\">h</emphasis>, for Full name, Room number, Work phone, and Home phone, "
-"respectively. For backward compatibility, \"yes\" is equivalent to \"rwh\" "
-"and \"no\" is equivalent to \"frwh\". If not specified, only the superuser "
-"can make any changes. The most restrictive setting is better achieved by not "
-"installing <filename>chfn</filename> SUID."
+"combination of letters <replaceable>f</replaceable>, <replaceable>r</"
+"replaceable>, <replaceable>w</replaceable>, <replaceable>h</replaceable>, "
+"for Full name, Room number, Work phone, and Home phone, respectively. For "
+"backward compatibility, <replaceable>yes</replaceable> is equivalent to "
+"<replaceable>rwh</replaceable> and <replaceable>no</replaceable> is "
+"equivalent to <replaceable>frwh</replaceable>. If not specified, only the "
+"superuser can make any changes. The most restrictive setting is better "
+"achieved by not installing <command>chfn</command> SUID."
 msgstr ""
 
-#: login.defs.5.xml:76(term)
-msgid "GID_MAX (number)"
+#: login.defs.5.xml:83(term) chpasswd.8.xml:175(term)
+msgid "<option>ENCRYPT_METHOD</option> (string)"
+msgstr ""
+
+#: login.defs.5.xml:85(para) chpasswd.8.xml:177(para)
+msgid ""
+"This defines the system default encryption algorithm for encrypting "
+"passwords (if no algorithm are specified on the command line)."
+msgstr ""
+
+#: login.defs.5.xml:94(para) chpasswd.8.xml:186(para)
+msgid "<replaceable>DES</replaceable> (default)"
+msgstr ""
+
+#: login.defs.5.xml:97(replaceable) chpasswd.8.xml:189(replaceable)
+msgid "MD5"
+msgstr ""
+
+#: login.defs.5.xml:100(replaceable) chpasswd.8.xml:192(replaceable)
+msgid "SHA256"
+msgstr ""
+
+#: login.defs.5.xml:103(replaceable) chpasswd.8.xml:195(replaceable)
+msgid "SHA512"
+msgstr ""
+
+#: login.defs.5.xml:90(para) chpasswd.8.xml:182(para)
+msgid "It can take one of these values: <placeholder-1/>"
+msgstr ""
+
+#: login.defs.5.xml:107(para) chpasswd.8.xml:199(para)
+msgid ""
+"Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option> variable."
+msgstr ""
+
+#: login.defs.5.xml:111(para) login.defs.5.xml:192(para)
+#: chpasswd.8.xml:168(para) chpasswd.8.xml:203(para)
+msgid ""
+"Note: if you use PAM, it is recommended to set this variable consistently "
+"with the PAM modules configuration."
+msgstr ""
+
+#: login.defs.5.xml:118(term)
+#, fuzzy
+msgid "<option>GID_MAX</option> (number)"
 msgstr "GID_MAX (nummer)"
 
-#: login.defs.5.xml:77(term)
-msgid "GID_MIN (number)"
+#: login.defs.5.xml:119(term)
+#, fuzzy
+msgid "<option>GID_MIN</option> (number)"
 msgstr "GID_MIN (nummer)"
 
-#: login.defs.5.xml:79(para)
+#: login.defs.5.xml:121(para)
 msgid ""
 "Range of group IDs to choose from for the <command>useradd</command> and "
 "<command>groupadd</command> programs."
 msgstr ""
 
-#: login.defs.5.xml:87(term)
-msgid "MAIL_DIR (string)"
+#: login.defs.5.xml:129(term)
+#, fuzzy
+msgid "<option>MAIL_DIR</option> (string)"
 msgstr "MAIL_DIR (sträng)"
 
-#: login.defs.5.xml:89(para)
+#: login.defs.5.xml:131(para)
 msgid ""
 "The mail spool directory. This is needed to manipulate the mailbox when its "
 "corresponding user account is modified or deleted. If not specified, a "
 "compile-time default is used."
 msgstr ""
 
-#: login.defs.5.xml:97(term)
-msgid "PASS_MAX_DAYS (number)"
+#: login.defs.5.xml:139(term)
+msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:141(para)
+msgid ""
+"Maximum members per group entry. When the maximum is reached, a new group "
+"entry (line) is started in <filename>/etc/group</filename> (with the same "
+"name, same password, and same GID)."
+msgstr ""
+
+#: login.defs.5.xml:147(para)
+msgid ""
+"The default value is 0, meaning that there are no limits in the number of "
+"members in a group."
+msgstr ""
+
+#. Note: on HP, split groups have the same ID, but different
+#. 	             names.
+#: login.defs.5.xml:153(para)
+msgid ""
+"This feature (split group) permits to limit the length of lines in the group "
+"file. This is useful to make sure that lines for NIS groups are not larger "
+"than 1024 characters."
+msgstr ""
+
+#: login.defs.5.xml:158(para)
+msgid "If you need to enforce such limit, you can use 25."
+msgstr ""
+
+#: login.defs.5.xml:161(para)
+msgid ""
+"Note: split groups may not be supported by all tools (even in the Shadow "
+"toolsuite. You should not use this variable unless you really need it."
+msgstr ""
+
+#: login.defs.5.xml:169(term) chpasswd.8.xml:145(term)
+msgid "<option>MD5_CRYPT_ENAB</option> (boolean)"
+msgstr ""
+
+#: login.defs.5.xml:171(para) chpasswd.8.xml:147(para)
+msgid ""
+"Indicate if passwords must be encrypted using the MD5-based algorithm. If "
+"set to <replaceable>yes</replaceable>, new passwords will be encrypted using "
+"the MD5-based algorithm compatible with the one used by recent releases of "
+"FreeBSD. It supports passwords of unlimited length and longer salt strings. "
+"Set to <replaceable>no</replaceable> if you need to copy encrypted passwords "
+"to other systems which don't understand the new algorithm. Default is "
+"<replaceable>no</replaceable>."
+msgstr ""
+
+#: login.defs.5.xml:183(para)
+msgid ""
+"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"or by any command line option used to configure the encryption algorithm."
+msgstr ""
+
+#: login.defs.5.xml:188(para) chpasswd.8.xml:164(para)
+msgid ""
+"This variable is deprecated. You should use <option>ENCRYPT_METHOD</option>."
+msgstr ""
+
+#: login.defs.5.xml:199(term)
+#, fuzzy
+msgid "<option>PASS_MAX_DAYS</option> (number)"
 msgstr "PASS_MAX_DAYS (nummer)"
 
-#: login.defs.5.xml:99(para)
+#: login.defs.5.xml:201(para)
 msgid ""
 "The maximum number of days a password may be used. If the password is older "
 "than this, a password change will be forced. If not specified, -1 will be "
 "assumed (which disables the restriction)."
 msgstr ""
 
-#: login.defs.5.xml:108(term)
-msgid "PASS_MIN_DAYS (number)"
+#: login.defs.5.xml:210(term)
+#, fuzzy
+msgid "<option>PASS_MIN_DAYS</option> (number)"
 msgstr "PASS_MIN_DAYS (nummer)"
 
-#: login.defs.5.xml:110(para)
+#: login.defs.5.xml:212(para)
 msgid ""
 "The minimum number of days allowed between password changes. Any password "
 "changes attempted sooner than this will be rejected. If not specified, -1 "
 "will be assumed (which disables the restriction)."
 msgstr ""
 
-#: login.defs.5.xml:119(term)
-msgid "PASS_WARN_AGE (number)"
+#: login.defs.5.xml:221(term)
+#, fuzzy
+msgid "<option>PASS_WARN_AGE</option> (number)"
 msgstr "PASS_WARN_AGE (nummer)"
 
-#: login.defs.5.xml:121(para)
+#: login.defs.5.xml:223(para)
 msgid ""
 "The number of days warning given before a password expires. A zero means "
 "warning is given only upon the day of expiration, a negative value means no "
 "warning is given. If not specified, no warning will be provided."
 msgstr ""
 
-#: login.defs.5.xml:131(para)
+#: login.defs.5.xml:233(para)
+#, fuzzy
 msgid ""
-"PASS_MAX_DAYS, PASS_MIN_DAYS and PASS_WARN_AGE are only used at the time of "
-"account creation. Any changes to these settings won't affect existing "
-"accounts."
+"<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 ""
 "PASS_MAX_DAYS, PASS_MIN_DAYS och PASS_WARN_AGE används endast när kontot "
 "skapas. Alla ändringar av dessa inställningar påverkar inte existerande "
 "konton."
 
-#: login.defs.5.xml:138(term)
-msgid "UID_MAX (number)"
+#: login.defs.5.xml:241(term) chpasswd.8.xml:210(term)
+msgid "<option>SHA_CRYPT_MIN_ROUNDS</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:242(term) chpasswd.8.xml:211(term)
+msgid "<option>SHA_CRYPT_MAX_ROUNDS</option> (number)"
+msgstr ""
+
+#: login.defs.5.xml:244(para) chpasswd.8.xml:213(para)
+msgid ""
+"When <option>ENCRYPT_METHOD</option> is set to <replaceable>SHA256</"
+"replaceable> or <replaceable>SHA512</replaceable>, this defines the number "
+"of SHA rounds used by the encryption algorithm by default (when the number "
+"of rounds is not specified on the command line)."
+msgstr ""
+
+#: login.defs.5.xml:251(para) chpasswd.8.xml:220(para)
+msgid ""
+"With a lot of rounds, it is more difficult to brute forcing the password. "
+"But note also that more CPU resources will be needed to authenticate users."
+msgstr ""
+
+#: login.defs.5.xml:256(para) chpasswd.8.xml:225(para)
+msgid ""
+"If not specified, the libc will choose the default number of rounds (5000)."
+msgstr ""
+
+#: login.defs.5.xml:260(para) chpasswd.8.xml:229(para)
+msgid "The values must be inside the 1000-999999999 range."
+msgstr ""
+
+#: login.defs.5.xml:263(para) chpasswd.8.xml:232(para)
+msgid ""
+"If only one of the <option>SHA_CRYPT_MIN_ROUNDS</option> or "
+"<option>SHA_CRYPT_MAX_ROUNDS</option> values is set, then this value will be "
+"used."
+msgstr ""
+
+#: login.defs.5.xml:268(para) chpasswd.8.xml:237(para)
+msgid ""
+"If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</"
+"option>, the highest value will be used."
+msgstr ""
+
+#: login.defs.5.xml:276(term)
+#, fuzzy
+msgid "<option>UID_MAX</option> (number)"
 msgstr "UID_MAX (nummer)"
 
-#: login.defs.5.xml:139(term)
-msgid "UID_MIN (number)"
+#: login.defs.5.xml:277(term)
+#, fuzzy
+msgid "<option>UID_MIN</option> (number)"
 msgstr "UID_MIN (nummer)"
 
-#: login.defs.5.xml:141(para)
+#: login.defs.5.xml:279(para)
 msgid ""
 "Range of user IDs to choose from for the <command>useradd</command> program."
 msgstr ""
 
-#: login.defs.5.xml:148(term)
-msgid "UMASK (number)"
+#: login.defs.5.xml:286(term)
+#, fuzzy
+msgid "<option>UMASK</option> (number)"
 msgstr "UMASK (nummer)"
 
-#: login.defs.5.xml:150(para)
+#: login.defs.5.xml:288(para)
 msgid ""
 "The permission mask is initialized to this value. If not specified, the "
 "permission mask will be initialized to 022."
 msgstr ""
 
-#: login.defs.5.xml:157(term)
-msgid "USERDEL_CMD (string)"
+#: login.defs.5.xml:295(term)
+#, fuzzy
+msgid "<option>USERDEL_CMD</option> (string)"
 msgstr "USERDEL_CMD (sträng)"
 
-#: login.defs.5.xml:159(para)
+#: login.defs.5.xml:297(para)
 msgid ""
 "If defined, this command is run when removing a user. It should remove any "
 "at/cron/print jobs etc. owned by the user to be removed (passed as the first "
 "argument)."
 msgstr ""
 
-#: login.defs.5.xml:170(title)
+#: login.defs.5.xml:308(title)
 msgid "CROSS REFERENCE"
 msgstr ""
 
-#: login.defs.5.xml:171(para)
+#: login.defs.5.xml:309(para)
 msgid ""
 "The following cross reference shows which programs in the shadow password "
 "suite use which parameters."
 msgstr ""
 
-#: login.defs.5.xml:178(term) chfn.1.xml:5(refentrytitle)
+#: login.defs.5.xml:316(term) chfn.1.xml:5(refentrytitle)
 #: chfn.1.xml:10(refname) chfn.1.xml:16(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:180(para)
+#: login.defs.5.xml:318(para)
 msgid "CHFN_AUTH CHFN_RESTRICT"
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
-#: login.defs.5.xml:184(term) chsh.1.xml:5(refentrytitle)
+#: login.defs.5.xml:322(term) chgpasswd.8.xml:5(refentrytitle)
+#: chgpasswd.8.xml:10(refname) chgpasswd.8.xml:16(command)
+msgid "chgpasswd"
+msgstr "chgpasswd"
+
+#: login.defs.5.xml:324(para)
+msgid ""
+"MD5_CRYPT_ENAB ENCRYPT_METHOD SHA_CRYPT_MIN_ROUNDS SHA_CRYPT_MAX_ROUNDS "
+"MAX_MEMBERS_PER_GROUP"
+msgstr ""
+
+#: login.defs.5.xml:331(term) chpasswd.8.xml:5(refentrytitle)
+#: chpasswd.8.xml:10(refname) chpasswd.8.xml:16(command)
+msgid "chpasswd"
+msgstr "chpasswd"
+
+#: login.defs.5.xml:333(para)
+msgid "MD5_CRYPT_ENAB ENCRYPT_METHOD SHA_CRYPT_MIN_ROUNDS SHA_CRYPT_MAX_ROUNDS"
+msgstr ""
+
+#: login.defs.5.xml:340(term) chsh.1.xml:5(refentrytitle)
 #: chsh.1.xml:10(refname) chsh.1.xml:16(command)
 msgid "chsh"
 msgstr "chsh"
 
-#: login.defs.5.xml:186(para)
+#: login.defs.5.xml:342(para)
 msgid "CHFN_AUTH"
 msgstr "CHFN_AUTH"
 
-#: login.defs.5.xml:190(term) groupadd.8.xml:5(refentrytitle)
+#: login.defs.5.xml:346(term) groupadd.8.xml:5(refentrytitle)
 #: groupadd.8.xml:10(refname) groupadd.8.xml:16(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:192(para)
+#: login.defs.5.xml:348(para)
 msgid "GID_MAX GID_MIN"
 msgstr "GID_MAX GID_MIN"
 
-#: login.defs.5.xml:198(para)
+#: login.defs.5.xml:354(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 
-#: login.defs.5.xml:206(para)
+#: login.defs.5.xml:362(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 
-#: login.defs.5.xml:212(para)
+#: login.defs.5.xml:368(para)
 msgid ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
@@ -3348,15 +3572,15 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:223(para)
+#: login.defs.5.xml:379(para)
 msgid "MAIL_DIR USERDEL_CMD"
 msgstr "MAIL_DIR USERDEL_CMD"
 
-#: login.defs.5.xml:231(para)
+#: login.defs.5.xml:387(para)
 msgid "MAIL_DIR"
 msgstr "MAIL_DIR"
 
-#: login.defs.5.xml:240(para)
+#: login.defs.5.xml:396(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 "
@@ -3368,7 +3592,7 @@
 "configuration files instead."
 msgstr ""
 
-#: login.defs.5.xml:257(para)
+#: login.defs.5.xml:413(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4136,8 +4360,8 @@
 msgid "display current group names"
 msgstr "visa aktuella gruppnamn"
 
-#: groups.1.xml:18(replaceable) gpasswd.1.xml:67(replaceable)
-#: gpasswd.1.xml:80(replaceable) chfn.1.xml:22(replaceable)
+#: groups.1.xml:18(replaceable) gpasswd.1.xml:86(replaceable)
+#: gpasswd.1.xml:99(replaceable) chfn.1.xml:22(replaceable)
 msgid "user"
 msgstr "användare"
 
@@ -4337,7 +4561,7 @@
 "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:49(option) gpasswd.1.xml:67(option)
+#: groupmems.8.xml:49(option) gpasswd.1.xml:86(option)
 msgid "-a"
 msgstr "-a"
 
@@ -4345,7 +4569,7 @@
 msgid "Add a new user to the group membership list."
 msgstr "Lägg till en ny användare till gruppens medlemslista."
 
-#: groupmems.8.xml:55(option) gpasswd.1.xml:80(option)
+#: groupmems.8.xml:55(option) gpasswd.1.xml:99(option)
 msgid "-d"
 msgstr "-d"
 
@@ -4598,25 +4822,34 @@
 "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgstr ""
 
-#: groupadd.8.xml:143(para)
+#: groupadd.8.xml:144(para)
+msgid "Groupnames may only be up to 16 characters long."
+msgstr ""
+
+#: groupadd.8.xml:147(para)
+#, fuzzy
 msgid ""
-"If the groupname already exists in an external group database such as NIS, "
-"<command>groupadd</command> will deny the group creation request."
+"You may not add a NIS or LDAP group. This must be performed on the "
+"corresponding server."
 msgstr ""
+"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:148(para)
-msgid "Groupnames may only be up to 16 characters long."
+#: groupadd.8.xml:151(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:177(para)
+#: groupadd.8.xml:184(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:183(para)
+#: groupadd.8.xml:190(para)
 msgid "group name not unique"
 msgstr "gruppnamn inte unikt"
 
-#: groupadd.8.xml:153(para)
+#: groupadd.8.xml:160(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4624,7 +4857,7 @@
 "Kommandot <command>groupadd</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: groupadd.8.xml:198(para)
+#: groupadd.8.xml:205(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -4659,125 +4892,168 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 #: gpasswd.1.xml:5(refentrytitle) gpasswd.1.xml:10(refname)
-#: gpasswd.1.xml:16(command)
+#: gpasswd.1.xml:21(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
-#: gpasswd.1.xml:11(refpurpose)
-msgid "administer the <placeholder-1/> file"
+#: gpasswd.1.xml:13(phrase)
+#, fuzzy
+msgid "and <placeholder-1/> files"
+msgstr "-a <placeholder-1/>"
+
+#: gpasswd.1.xml:15(phrase)
+msgid "file"
 msgstr ""
 
-#: gpasswd.1.xml:18(replaceable)
+#: gpasswd.1.xml:11(refpurpose)
 #, fuzzy
+msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
+msgstr "-K <placeholder-1/>=<placeholder-2/>"
+
+#: gpasswd.1.xml:23(replaceable)
+#, fuzzy
 msgid "option"
 msgstr "flaggor"
 
-#: gpasswd.1.xml:28(para)
+#: gpasswd.1.xml:33(para)
 msgid ""
-"The <command>gpasswd</command> command is used to administer the <filename>/"
-"etc/group</filename> file (and <filename>/etc/gshadow</filename> file if "
-"compiled with SHADOWGRP defined). Every group can have administrators, "
-"members and a password. System administrator can use the <option>-A</option> "
-"option to define group administrator(s) and the <option>-M</option> option "
-"to define members and has all rights of group administrators and members."
+"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:37(para)
+#: gpasswd.1.xml:41(para)
 msgid ""
-"<command>gpasswd</command> called by a group administrator with a group name "
-"only prompts for the group password. If a password is set the members can "
-"still <citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry> without a password, and non-members must supply "
-"the password."
+"System administrator can use the <option>-A</option> option to define group "
+"administrator(s) and the <option>-M</option> option to define members and "
+"has all rights of group administrators and members."
 msgstr ""
 
-#: gpasswd.1.xml:47(title)
+#: gpasswd.1.xml:46(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:53(para)
+#, fuzzy
+msgid ""
+"If a password is set the members can still "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry> without a password, and non-members must supply the password."
+msgstr ""
+"Referera till <citerefentry><refentrytitle>crypt</"
+"refentrytitle><manvolnum>3</manvolnum></citerefentry> för detaljer om hur "
+"denna sträng tolkas."
+
+#: gpasswd.1.xml:61(title)
 msgid "Notes about group passwords"
 msgstr "Noteringar angående grupplösenord"
 
-#: gpasswd.1.xml:48(para)
+#: gpasswd.1.xml:62(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:59(para)
+#: gpasswd.1.xml:73(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
-"options cannot be combined. The options which apply to the <command>gpasswd</"
-"command> command are:"
+"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."
 
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:77(para)
+msgid "The options cannot be combined."
+msgstr ""
+
+#: gpasswd.1.xml:80(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:89(para)
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:83(para)
+#: gpasswd.1.xml:102(para)
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
 "<replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:96(para)
+#: gpasswd.1.xml:115(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:108(option)
+#: gpasswd.1.xml:127(option)
 #, fuzzy
 msgid "-R"
 msgstr "-"
 
-#: gpasswd.1.xml:111(para)
+#: gpasswd.1.xml:130(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:122(term)
+#: gpasswd.1.xml:141(term)
 #, fuzzy
 msgid "<option>-A</option><replaceable>user</replaceable>,..."
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:126(para)
+#: gpasswd.1.xml:145(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr "kommaseparerad lista med gruppadministratörer"
 
-#: gpasswd.1.xml:134(term)
+#: gpasswd.1.xml:153(term)
 #, fuzzy
 msgid "<option>-M</option><replaceable>user</replaceable>,..."
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:138(para)
+#: gpasswd.1.xml:157(para)
 #, fuzzy
 msgid "Set the list of group members."
 msgstr "kommaseparerad lista med gruppmedlemmar"
 
-#: gpasswd.1.xml:166(para)
+#: gpasswd.1.xml:167(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:197(para)
+#, fuzzy
+msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</"
+"citerefentry>, <citerefentry><refentrytitle>groupadd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>grpck</"
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</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 ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
@@ -5023,11 +5299,6 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chpasswd.8.xml:5(refentrytitle) chpasswd.8.xml:10(refname)
-#: chpasswd.8.xml:16(command)
-msgid "chpasswd"
-msgstr "chpasswd"
-
 #: chpasswd.8.xml:11(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "uppdatera lösenord i satsläge"
@@ -5052,34 +5323,61 @@
 "\">lösenord</emphasis>"
 
 #: chpasswd.8.xml:34(para)
+#, fuzzy
 msgid ""
-"By default the supplied password must be in clear-text. Default encryption "
-"algorithm is DES. Also the password age will be updated, if present."
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chpasswd</command>. Also the password age will be updated, if "
+"present."
 msgstr ""
+"Som standard måste det insända lösenordet vara i klartext. "
+"Standardkrypteringsalgoritmen är DES."
 
 #: chpasswd.8.xml:39(para) chgpasswd.8.xml:38(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."
+msgstr ""
+
+#: chpasswd.8.xml:45(para) chgpasswd.8.xml:44(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:47(para)
+#: chpasswd.8.xml:53(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:53(term) chgpasswd.8.xml:52(term)
+#: chpasswd.8.xml:59(term) chgpasswd.8.xml:58(term)
+#, fuzzy
+msgid "<option>-c</option>, <option>--crypt-method</option>"
+msgstr "<option>-e</option>, <option>--encrypted</option>"
+
+#: chpasswd.8.xml:61(para) chgpasswd.8.xml:60(para)
+msgid "Use the specified method to encrypt the passwords."
+msgstr ""
+
+#: chpasswd.8.xml:62(para) chgpasswd.8.xml:61(para)
+msgid ""
+"The available methods are DES, MD5, and SHA256 or SHA512 if compiled with "
+"the ENCRYPTMETHOD_SELECT flag."
+msgstr ""
+
+#: chpasswd.8.xml:69(term) chgpasswd.8.xml:68(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: chpasswd.8.xml:55(para) chgpasswd.8.xml:54(para)
+#: chpasswd.8.xml:71(para) chgpasswd.8.xml:70(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Insända lösenord är i ett krypterat format."
 
-#: chpasswd.8.xml:65(term) chgpasswd.8.xml:64(term)
+#: chpasswd.8.xml:81(term) chgpasswd.8.xml:80(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
-#: chpasswd.8.xml:67(para) chgpasswd.8.xml:66(para)
+#: chpasswd.8.xml:83(para) chgpasswd.8.xml:82(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -5087,33 +5385,77 @@
 "Använd MD5-kryptering istället för DES när insända lösenord inte är "
 "krypterade."
 
-#: chpasswd.8.xml:78(para) chgpasswd.8.xml:77(para)
+#: chpasswd.8.xml:90(term) chgpasswd.8.xml:89(term)
+#, fuzzy
+msgid "<option>-s</option>, <option>--sha-rounds</option>"
+msgstr "<option>-s</option>, <option>--shadow</option>"
+
+#: chpasswd.8.xml:92(para) chgpasswd.8.xml:91(para)
+msgid "Use the specified number of rounds to encrypt the passwords."
+msgstr ""
+
+#: chpasswd.8.xml:95(para) chgpasswd.8.xml:94(para)
 msgid ""
+"The value 0 means that the system will choose the default number of rounds "
+"for the crypt method (5000)."
+msgstr ""
+
+#: chpasswd.8.xml:99(para) chgpasswd.8.xml:98(para)
+msgid ""
+"A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
+msgstr ""
+
+#: chpasswd.8.xml:103(para) chgpasswd.8.xml:102(para)
+msgid "You can only use this option with the SHA256 or SHA512 crypt method."
+msgstr ""
+
+#: chpasswd.8.xml:107(para) chgpasswd.8.xml:106(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 ""
+
+#: chpasswd.8.xml:119(para) chgpasswd.8.xml:118(para)
+msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
 msgstr ""
 "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:86(para)
+#: chpasswd.8.xml:132(title)
+msgid "CONFIGURATION"
+msgstr ""
+
+#: chpasswd.8.xml:133(para)
 msgid ""
+"The following configuration variables in <filename>/etc/login.defs</"
+"filename> change the behavior of this tool:"
+msgstr ""
+
+#: chpasswd.8.xml:159(para)
+msgid ""
+"This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
+"or by any command line option."
+msgstr ""
+
+#: chpasswd.8.xml:273(para)
+#, fuzzy
+msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>newusers</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<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>."
 
-#: chgpasswd.8.xml:5(refentrytitle) chgpasswd.8.xml:10(refname)
-#: chgpasswd.8.xml:16(command)
-msgid "chgpasswd"
-msgstr "chgpasswd"
-
 #: chgpasswd.8.xml:11(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "uppdatera grupplösenord i satsläge"
@@ -5138,27 +5480,33 @@
 "emphasis>"
 
 #: chgpasswd.8.xml:34(para)
+#, fuzzy
 msgid ""
-"By default the supplied password must be in clear-text. Default encryption "
-"algorithm is DES."
+"By default the supplied password must be in clear-text, and is encrypted by "
+"<command>chgpasswd</command>."
 msgstr ""
 "Som standard måste det insända lösenordet vara i klartext. "
 "Standardkrypteringsalgoritmen är DES."
 
-#: chgpasswd.8.xml:46(para)
+#: chgpasswd.8.xml:52(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:85(para)
+#: chgpasswd.8.xml:150(para)
+#, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
 
 #: chfn.1.xml:11(refpurpose)
 msgid "change real user name and information"
@@ -5413,6 +5761,50 @@
 msgid "translator-credits"
 msgstr "Daniel Nylander <po at danielnylander.se>, 2006."
 
+#, fuzzy
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pam</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
 #~ msgid "-R <placeholder-1/>"
 #~ msgstr "-R <placeholder-1/>"
 




More information about the Pkg-shadow-commits mailing list