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

Nicolas FRANÇOIS nekral-guest at alioth.debian.org
Fri Jul 24 01:13:21 UTC 2009


Author: nekral-guest
Date: 2009-07-24 01:13:21 +0000 (Fri, 24 Jul 2009)
New Revision: 3042

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/configure.in
   upstream/trunk/man/po/de.po
   upstream/trunk/man/po/fr.po
   upstream/trunk/man/po/it.po
   upstream/trunk/man/po/pl.po
   upstream/trunk/man/po/ru.po
   upstream/trunk/man/po/shadow-man-pages.pot
   upstream/trunk/man/po/sv.po
   upstream/trunk/po/bs.po
   upstream/trunk/po/ca.po
   upstream/trunk/po/cs.po
   upstream/trunk/po/da.po
   upstream/trunk/po/de.po
   upstream/trunk/po/dz.po
   upstream/trunk/po/el.po
   upstream/trunk/po/es.po
   upstream/trunk/po/eu.po
   upstream/trunk/po/fi.po
   upstream/trunk/po/fr.po
   upstream/trunk/po/gl.po
   upstream/trunk/po/he.po
   upstream/trunk/po/hu.po
   upstream/trunk/po/id.po
   upstream/trunk/po/it.po
   upstream/trunk/po/ja.po
   upstream/trunk/po/kk.po
   upstream/trunk/po/km.po
   upstream/trunk/po/ko.po
   upstream/trunk/po/nb.po
   upstream/trunk/po/ne.po
   upstream/trunk/po/nl.po
   upstream/trunk/po/nn.po
   upstream/trunk/po/pl.po
   upstream/trunk/po/pt.po
   upstream/trunk/po/pt_BR.po
   upstream/trunk/po/ro.po
   upstream/trunk/po/ru.po
   upstream/trunk/po/shadow.pot
   upstream/trunk/po/sk.po
   upstream/trunk/po/sq.po
   upstream/trunk/po/sv.po
   upstream/trunk/po/tl.po
   upstream/trunk/po/tr.po
   upstream/trunk/po/uk.po
   upstream/trunk/po/vi.po
   upstream/trunk/po/zh_CN.po
   upstream/trunk/po/zh_TW.po
Log:
	* NEWS, configure.in: Prepare for the next release 4.1.4.2.
	* po/shadow.pot, man/po/shadow-man-pages.pot: Regenerated.
	* po/*.po, man/po/*.po: Updated PO files.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/ChangeLog	2009-07-24 01:13:21 UTC (rev 3042)
@@ -1,3 +1,9 @@
+2009-07-24  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* NEWS, configure.in: Prepare for the next release 4.1.4.2.
+	* po/shadow.pot, man/po/shadow-man-pages.pot: Regenerated.
+	* po/*.po, man/po/*.po: Updated PO files.
+
 2009-07-23  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* configure.in: Fixed definition of the SHELL configuration.

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/NEWS	2009-07-24 01:13:21 UTC (rev 3042)
@@ -1,9 +1,10 @@
 $Id$
 
-shadow-4.1.4.1 -> shadow-4.1.4.2						UNRELEASED
+shadow-4.1.4.1 -> shadow-4.1.4.2						2009-07-24
 
 - general
-  * Improved support for large groups (impacts most tools).
+  * Improved support for large groups (impacts most user/group management
+    tools).
 
 - addition of system users or groups
   * Speed improvement. This should be noticeable in case of LDAP configured

Modified: upstream/trunk/configure.in
===================================================================
--- upstream/trunk/configure.in	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/configure.in	2009-07-24 01:13:21 UTC (rev 3042)
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT
-AM_INIT_AUTOMAKE(shadow, 4.1.4.1)
+AM_INIT_AUTOMAKE(shadow, 4.1.4.2)
 AC_CONFIG_HEADERS([config.h])
 
 dnl Some hacks...

Modified: upstream/trunk/man/po/de.po
===================================================================
--- upstream/trunk/man/po/de.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/man/po/de.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow-man-pages\n"
-"POT-Creation-Date: 2009-05-22 13:15+0200\n"
+"POT-Creation-Date: 2009-07-24 03:03+0200\n"
 "PO-Revision-Date: 2007-06-11 10:16+0200\n"
 "Last-Translator: Simon Brandmair <sbrandmair at gmx.net>\n"
 "Language-Team: debian-l10n-german <http://lists.debian.org/debian-l10n-"
@@ -69,14 +69,14 @@
 #: vipw.8.xml:66(title) usermod.8.xml:59(title) userdel.8.xml:60(title)
 #: useradd.8.xml:79(title) suauth.5.xml:50(title) su.1.xml:77(title)
 #: sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title)
-#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:81(title)
+#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:83(title)
 #: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
 #: nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title)
 #: logoutd.8.xml:50(title) login.defs.5.xml:107(title)
 #: login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title)
 #: lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title)
 #: groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title)
-#: groupdel.8.xml:57(title) groupadd.8.xml:64(title) gpasswd.1.xml:69(title)
+#: groupdel.8.xml:57(title) groupadd.8.xml:64(title) gpasswd.1.xml:72(title)
 #: faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title)
 #: chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title)
 #: chfn.1.xml:63(title) chage.1.xml:55(title)
@@ -108,10 +108,10 @@
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> verwendet."
 
 #: vipw.8.xml:84(title) usermod.8.xml:67(title) userdel.8.xml:69(title)
-#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:133(title)
+#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:164(title)
 #: passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title)
-#: lastlog.8.xml:66(title) grpck.8.xml:114(title) groupmod.8.xml:67(title)
-#: groupmems.8.xml:75(title) groupadd.8.xml:73(title) gpasswd.1.xml:109(title)
+#: lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title)
+#: groupmems.8.xml:75(title) groupadd.8.xml:73(title) gpasswd.1.xml:112(title)
 #: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:109(title)
 #: chgpasswd.8.xml:88(title) chage.1.xml:65(title)
 msgid "OPTIONS"
@@ -174,15 +174,15 @@
 msgstr "Bearbeitet die Shadow- oder Gshadow-Datenbank."
 
 #: vipw.8.xml:124(title) usermod.8.xml:372(title) userdel.8.xml:140(title)
-#: useradd.8.xml:644(title) suauth.5.xml:168(title) su.1.xml:253(title)
+#: useradd.8.xml:644(title) suauth.5.xml:168(title) su.1.xml:338(title)
 #: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
-#: pwconv.8.xml:168(title) pwck.8.xml:196(title) porttime.5.xml:105(title)
-#: passwd.5.xml:116(title) passwd.1.xml:375(title) newusers.8.xml:357(title)
+#: pwconv.8.xml:168(title) pwck.8.xml:227(title) porttime.5.xml:105(title)
+#: passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(title)
 #: newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title)
 #: login.1.xml:316(title) limits.5.xml:140(title) lastlog.8.xml:147(title)
-#: gshadow.5.xml:141(title) grpck.8.xml:166(title) groups.1.xml:75(title)
+#: gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title)
 #: groupmod.8.xml:164(title) groupmems.8.xml:168(title)
-#: groupdel.8.xml:89(title) groupadd.8.xml:200(title) gpasswd.1.xml:230(title)
+#: groupdel.8.xml:89(title) groupadd.8.xml:200(title) gpasswd.1.xml:233(title)
 #: faillog.8.xml:202(title) faillog.5.xml:71(title) expiry.1.xml:68(title)
 #: chsh.1.xml:133(title) chpasswd.8.xml:208(title) chgpasswd.8.xml:184(title)
 #: chfn.1.xml:113(title) chage.1.xml:206(title)
@@ -191,32 +191,33 @@
 
 #: vipw.8.xml:127(filename) usermod.8.xml:375(filename)
 #: userdel.8.xml:143(filename) useradd.8.xml:659(filename)
-#: sg.1.xml:103(filename) pwck.8.xml:199(filename)
+#: sg.1.xml:103(filename) pwck.8.xml:230(filename)
 #: newusers.8.xml:372(filename) newgrp.1.xml:114(filename)
-#: gshadow.5.xml:144(filename) grpck.8.xml:169(filename)
+#: gshadow.5.xml:144(filename) grpck.8.xml:188(filename)
 #: groups.1.xml:78(filename) groupmod.8.xml:167(filename)
 #: groupmems.8.xml:171(filename) groupdel.8.xml:92(filename)
-#: groupadd.8.xml:203(filename) gpasswd.1.xml:49(filename)
-#: gpasswd.1.xml:233(filename) chgpasswd.8.xml:187(filename)
+#: groupadd.8.xml:203(filename) gpasswd.1.xml:50(filename)
+#: gpasswd.1.xml:53(filename) gpasswd.1.xml:236(filename)
+#: chgpasswd.8.xml:187(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
 #: vipw.8.xml:129(para) usermod.8.xml:377(para) userdel.8.xml:145(para)
-#: useradd.8.xml:661(para) sg.1.xml:105(para) pwck.8.xml:201(para)
+#: useradd.8.xml:661(para) sg.1.xml:105(para) pwck.8.xml:232(para)
 #: newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para)
-#: grpck.8.xml:171(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
+#: grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
 #: groupmems.8.xml:173(para) groupdel.8.xml:94(para) groupadd.8.xml:205(para)
-#: gpasswd.1.xml:235(para) chgpasswd.8.xml:189(para)
+#: gpasswd.1.xml:238(para) chgpasswd.8.xml:189(para)
 msgid "Group account information."
 msgstr "Informationen zu den Gruppenkonten."
 
 #: vipw.8.xml:133(filename) usermod.8.xml:381(filename)
 #: useradd.8.xml:665(filename) sg.1.xml:109(filename)
 #: newusers.8.xml:378(filename) newgrp.1.xml:120(filename)
-#: gshadow.5.xml:150(filename) grpck.8.xml:175(filename)
+#: gshadow.5.xml:150(filename) grpck.8.xml:194(filename)
 #: groupmod.8.xml:173(filename) groupmems.8.xml:177(filename)
 #: groupdel.8.xml:98(filename) groupadd.8.xml:209(filename)
-#: gpasswd.1.xml:50(filename) gpasswd.1.xml:239(filename)
+#: gpasswd.1.xml:54(filename) gpasswd.1.xml:242(filename)
 #: chgpasswd.8.xml:193(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
@@ -224,29 +225,29 @@
 # type: Plain text
 #: vipw.8.xml:135(para) usermod.8.xml:383(para) useradd.8.xml:667(para)
 #: sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para)
-#: gshadow.5.xml:152(para) grpck.8.xml:177(para) groupmod.8.xml:175(para)
-#: groupdel.8.xml:100(para) groupadd.8.xml:211(para) gpasswd.1.xml:241(para)
+#: gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para)
+#: groupdel.8.xml:100(para) groupadd.8.xml:211(para) gpasswd.1.xml:244(para)
 #: chgpasswd.8.xml:195(para)
 msgid "Secure group account information."
 msgstr "Verschlüsselte Informationen zu den Gruppenkonten."
 
 #: vipw.8.xml:139(filename) usermod.8.xml:387(filename)
 #: userdel.8.xml:155(filename) useradd.8.xml:647(filename)
-#: su.1.xml:256(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
-#: pwck.8.xml:205(filename) passwd.5.xml:119(filename)
-#: passwd.1.xml:378(filename) newusers.8.xml:360(filename)
+#: su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
+#: pwck.8.xml:236(filename) passwd.5.xml:119(filename)
+#: passwd.1.xml:377(filename) newusers.8.xml:360(filename)
 #: newgrp.1.xml:102(filename) login.1.xml:331(filename)
-#: grpck.8.xml:181(filename) expiry.1.xml:71(filename)
+#: grpck.8.xml:200(filename) expiry.1.xml:71(filename)
 #: chsh.1.xml:136(filename) chpasswd.8.xml:211(filename)
 #: chfn.1.xml:122(filename) chage.1.xml:210(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
 #: vipw.8.xml:141(para) usermod.8.xml:389(para) userdel.8.xml:157(para)
-#: useradd.8.xml:649(para) su.1.xml:258(para) sg.1.xml:93(para)
-#: shadow.5.xml:235(para) pwck.8.xml:207(para) passwd.5.xml:121(para)
-#: passwd.1.xml:380(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
-#: login.1.xml:333(para) grpck.8.xml:183(para) expiry.1.xml:73(para)
+#: useradd.8.xml:649(para) su.1.xml:343(para) sg.1.xml:93(para)
+#: shadow.5.xml:235(para) pwck.8.xml:238(para) passwd.5.xml:121(para)
+#: passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
+#: login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para)
 #: chsh.1.xml:138(para) chpasswd.8.xml:213(para) chfn.1.xml:124(para)
 #: chage.1.xml:213(para)
 msgid "User account information."
@@ -254,9 +255,9 @@
 
 #: vipw.8.xml:145(filename) usermod.8.xml:393(filename)
 #: userdel.8.xml:161(filename) useradd.8.xml:653(filename)
-#: su.1.xml:262(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
-#: shadow.3.xml:204(filename) pwck.8.xml:211(filename)
-#: passwd.5.xml:125(filename) passwd.1.xml:384(filename)
+#: su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
+#: shadow.3.xml:204(filename) pwck.8.xml:242(filename)
+#: passwd.5.xml:125(filename) passwd.1.xml:383(filename)
 #: newusers.8.xml:366(filename) newgrp.1.xml:108(filename)
 #: login.1.xml:337(filename) expiry.1.xml:77(filename)
 #: chpasswd.8.xml:217(filename) chage.1.xml:218(filename)
@@ -265,25 +266,25 @@
 
 # type: Plain text
 #: vipw.8.xml:147(para) usermod.8.xml:395(para) userdel.8.xml:163(para)
-#: useradd.8.xml:655(para) su.1.xml:264(para) sg.1.xml:99(para)
-#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:213(para)
-#: passwd.1.xml:386(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
+#: useradd.8.xml:655(para) su.1.xml:349(para) sg.1.xml:99(para)
+#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:244(para)
+#: passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
 #: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:219(para)
 #: chage.1.xml:221(para)
 msgid "Secure user account information."
 msgstr "Verschlüsselte Informationen zu den Benutzerkonten."
 
 #: vipw.8.xml:154(title) usermod.8.xml:402(title) userdel.8.xml:248(title)
-#: useradd.8.xml:761(title) suauth.5.xml:197(title) su.1.xml:271(title)
-#: sg.1.xml:118(title) shadow.5.xml:248(title) shadow.3.xml:213(title)
-#: pwconv.8.xml:180(title) pwck.8.xml:220(title) porttime.5.xml:117(title)
-#: passwd.5.xml:134(title) passwd.1.xml:456(title) nologin.8.xml:64(title)
+#: useradd.8.xml:761(title) suauth.5.xml:197(title) su.1.xml:362(title)
+#: sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title)
+#: pwconv.8.xml:180(title) pwck.8.xml:302(title) porttime.5.xml:117(title)
+#: passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title)
 #: newusers.8.xml:399(title) newgrp.1.xml:129(title)
 #: login.defs.5.xml:471(title) login.access.5.xml:108(title)
-#: login.1.xml:370(title) limits.5.xml:150(title) gshadow.5.xml:159(title)
-#: grpck.8.xml:190(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
+#: login.1.xml:376(title) limits.5.xml:150(title) gshadow.5.xml:159(title)
+#: grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
 #: groupmems.8.xml:186(title) groupdel.8.xml:146(title)
-#: groupadd.8.xml:291(title) gpasswd.1.xml:248(title) faillog.8.xml:214(title)
+#: groupadd.8.xml:291(title) gpasswd.1.xml:251(title) faillog.8.xml:214(title)
 #: faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
 #: chpasswd.8.xml:238(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title)
 #: chage.1.xml:261(title)
@@ -757,9 +758,9 @@
 "gelassen wird, verwendet das System die Standard-Login-Shell."
 
 #: usermod.8.xml:340(title) userdel.8.xml:221(title) useradd.8.xml:597(title)
-#: su.1.xml:217(title) shadow.3.xml:193(title) passwd.1.xml:339(title)
+#: su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
 #: newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title)
-#: groupdel.8.xml:65(title) groupadd.8.xml:224(title) gpasswd.1.xml:203(title)
+#: groupdel.8.xml:65(title) groupadd.8.xml:224(title) gpasswd.1.xml:206(title)
 #: faillog.8.xml:191(title) chpasswd.8.xml:182(title)
 #: chgpasswd.8.xml:157(title)
 msgid "CAVEATS"
@@ -785,22 +786,22 @@
 msgstr ""
 
 #: usermod.8.xml:359(title) userdel.8.xml:125(title) useradd.8.xml:621(title)
-#: su.1.xml:225(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
-#: pwck.8.xml:182(title) passwd.1.xml:357(title) newusers.8.xml:324(title)
-#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:154(title)
+#: su.1.xml:310(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
+#: pwck.8.xml:213(title) passwd.1.xml:356(title) newusers.8.xml:324(title)
+#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:173(title)
 #: groupmod.8.xml:152(title) groupmems.8.xml:156(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:186(title) gpasswd.1.xml:215(title)
+#: groupdel.8.xml:77(title) groupadd.8.xml:186(title) gpasswd.1.xml:218(title)
 #: chsh.1.xml:120(title) chpasswd.8.xml:194(title) chgpasswd.8.xml:169(title)
 #: chfn.1.xml:99(title)
 msgid "CONFIGURATION"
 msgstr ""
 
 #: usermod.8.xml:360(para) userdel.8.xml:126(para) useradd.8.xml:622(para)
-#: su.1.xml:226(para) sg.1.xml:77(para) pwck.8.xml:183(para)
-#: passwd.1.xml:358(para) newusers.8.xml:325(para) newgrp.1.xml:88(para)
-#: login.1.xml:273(para) grpck.8.xml:155(para) groupmod.8.xml:153(para)
+#: su.1.xml:311(para) sg.1.xml:77(para) pwck.8.xml:214(para)
+#: passwd.1.xml:357(para) newusers.8.xml:325(para) newgrp.1.xml:88(para)
+#: login.1.xml:273(para) grpck.8.xml:174(para) groupmod.8.xml:153(para)
 #: groupmems.8.xml:157(para) groupdel.8.xml:78(para) groupadd.8.xml:187(para)
-#: gpasswd.1.xml:216(para) chsh.1.xml:121(para) chpasswd.8.xml:195(para)
+#: gpasswd.1.xml:219(para) chsh.1.xml:121(para) chpasswd.8.xml:195(para)
 #: chgpasswd.8.xml:170(para) chfn.1.xml:100(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
@@ -1124,8 +1125,9 @@
 msgstr ""
 
 #: userdel.8.xml:149(filename) useradd.8.xml:683(filename)
-#: pwconv.8.xml:171(filename) passwd.1.xml:390(filename)
-#: newusers.8.xml:384(filename) login.access.5.xml:99(filename)
+#: su.1.xml:353(filename) pwconv.8.xml:171(filename)
+#: passwd.1.xml:389(filename) newusers.8.xml:384(filename)
+#: login.access.5.xml:99(filename) login.1.xml:367(filename)
 #: groupadd.8.xml:215(filename) chsh.1.xml:148(filename)
 #: chpasswd.8.xml:223(filename) chgpasswd.8.xml:199(filename)
 #: chfn.1.xml:116(filename)
@@ -1133,38 +1135,39 @@
 msgstr "/etc/login.defs"
 
 # SB: Translation for "shadow password suite"?
-#: userdel.8.xml:151(para) useradd.8.xml:685(para) pwconv.8.xml:173(para)
-#: passwd.1.xml:392(para) newusers.8.xml:386(para)
-#: login.access.5.xml:101(para) groupadd.8.xml:217(para) chsh.1.xml:150(para)
-#: chpasswd.8.xml:225(para) chgpasswd.8.xml:201(para) chfn.1.xml:118(para)
+#: userdel.8.xml:151(para) useradd.8.xml:685(para) su.1.xml:355(para)
+#: pwconv.8.xml:173(para) passwd.1.xml:391(para) newusers.8.xml:386(para)
+#: login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:217(para)
+#: chsh.1.xml:150(para) chpasswd.8.xml:225(para) chgpasswd.8.xml:201(para)
+#: chfn.1.xml:118(para)
 msgid "Shadow password suite configuration."
 msgstr "Konfiguration des Shadow-Passwort-Systems"
 
-#: userdel.8.xml:170(title) useradd.8.xml:692(title) pwck.8.xml:241(title)
-#: passwd.1.xml:405(title) grpck.8.xml:214(title) groupmod.8.xml:182(title)
+#: userdel.8.xml:170(title) useradd.8.xml:692(title) pwck.8.xml:251(title)
+#: passwd.1.xml:404(title) grpck.8.xml:209(title) groupmod.8.xml:182(title)
 #: groupdel.8.xml:107(title) groupadd.8.xml:246(title) chage.1.xml:228(title)
 msgid "EXIT VALUES"
 msgstr "RÜCKGABEWERTE"
 
 #: userdel.8.xml:175(replaceable) useradd.8.xml:697(replaceable)
-#: pwck.8.xml:246(replaceable) passwd.1.xml:410(replaceable)
-#: grpck.8.xml:219(replaceable) groupmod.8.xml:187(replaceable)
+#: pwck.8.xml:256(replaceable) passwd.1.xml:409(replaceable)
+#: grpck.8.xml:214(replaceable) groupmod.8.xml:187(replaceable)
 #: groupdel.8.xml:112(replaceable) groupadd.8.xml:251(replaceable)
 #: chage.1.xml:233(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:177(para) useradd.8.xml:699(para) pwck.8.xml:248(para)
-#: passwd.1.xml:412(para) grpck.8.xml:221(para) groupmod.8.xml:189(para)
+#: userdel.8.xml:177(para) useradd.8.xml:699(para) pwck.8.xml:258(para)
+#: passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para)
 #: groupdel.8.xml:114(para) groupadd.8.xml:253(para) chage.1.xml:235(para)
 msgid "success"
 msgstr "Erfolg"
 
 #: userdel.8.xml:181(replaceable) useradd.8.xml:703(replaceable)
-#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:252(replaceable)
-#: passwd.1.xml:45(manvolnum) passwd.1.xml:416(replaceable)
+#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:262(replaceable)
+#: passwd.1.xml:45(manvolnum) passwd.1.xml:415(replaceable)
 #: newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum)
-#: grpck.8.xml:225(replaceable) groups.1.xml:35(manvolnum)
+#: grpck.8.xml:220(replaceable) groups.1.xml:35(manvolnum)
 #: gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum)
 #: chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:35(manvolnum)
 #: chage.1.xml:239(replaceable)
@@ -1176,21 +1179,21 @@
 msgstr "kann die Passwortdatei nicht aktualisieren"
 
 #: userdel.8.xml:187(replaceable) useradd.8.xml:709(replaceable)
-#: pwck.8.xml:258(replaceable) passwd.1.xml:422(replaceable)
-#: grpck.8.xml:231(replaceable) groupmod.8.xml:193(replaceable)
+#: pwck.8.xml:268(replaceable) passwd.1.xml:421(replaceable)
+#: grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable)
 #: groupdel.8.xml:118(replaceable) groupadd.8.xml:257(replaceable)
 #: chage.1.xml:245(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:189(para) useradd.8.xml:711(para) pwck.8.xml:254(para)
-#: grpck.8.xml:227(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
+#: userdel.8.xml:189(para) useradd.8.xml:711(para) pwck.8.xml:264(para)
+#: grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
 #: groupadd.8.xml:259(para) chage.1.xml:247(para)
 msgid "invalid command syntax"
 msgstr "unzulässige Syntax für diesen Befehl"
 
 #: userdel.8.xml:193(replaceable) useradd.8.xml:727(replaceable)
-#: pwck.8.xml:282(replaceable) passwd.1.xml:446(replaceable)
+#: pwck.8.xml:292(replaceable) passwd.1.xml:445(replaceable)
 #: groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
 msgid "6"
 msgstr "6"
@@ -2138,19 +2141,19 @@
 msgstr "Verzeichnis, das die Standarddateien enthält."
 
 #: useradd.8.xml:715(replaceable) shadow.3.xml:35(manvolnum)
-#: pwck.8.xml:264(replaceable) passwd.1.xml:428(replaceable)
-#: grpck.8.xml:237(replaceable) groupmod.8.xml:199(replaceable)
+#: pwck.8.xml:274(replaceable) passwd.1.xml:427(replaceable)
+#: grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable)
 #: groupadd.8.xml:263(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:717(para) passwd.1.xml:448(para) groupmod.8.xml:201(para)
+#: useradd.8.xml:717(para) passwd.1.xml:447(para) groupmod.8.xml:201(para)
 #: groupadd.8.xml:265(para)
 msgid "invalid argument to option"
 msgstr "ungültiges Argument für Option"
 
-#: useradd.8.xml:721(replaceable) pwck.8.xml:270(replaceable)
-#: passwd.1.xml:434(replaceable) grpck.8.xml:243(replaceable)
+#: useradd.8.xml:721(replaceable) pwck.8.xml:280(replaceable)
+#: passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable)
 #: groupmod.8.xml:205(replaceable) groupadd.8.xml:269(replaceable)
 msgid "4"
 msgstr "4"
@@ -2237,11 +2240,11 @@
 msgstr "suauth"
 
 #: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
-#: pwck.8.xml:276(replaceable) porttime.5.xml:35(manvolnum)
-#: passwd.5.xml:35(manvolnum) passwd.1.xml:440(replaceable)
+#: pwck.8.xml:286(replaceable) porttime.5.xml:35(manvolnum)
+#: passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable)
 #: login.defs.5.xml:98(manvolnum) login.access.5.xml:36(manvolnum)
 #: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
-#: grpck.8.xml:249(replaceable) faillog.5.xml:35(manvolnum)
+#: grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
 msgid "5"
 msgstr "5"
 
@@ -2556,12 +2559,20 @@
 "entdecken."
 
 #: su.1.xml:106(para)
+#, fuzzy
+#| msgid ""
+#| "The current environment is passed to the new shell. The value of <envar>"
+#| "$PATH</envar> is reset to <filename>/bin:/usr/bin</filename> for normal "
+#| "users, or <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the "
+#| "superuser. This may be changed with the <emphasis>ENV_PATH</emphasis> and "
+#| "<emphasis>ENV_SUPATH</emphasis> definitions in <filename>/etc/login.defs</"
+#| "filename>."
 msgid ""
 "The current environment is passed to the new shell. The value of <envar>"
 "$PATH</envar> is reset to <filename>/bin:/usr/bin</filename> for normal "
 "users, or <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the "
-"superuser. This may be changed with the <emphasis>ENV_PATH</emphasis> and "
-"<emphasis>ENV_SUPATH</emphasis> definitions in <filename>/etc/login.defs</"
+"superuser. This may be changed with the <option>ENV_PATH</option> and "
+"<option>ENV_SUPATH</option> definitions in <filename>/etc/login.defs</"
 "filename>."
 msgstr ""
 "Die aktuelle Umgebung wird an die neue Shell übergeben. Der Wert von <envar>"
@@ -2630,11 +2641,11 @@
 msgid "The shell that will be invoked."
 msgstr "Die Shell, die gestartet wird."
 
-#: su.1.xml:167(para)
+#: su.1.xml:170(para)
 msgid "The shell specified with --shell."
 msgstr "Die Shell, die mit --shell angegeben wurde."
 
-#: su.1.xml:170(para)
+#: su.1.xml:173(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
@@ -2643,7 +2654,7 @@
 "durch die Umgebungsvariable <envar>$SHELL</envar> festgelegt wird."
 
 # SB: Bessere Übersetzung als 'Zielbenutzer'?
-#: su.1.xml:177(para)
+#: su.1.xml:180(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
@@ -2651,7 +2662,7 @@
 "Die Shell, die in <filename>/etc/passwd</filename> für den Zielbenutzer "
 "angegeben ist."
 
-#: su.1.xml:183(para)
+#: su.1.xml:186(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
@@ -2667,7 +2678,7 @@
 "<placeholder-1/>"
 
 # SB: Bessere Übersetzung als 'Zielbenutzer'?
-#: su.1.xml:190(para)
+#: su.1.xml:191(para)
 msgid ""
 "If the target user has a restricted shell (i.e. the shell field of this "
 "user's entry in <filename>/etc/passwd</filename> is not listed in <filename>/"
@@ -2681,7 +2692,7 @@
 "shell</option> und die Umgebungsvariable <envar>$SHELL</envar> nicht "
 "beachtet, sofern <command>su</command> nicht von Root aufgerufen wird."
 
-#: su.1.xml:201(term)
+#: su.1.xml:202(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2689,11 +2700,33 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:206(para)
-msgid "Preserve the current environment."
+#: su.1.xml:211(envar)
+msgid "$PATH"
+msgstr ""
+
+#: su.1.xml:213(para)
+msgid ""
+"reset according to the <filename>/etc/login.defs</filename> options "
+"<option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
+msgstr ""
+
+#: su.1.xml:222(envar)
+msgid "$IFS"
+msgstr ""
+
+#: su.1.xml:224(para)
+msgid ""
+"reset to <quote>&lt;space&gt;&lt;tab&gt;&lt;newline&gt;</quote>, if it was "
+"set."
+msgstr ""
+
+#: su.1.xml:207(para)
+#, fuzzy
+#| msgid "Preserve the current environment."
+msgid "Preserve the current environment, except for: <placeholder-1/>"
 msgstr "Erhält die aktuelle Umgebung."
 
-#: su.1.xml:207(para)
+#: su.1.xml:233(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
@@ -2701,8 +2734,53 @@
 "Falls der Zielbenutzer eine beschränkte Shell besitzt, hat diese Option "
 "keinen Effekt (sofern <command>su</command> nicht von Root aufgerufen wird)."
 
-#: su.1.xml:218(para)
+#: su.1.xml:242(para)
 msgid ""
+"The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, "
+"<envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> "
+"environment variables are reset."
+msgstr ""
+
+#: su.1.xml:251(para)
+msgid ""
+"If <option>--login</option> is not used, the environment is copied, except "
+"for the variables above."
+msgstr ""
+
+#: su.1.xml:258(para)
+msgid ""
+"If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>"
+"$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> "
+"environment variables are copied if they were set."
+msgstr ""
+
+#: su.1.xml:268(para)
+msgid ""
+"If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</"
+"envar>, and <envar>$MAIL</envar> environment variables are set according to "
+"the <filename>/etc/login.defs</filename> options <option>ENV_TZ</option>, "
+"<option>ENV_HZ</option>, <option>MAIL_DIR</option>, and <option>MAIL_FILE</"
+"option> (see below)."
+msgstr ""
+
+#: su.1.xml:281(para)
+msgid ""
+"If <option>--login</option> is used, other environment variables might be "
+"set by the <option>ENVIRON_FILE</option> file (see below)."
+msgstr ""
+
+#: su.1.xml:289(para)
+msgid "Other environment might be set by PAM modules."
+msgstr ""
+
+#: su.1.xml:237(para)
+msgid ""
+"Note that the default behavior for the environment is the following: "
+"<placeholder-1/>"
+msgstr ""
+
+#: su.1.xml:303(para)
+msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
 msgstr ""
@@ -2790,6 +2868,17 @@
 "Every line should be in the form name=value."
 msgstr ""
 
+# SB: Shouldn't it be ":" at the end?
+#: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
+#, fuzzy
+#| msgid ""
+#| "The file is formatted like this, with lines starting with a # being "
+#| "treated as comment lines and ignored;"
+msgid "Lines starting with a # are treated as comment lines and ignored."
+msgstr ""
+"Die Datei ist folgendermaßen aufgebaut, wobei Zeilen, die mit einem # "
+"beginnen, als Kommentare behandelt und daher ignoriert werden:"
+
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_PATH</option> (string)"
@@ -2931,14 +3020,22 @@
 "sulog file logging."
 msgstr ""
 
-#: su.1.xml:272(para)
+#: su.1.xml:363(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>sh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -3023,8 +3120,9 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>"
+"citerefentry><phrase condition=\"gshadow\">, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry></phrase>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -3039,7 +3137,7 @@
 
 #: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
 #: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
-#: pwck.8.xml:60(replaceable) pwck.8.xml:74(replaceable)
+#: pwck.8.xml:60(replaceable) pwck.8.xml:75(replaceable)
 #: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
 msgid "shadow"
 msgstr "shadow"
@@ -3291,8 +3389,24 @@
 msgid "This field is reserved for future use."
 msgstr "sp_flag - für zukünftigen Gebrauch reserviert"
 
-#: shadow.5.xml:249(para)
+#: shadow.5.xml:245(filename)
 #, fuzzy
+#| msgid "/etc/shadow"
+msgid "/etc/shadow-"
+msgstr "/etc/shadow"
+
+#: shadow.5.xml:247(para)
+msgid "Backup file for /etc/shadow."
+msgstr ""
+
+#: shadow.5.xml:248(para) passwd.5.xml:134(para)
+msgid ""
+"Note that this file is used by the tools of the shadow toolsuite, but not by "
+"all user and password management tools."
+msgstr ""
+
+#: shadow.5.xml:259(para)
+#, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
 #| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -3778,12 +3892,12 @@
 msgid "verify integrity of password files"
 msgstr "überprüft die Stimmigkeit der Passwortdateien"
 
-#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:140(option)
+#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:171(option)
 msgid "-q"
 msgstr "-q"
 
-#: pwck.8.xml:53(arg) pwck.8.xml:161(option) grpck.8.xml:58(arg)
-#: grpck.8.xml:130(option)
+#: pwck.8.xml:53(arg) pwck.8.xml:192(option) grpck.8.xml:58(arg)
+#: grpck.8.xml:149(option)
 msgid "-s"
 msgstr "-s"
 
@@ -3794,19 +3908,26 @@
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:68(arg) pwck.8.xml:151(option) login.1.xml:222(option)
-#: grpck.8.xml:49(arg) grpck.8.xml:120(option)
+#: pwck.8.xml:68(arg) pwck.8.xml:182(option) login.1.xml:222(option)
+#: grpck.8.xml:49(arg) grpck.8.xml:139(option)
 msgid "-r"
 msgstr "-r"
 
-#: pwck.8.xml:82(para)
+#: pwck.8.xml:84(para)
+#, fuzzy
+#| msgid ""
+#| "The <command>pwck</command> command verifies the integrity of the system "
+#| "authentication information. All entries in the <filename>/etc/passwd</"
+#| "filename> and <filename>/etc/shadow</filename> are checked to see that "
+#| "the entry has the proper format and valid data in each field. The user is "
+#| "prompted to delete entries that are improperly formatted or which have "
+#| "other uncorrectable errors."
 msgid ""
-"The <command>pwck</command> command verifies the integrity of the system "
-"authentication information. All entries in the <filename>/etc/passwd</"
-"filename> and <filename>/etc/shadow</filename> are checked to see that the "
-"entry has the proper format and valid data in each field. The user is "
-"prompted to delete entries that are improperly formatted or which have other "
-"uncorrectable errors."
+"The <command>pwck</command> command verifies the integrity of the users and "
+"authentication information. It checks that all entries in <filename>/etc/"
+"passwd</filename> and <filename>/etc/shadow</filename> have the proper "
+"format and contain valid data. The user is prompted to delete entries that "
+"are improperly formatted or which have other uncorrectable errors."
 msgstr ""
 "Der Befehl <command>pwck</command> überprüft die Stimmigkeit der "
 "Informationen des Systems zur Authentifizierung. Alle Einträge in <filename>/"
@@ -3815,36 +3936,74 @@
 "Der Benutzer wird aufgefordert, Einträge zu löschen, die falsch formatiert "
 "sind oder andere unbehebbare Fehler enthalten."
 
-#: pwck.8.xml:91(para) grpck.8.xml:80(para)
+#: pwck.8.xml:93(para) grpck.8.xml:80(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr "Es wird überprüft, ob jeder Eintrag folgende Eigenschaften aufweist:"
 
-#: pwck.8.xml:94(para) grpck.8.xml:84(para)
+#: pwck.8.xml:96(para) grpck.8.xml:84(para)
 msgid "the correct number of fields"
 msgstr "die richtige Anzahl von Feldern"
 
-#: pwck.8.xml:97(para)
-msgid "a unique user name"
+#: pwck.8.xml:99(para)
+#, fuzzy
+#| msgid "a unique user name"
+msgid "a unique and valid user name"
 msgstr "einen eindeutigen Benutzernamen"
 
-#: pwck.8.xml:100(para)
+#: pwck.8.xml:102(para)
 msgid "a valid user and group identifier"
 msgstr "eine gültige Benutzer- und Gruppenkennung"
 
-#: pwck.8.xml:103(para)
+#: pwck.8.xml:105(para)
 msgid "a valid primary group"
 msgstr "eine gültige Hauptgruppe"
 
-#: pwck.8.xml:106(para)
+#: pwck.8.xml:108(para)
 msgid "a valid home directory"
 msgstr "ein gültiges Home-Verzeichnis"
 
-#: pwck.8.xml:109(para)
+#: pwck.8.xml:111(para)
 msgid "a valid login shell"
 msgstr "eine gültige Login-Shell"
 
-#: pwck.8.xml:113(para)
+#: pwck.8.xml:115(para)
 msgid ""
+"<filename>shadow</filename> checks are enabled when a second file parameter "
+"is specified or when <filename>/etc/shadow</filename> exists on the system."
+msgstr ""
+
+#: pwck.8.xml:120(para)
+msgid "These checks are the following:"
+msgstr ""
+
+#: pwck.8.xml:125(para)
+msgid ""
+"every passwd entry has a matching shadow entry, and every shadow entry has a "
+"matching passwd entry"
+msgstr ""
+
+#: pwck.8.xml:131(para)
+msgid "passwords are specified in the shadowed file"
+msgstr ""
+
+#: pwck.8.xml:134(para)
+#, fuzzy
+#| msgid "the correct number of fields"
+msgid "shadow entries have the correct number of fields"
+msgstr "die richtige Anzahl von Feldern"
+
+#: pwck.8.xml:137(para)
+msgid "shadow entries are unique in shadow"
+msgstr ""
+
+#: pwck.8.xml:140(para)
+#, fuzzy
+#| msgid "days before password may be changed"
+msgid "the last password changes are not in the future"
+msgstr "Anzahl der Tage, bevor das Passwort geändert werden darf"
+
+#: pwck.8.xml:144(para)
+msgid ""
 "The checks for correct number of fields and unique user name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
 "delete the entire line. If the user does not answer affirmatively, all "
@@ -3863,7 +4022,7 @@
 "Fehlern wird eine Warnung abgegeben und der Benutzer aufgefordert, den "
 "Fehler mittels des Befehls <command>usermod</command> zu beheben."
 
-#: pwck.8.xml:124(para)
+#: pwck.8.xml:155(para)
 msgid ""
 "The commands which operate on the <filename>/etc/passwd</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>pwck</command> "
@@ -3874,13 +4033,13 @@
 "sollte <command>pwck</command> verwendet werden, um den betreffenden Eintrag "
 "zu entfernen."
 
-#: pwck.8.xml:134(para)
+#: pwck.8.xml:165(para)
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>pwck</command> unterstützt werden, "
 "sind:"
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:174(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
@@ -3888,11 +4047,11 @@
 "Meldet nur Fehler. Warnung, die keine Handlung des Benutzers erfordern, "
 "werden nicht angezeigt."
 
-#: pwck.8.xml:154(para)
+#: pwck.8.xml:185(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr "Führt den Befehl <command>pwck</command> im Modus Nur-Lesen aus."
 
-#: pwck.8.xml:164(para)
+#: pwck.8.xml:195(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
@@ -3900,7 +4059,7 @@
 "Ordnet die Einträge in <filename>/etc/passwd</filename> und <filename>/etc/"
 "shadow</filename> nach der UID."
 
-#: pwck.8.xml:172(para)
+#: pwck.8.xml:203(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename>. The user may select "
@@ -3912,8 +4071,38 @@
 "kann andere Dateien mit den Parametern <emphasis remap=\"I\">passwd</"
 "emphasis> und <emphasis remap=\"I\">shadow</emphasis> auswählen."
 
-#: pwck.8.xml:221(para)
+#: pwck.8.xml:270(para)
+msgid "one or more bad password entries"
+msgstr "ein oder mehrere fehlerhafte Passworteinträge"
+
+#: pwck.8.xml:276(para)
+msgid "can't open password files"
+msgstr "kann die Passwortdatei nicht öffnen"
+
+#: pwck.8.xml:282(para)
+msgid "can't lock password files"
+msgstr "kann die Passwortdatei nicht sperren"
+
+#: pwck.8.xml:288(para)
+msgid "can't update password files"
+msgstr "kann die Passwortdatei nicht aktualisieren"
+
+#: pwck.8.xml:294(para)
 #, fuzzy
+#| msgid "can't open password files"
+msgid "can't sort password files"
+msgstr "kann die Passwortdatei nicht öffnen"
+
+#: pwck.8.xml:252(para)
+msgid ""
+"The <command>pwck</command> command exits with the following values: "
+"<placeholder-1/>"
+msgstr ""
+"Der Befehl <command>pwck</command> gibt beim Beenden folgende Werte zurück: "
+"<placeholder-1/>"
+
+#: pwck.8.xml:303(para)
+#, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 #| "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -3942,36 +4131,6 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: pwck.8.xml:260(para)
-msgid "one or more bad password entries"
-msgstr "ein oder mehrere fehlerhafte Passworteinträge"
-
-#: pwck.8.xml:266(para)
-msgid "can't open password files"
-msgstr "kann die Passwortdatei nicht öffnen"
-
-#: pwck.8.xml:272(para)
-msgid "can't lock password files"
-msgstr "kann die Passwortdatei nicht sperren"
-
-#: pwck.8.xml:278(para)
-msgid "can't update password files"
-msgstr "kann die Passwortdatei nicht aktualisieren"
-
-#: pwck.8.xml:284(para)
-#, fuzzy
-#| msgid "can't open password files"
-msgid "can't sort password files"
-msgstr "kann die Passwortdatei nicht öffnen"
-
-#: pwck.8.xml:242(para)
-msgid ""
-"The <command>pwck</command> command exits with the following values: "
-"<placeholder-1/>"
-msgstr ""
-"Der Befehl <command>pwck</command> gibt beim Beenden folgende Werte zurück: "
-"<placeholder-1/>"
-
 #: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
 msgid "porttime"
 msgstr "porttime"
@@ -4207,8 +4366,18 @@
 msgid "optional encrypted password file"
 msgstr "optionale Datei für verschlüsseltes Passwort"
 
-#: passwd.5.xml:135(para)
+#: passwd.5.xml:131(filename)
 #, fuzzy
+#| msgid "/etc/passwd"
+msgid "/etc/passwd-"
+msgstr "/etc/passwd"
+
+#: passwd.5.xml:133(para)
+msgid "Backup file for /etc/passwd."
+msgstr ""
+
+#: passwd.5.xml:145(para)
+#, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
 #| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -4509,9 +4678,13 @@
 msgid "Users with a locked password are not allowed to change their password."
 msgstr ""
 
-#: passwd.1.xml:247(term) chage.1.xml:138(term)
+#: passwd.1.xml:247(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+#| "replaceable>"
 msgid ""
-"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+"<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_TAGE</"
@@ -4581,14 +4754,13 @@
 msgid ""
 "Unlock the password of the named account. This option re-enables a password "
 "by changing the password back to its previous value (to the value before "
-"using the <option>-l</option> option), and by resetting the account expiry "
-"field."
+"using the <option>-l</option> option)."
 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:311(term)
+#: passwd.1.xml:310(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -4596,7 +4768,7 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_TAGE</"
 "replaceable>"
 
-#: passwd.1.xml:315(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -4608,7 +4780,7 @@
 "replaceable> bezeichnet die Anzahl der Tage, für die ein Benutzer vor "
 "Verfall seines Passworts gewarnt wird."
 
-#: passwd.1.xml:324(term)
+#: passwd.1.xml:323(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -4616,7 +4788,7 @@
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_TAGE</"
 "replaceable>"
 
-#: passwd.1.xml:328(para)
+#: passwd.1.xml:327(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -4624,7 +4796,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:340(para)
+#: passwd.1.xml:339(para)
 #, fuzzy
 #| msgid ""
 #| "Not all options may be supported. Password complexity checking may vary "
@@ -4643,13 +4815,13 @@
 "ändern, wenn auf dem System NIS aktiviert ist, sie aber nicht am NIS-Server "
 "angemeldet sind."
 
-#: passwd.1.xml:345(para)
+#: passwd.1.xml:344(para)
 msgid ""
 "Users may not be able to change their password on a system if NIS is enabled "
 "and they are not logged into the NIS server."
 msgstr ""
 
-#: passwd.1.xml:350(para)
+#: passwd.1.xml:349(para)
 msgid ""
 "<command>passwd</command> uses PAM to authenticate users and to change their "
 "passwords."
@@ -4841,38 +5013,38 @@
 "option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:396(filename)
+#: passwd.1.xml:395(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/passwd"
 
-#: passwd.1.xml:398(para)
+#: passwd.1.xml:397(para)
 msgid "PAM configuration for <command>passwd</command>."
 msgstr ""
 
-#: passwd.1.xml:418(para) chage.1.xml:241(para)
+#: passwd.1.xml:417(para) chage.1.xml:241(para)
 msgid "permission denied"
 msgstr "Berechtigung verweigert"
 
-#: passwd.1.xml:424(para)
+#: passwd.1.xml:423(para)
 msgid "invalid combination of options"
 msgstr "ungültige Kombination von Optionen"
 
-#: passwd.1.xml:430(para)
+#: passwd.1.xml:429(para)
 msgid "unexpected failure, nothing done"
 msgstr "unerwarteter Fehler, nichts wurde verändert"
 
-#: passwd.1.xml:436(para)
+#: passwd.1.xml:435(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr "unerwarteter Fehler, die Datei <filename>passwd</filename> fehlt"
 
-#: passwd.1.xml:442(para)
+#: passwd.1.xml:441(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 "Datei <filename>passwd</filename> wird benutzt, bitte nochmal versuchen"
 
-#: passwd.1.xml:406(para)
+#: passwd.1.xml:405(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4880,7 +5052,7 @@
 "Der Befehl <command>passwd</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: passwd.1.xml:457(para)
+#: passwd.1.xml:456(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
@@ -4892,10 +5064,11 @@
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry "
-"condition=\"no_pam\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5273,7 +5446,7 @@
 
 #: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
 #: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
-#: groupadd.8.xml:58(replaceable) gpasswd.1.xml:63(replaceable)
+#: groupadd.8.xml:58(replaceable) gpasswd.1.xml:66(replaceable)
 msgid "group"
 msgstr "Gruppe"
 
@@ -5341,8 +5514,9 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+"citerefentry><phrase condition=\"gshadow\">, <citerefentry condition="
+"\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry></phrase>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -5831,7 +6005,7 @@
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
 #: login.defs.5.xml:258(term) gpasswd.1.xml:42(refentrytitle)
-#: gpasswd.1.xml:47(refname) gpasswd.1.xml:58(command)
+#: gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
@@ -6386,7 +6560,7 @@
 msgid "Suppress printing of system messages."
 msgstr "Unterdrückt die Ausgabe von Systemnachrichten."
 
-#: login.1.xml:371(para)
+#: login.1.xml:377(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -6947,12 +7121,12 @@
 #| "prompted to delete entries that are improperly formatted or which have "
 #| "other uncorrectable errors."
 msgid ""
-"The <command>grpck</command> command verifies the integrity of the system "
-"authentication information. All entries in <filename>/etc/group</"
+"The <command>grpck</command> command verifies the integrity of the groups "
+"information. It checks that all entries in <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\">and <filename>/etc/gshadow</"
-"filename></phrase> are checked to see that the entry has the proper format "
-"and valid data in each field. The user is prompted to delete entries that "
-"are improperly formatted or which have other uncorrectable errors."
+"filename></phrase> have the proper format and contain valid data. The user "
+"is prompted to delete entries that are improperly formatted or which have "
+"other uncorrectable errors."
 msgstr ""
 "Der Befehl <command>grpwck</command> überprüft die Stimmigkeit der "
 "Informationen des Systems zur Authentifizierung. Alle Einträge in <filename>/"
@@ -6962,22 +7136,66 @@
 "sind oder andere unbehebbare Fehler enthalten."
 
 #: grpck.8.xml:87(para)
-msgid "a unique group name"
+#, fuzzy
+#| msgid "a unique group name"
+msgid "a unique and valid group name"
 msgstr "einen eindeutigen Gruppennamen"
 
 #: grpck.8.xml:90(para)
-msgid "a valid list of members and administrators"
+#, fuzzy
+#| msgid ""
+#| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
+#| "shadow</filename> by UID."
+msgid ""
+"a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/"
+"group</filename> only)</phrase>"
+msgstr ""
+"Ordnet die Einträge in <filename>/etc/passwd</filename> und <filename>/etc/"
+"shadow</filename> nach der UID."
+
+#: grpck.8.xml:97(para)
+#, fuzzy
+#| msgid "a valid list of members and administrators"
+msgid ""
+"a valid list of members <phrase condition=\"gshadow\"> and administrators</"
+"phrase>"
 msgstr "eine gültige Liste der Mitglieder und Administratoren"
 
-#: grpck.8.xml:94(para)
+#: grpck.8.xml:103(para)
+#, fuzzy
+#| msgid ""
+#| "These four programs all operate on the normal and shadow password and "
+#| "group files: <filename>/etc/passwd</filename>, <filename>/etc/group</"
+#| "filename>, <filename>/etc/shadow</filename>, and <filename>/etc/gshadow</"
+#| "filename>."
 msgid ""
+"a corresponding entry in the <filename>/etc/gshadow</filename> file "
+"(respectively <filename>/etc/group</filename> for the <filename>gshadow</"
+"filename> checks)"
+msgstr ""
+"Diese vier Programme funktionieren mit der normalen und der Shadow-"
+"Passwortdatei und den Gruppendateien: <filename>/etc/passwd</filename>, "
+"<filename>/etc/group</filename>, <filename>/etc/shadow</filename> und "
+"<filename>/etc/gshadow</filename>."
+
+#: grpck.8.xml:111(para)
+#, fuzzy
+#| msgid ""
+#| "The checks for correct number of fields and unique group name are fatal. "
+#| "If the entry has the wrong number of fields, the user will be prompted to "
+#| "delete the entire line. If the user does not answer affirmatively, all "
+#| "further checks are bypassed. An entry with a duplicated group name is "
+#| "prompted for deletion, but the remaining checks will still be made. All "
+#| "other errors are warnings and the user is encouraged to run the "
+#| "<command>groupmod</command> command to correct the error."
+msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
-"the entry has the wrong number of fields, the user will be prompted to "
-"delete the entire line. If the user does not answer affirmatively, all "
-"further checks are bypassed. An entry with a duplicated group name is "
-"prompted for deletion, but the remaining checks will still be made. All "
-"other errors are warnings and the user is encouraged to run the "
-"<command>groupmod</command> command to correct the error."
+"an entry has the wrong number of fields, the user will be prompted to delete "
+"the entire line. If the user does not answer affirmatively, all further "
+"checks are bypassed. An entry with a duplicated group name is prompted for "
+"deletion, but the remaining checks will still be made. All other errors are "
+"warnings and the user is encouraged to run the <command>groupmod</command> "
+"command to correct the error."
 msgstr ""
 "Fehler bei der Überprüfung der richtigen Anzahl der Felder und des "
 "eindeutigen Benutzernames sind schwerwiegend. Wenn ein Eintrag die falsche "
@@ -6989,18 +7207,26 @@
 "Fehlern wird eine Warnung abgegeben und der Benutzer aufgefordert, den "
 "Fehler mittels des Befehls <command>groupmod</command> zu beheben."
 
-#: grpck.8.xml:105(para)
+#: grpck.8.xml:122(para)
+#, fuzzy
+#| msgid ""
+#| "The commands which operate on the <filename>/etc/group</filename> file "
+#| "are not able to alter corrupted or duplicated entries. <command>grpck</"
+#| "command> should be used in those circumstances to remove the offending "
+#| "entry."
 msgid ""
-"The commands which operate on the <filename>/etc/group</filename> file are "
-"not able to alter corrupted or duplicated entries. <command>grpck</command> "
-"should be used in those circumstances to remove the offending entry."
+"The commands which operate on the <filename>/etc/group</filename><phrase "
+"condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
+"<filename>/etc/gshadow</filename> files</phrase> are not able to alter "
+"corrupted or duplicated entries. <command>grpck</command> should be used in "
+"those circumstances to remove the offending entries."
 msgstr ""
 "Die Befehle, die die Datei <filename>/etc/group</filename> bearbeiten, "
 "können falsche oder doppelte Einträge nicht verändern. In solchen Fällen "
 "sollte <command>grpwck</command> verwendet werden, um den betreffenden "
 "Eintrag zu entfernen."
 
-#: grpck.8.xml:115(para)
+#: grpck.8.xml:134(para)
 #, fuzzy
 #| msgid "The options which apply to the <command>pwck</command> command are:"
 msgid "The options which apply to the <command>grpck</command> command are:"
@@ -7008,14 +7234,14 @@
 "Die Optionen, die vom Befehl <command>pwck</command> unterstützt werden, "
 "sind:"
 
-#: grpck.8.xml:122(para)
+#: grpck.8.xml:141(para)
 msgid ""
 "Execute the <command>grpck</command> command in read-only mode. This causes "
 "all questions regarding changes to be answered <emphasis>no</emphasis> "
 "without user intervention."
 msgstr ""
 
-#: grpck.8.xml:132(para)
+#: grpck.8.xml:151(para)
 #, fuzzy
 #| msgid ""
 #| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
@@ -7027,7 +7253,7 @@
 "Ordnet die Einträge in <filename>/etc/passwd</filename> und <filename>/etc/"
 "shadow</filename> nach der UID."
 
-#: grpck.8.xml:141(para)
+#: grpck.8.xml:160(para)
 #, fuzzy
 #| msgid ""
 #| "By default, <command>pwck</command> operates on the files <filename>/etc/"
@@ -7047,7 +7273,31 @@
 "kann andere Dateien mit den Parametern <emphasis remap=\"I\">passwd</"
 "emphasis> und <emphasis remap=\"I\">shadow</emphasis> auswählen."
 
-#: grpck.8.xml:191(para)
+#: grpck.8.xml:228(para)
+msgid "one or more bad group entries"
+msgstr "ein oder mehrere fehlerhafte Gruppeneinträge"
+
+#: grpck.8.xml:234(para)
+msgid "can't open group files"
+msgstr "kann die Gruppendatei nicht öffnen"
+
+#: grpck.8.xml:240(para)
+msgid "can't lock group files"
+msgstr "kann die Gruppendatei nicht sperren"
+
+#: grpck.8.xml:246(para)
+msgid "can't update group files"
+msgstr "kann die Gruppendatei nicht aktualisieren"
+
+#: grpck.8.xml:210(para)
+msgid ""
+"The <command>grpck</command> command exits with the following values: "
+"<placeholder-1/>"
+msgstr ""
+"Der Befehl <command>grpck</command> gibt beim Beenden folgende Werte zurück: "
+"<placeholder-1/>"
+
+#: grpck.8.xml:255(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -7062,13 +7312,14 @@
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>groupmod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
-"condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-"manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition="
+"\"gshadow\"><citerefentry><refentrytitle>gshadow</"
+"refentrytitle><manvolnum>5</manvolnum>, </citerefentry>, </"
+"phrase><citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>pwck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -7080,30 +7331,6 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: grpck.8.xml:233(para)
-msgid "one or more bad group entries"
-msgstr "ein oder mehrere fehlerhafte Gruppeneinträge"
-
-#: grpck.8.xml:239(para)
-msgid "can't open group files"
-msgstr "kann die Gruppendatei nicht öffnen"
-
-#: grpck.8.xml:245(para)
-msgid "can't lock group files"
-msgstr "kann die Gruppendatei nicht sperren"
-
-#: grpck.8.xml:251(para)
-msgid "can't update group files"
-msgstr "kann die Gruppendatei nicht aktualisieren"
-
-#: grpck.8.xml:215(para)
-msgid ""
-"The <command>grpck</command> command exits with the following values: "
-"<placeholder-1/>"
-msgstr ""
-"Der Befehl <command>grpck</command> gibt beim Beenden folgende Werte zurück: "
-"<placeholder-1/>"
-
 #: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
 #: groups.1.xml:45(command)
 msgid "groups"
@@ -7772,26 +7999,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:50(phrase)
+#: gpasswd.1.xml:49(phrase)
 #, fuzzy
-msgid "and <placeholder-1/> files"
-msgstr "-a <placeholder-1/>"
+#| msgid "administer the <placeholder-1/> file"
+msgid "administer <placeholder-1/>"
+msgstr "verwaltet die Datei <placeholder-1/>"
 
 #: gpasswd.1.xml:52(phrase)
-msgid "file"
-msgstr ""
-
-#: gpasswd.1.xml:48(refpurpose)
 #, fuzzy
-msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
+msgid "administer <placeholder-1/> and <placeholder-2/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:60(replaceable)
+#: gpasswd.1.xml:63(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "Optionen"
 
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:73(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -7799,12 +8023,12 @@
 "\">administrators,</phrase> members and a password."
 msgstr ""
 
-#: gpasswd.1.xml:78(para)
+#: gpasswd.1.xml:81(para)
 #, fuzzy
 msgid ""
 "System administrators 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."
+"administrator(s) and the <option>-M</option> option to define members. They "
+"have 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 "
@@ -7814,7 +8038,7 @@
 "festlegen. Mit der Option <option>-M</option> legt er die Mitglieder fest. "
 "Er besitzt alle Rechte, die Administratoren und Mitglieder haben können."
 
-#: gpasswd.1.xml:83(para)
+#: gpasswd.1.xml:86(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -7822,7 +8046,7 @@
 "of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:90(para)
+#: gpasswd.1.xml:93(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still use "
@@ -7836,11 +8060,11 @@
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> ausführen. Alle "
 "anderen Benutzer benötigen dazu das Passwort."
 
-#: gpasswd.1.xml:98(title)
+#: gpasswd.1.xml:101(title)
 msgid "Notes about group passwords"
 msgstr "Hinweise zu Gruppenpasswörtern"
 
-#: gpasswd.1.xml:99(para)
+#: gpasswd.1.xml:102(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 "
@@ -7850,7 +8074,7 @@
 "Personen das Passwort kennen. Dennoch sind sie eine sinnvolle Einrichtung, "
 "um die Zusammenarbeit zwischen Benutzern zu erleichtern."
 
-#: gpasswd.1.xml:110(para)
+#: gpasswd.1.xml:113(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
@@ -7860,18 +8084,18 @@
 "option> können nur verwendet werden, wenn <command>login</command> von Root "
 "ausgeführt wird."
 
-#: gpasswd.1.xml:114(para)
+#: gpasswd.1.xml:117(para)
 msgid "The options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:117(para)
+#: gpasswd.1.xml:120(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:122(term)
+#: gpasswd.1.xml:125(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
@@ -7880,7 +8104,7 @@
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:126(para)
+#: gpasswd.1.xml:129(para)
 #, fuzzy
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
@@ -7889,7 +8113,7 @@
 "Der Gruppenname wird vom Namen <replaceable>GRUPPE</replaceable> auf "
 "<replaceable>NEUE_GRUPPE</replaceable> geändert."
 
-#: gpasswd.1.xml:135(term)
+#: gpasswd.1.xml:138(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -7899,7 +8123,7 @@
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>TAGE</replaceable>"
 
-#: gpasswd.1.xml:139(para)
+#: gpasswd.1.xml:142(para)
 #, fuzzy
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
@@ -7908,33 +8132,33 @@
 "Der Gruppenname wird vom Namen <replaceable>GRUPPE</replaceable> auf "
 "<replaceable>NEUE_GRUPPE</replaceable> geändert."
 
-#: gpasswd.1.xml:148(term)
+#: gpasswd.1.xml:151(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--remove</option>"
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
-#: gpasswd.1.xml:152(para)
+#: gpasswd.1.xml:155(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:163(term)
+#: gpasswd.1.xml:166(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:167(para)
+#: gpasswd.1.xml:170(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:178(term)
+#: gpasswd.1.xml:181(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
@@ -7946,12 +8170,12 @@
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_TAGE</"
 "replaceable>"
 
-#: gpasswd.1.xml:182(para)
+#: gpasswd.1.xml:185(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr "Liste der Administratoren der Gruppe, durch Kommas getrennt"
 
-#: gpasswd.1.xml:190(term)
+#: gpasswd.1.xml:193(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
@@ -7962,12 +8186,12 @@
 msgstr ""
 "<option>-b</option>, <option>--before</option><replaceable>TAGE</replaceable>"
 
-#: gpasswd.1.xml:194(para)
+#: gpasswd.1.xml:197(para)
 #, fuzzy
 msgid "Set the list of group members."
 msgstr "Liste der Mitglieder der Gruppe, durch Kommas getrennt"
 
-#: gpasswd.1.xml:204(para)
+#: gpasswd.1.xml:207(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -7976,7 +8200,7 @@
 "server."
 msgstr ""
 
-#: gpasswd.1.xml:249(para)
+#: gpasswd.1.xml:252(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -8495,10 +8719,11 @@
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
-"condition=\"no_pam\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition="
+"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+"phrase><citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -8774,6 +8999,14 @@
 msgid "Show account aging information."
 msgstr "Zeigt Informationen zum Kontoalterung."
 
+#: chage.1.xml:138(term)
+msgid ""
+"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+"replaceable>"
+msgstr ""
+"<option>-m</option>, <option>--mindays</option><replaceable>MIN_TAGE</"
+"replaceable>"
+
 #: chage.1.xml:150(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
@@ -8882,6 +9115,10 @@
 msgstr "Simon Brandmair (sbrandmair at gmx.net), 2005, 2007."
 
 #, fuzzy
+#~ msgid "and <placeholder-1/> files"
+#~ msgstr "-a <placeholder-1/>"
+
+#, fuzzy
 #~| msgid ""
 #~| "<command>usermod</command> will not allow you to change the name of a "
 #~| "user who is logged in. You must make certain that the named user is not "
@@ -9391,9 +9628,6 @@
 #~ msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 #~ msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 
-#~ msgid "administer the <placeholder-1/> file"
-#~ msgstr "verwaltet die Datei <placeholder-1/>"
-
 #~ msgid ""
 #~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
 #~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"

Modified: upstream/trunk/man/po/fr.po
===================================================================
--- upstream/trunk/man/po/fr.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/man/po/fr.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow-man-pages 4.0.18\n"
-"POT-Creation-Date: 2009-05-22 13:15+0200\n"
+"POT-Creation-Date: 2009-07-24 03:03+0200\n"
 "PO-Revision-Date: 2009-06-14 14:46+0200\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"
@@ -81,14 +81,14 @@
 #: vipw.8.xml:66(title) usermod.8.xml:59(title) userdel.8.xml:60(title)
 #: useradd.8.xml:79(title) suauth.5.xml:50(title) su.1.xml:77(title)
 #: sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title)
-#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:81(title)
+#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:83(title)
 #: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
 #: nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title)
 #: logoutd.8.xml:50(title) login.defs.5.xml:107(title)
 #: login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title)
 #: lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title)
 #: groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title)
-#: groupdel.8.xml:57(title) groupadd.8.xml:64(title) gpasswd.1.xml:69(title)
+#: groupdel.8.xml:57(title) groupadd.8.xml:64(title) gpasswd.1.xml:72(title)
 #: faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title)
 #: chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title)
 #: chfn.1.xml:63(title) chage.1.xml:55(title)
@@ -122,10 +122,10 @@
 "citerefentry>."
 
 #: vipw.8.xml:84(title) usermod.8.xml:67(title) userdel.8.xml:69(title)
-#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:133(title)
+#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:164(title)
 #: passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title)
-#: lastlog.8.xml:66(title) grpck.8.xml:114(title) groupmod.8.xml:67(title)
-#: groupmems.8.xml:75(title) groupadd.8.xml:73(title) gpasswd.1.xml:109(title)
+#: lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title)
+#: groupmems.8.xml:75(title) groupadd.8.xml:73(title) gpasswd.1.xml:112(title)
 #: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:109(title)
 #: chgpasswd.8.xml:88(title) chage.1.xml:65(title)
 msgid "OPTIONS"
@@ -188,15 +188,15 @@
 msgstr "Éditer les bases de données shadow ou gshadow."
 
 #: vipw.8.xml:124(title) usermod.8.xml:372(title) userdel.8.xml:140(title)
-#: useradd.8.xml:644(title) suauth.5.xml:168(title) su.1.xml:253(title)
+#: useradd.8.xml:644(title) suauth.5.xml:168(title) su.1.xml:338(title)
 #: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
-#: pwconv.8.xml:168(title) pwck.8.xml:196(title) porttime.5.xml:105(title)
-#: passwd.5.xml:116(title) passwd.1.xml:375(title) newusers.8.xml:357(title)
+#: pwconv.8.xml:168(title) pwck.8.xml:227(title) porttime.5.xml:105(title)
+#: passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(title)
 #: newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title)
 #: login.1.xml:316(title) limits.5.xml:140(title) lastlog.8.xml:147(title)
-#: gshadow.5.xml:141(title) grpck.8.xml:166(title) groups.1.xml:75(title)
+#: gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title)
 #: groupmod.8.xml:164(title) groupmems.8.xml:168(title)
-#: groupdel.8.xml:89(title) groupadd.8.xml:200(title) gpasswd.1.xml:230(title)
+#: groupdel.8.xml:89(title) groupadd.8.xml:200(title) gpasswd.1.xml:233(title)
 #: faillog.8.xml:202(title) faillog.5.xml:71(title) expiry.1.xml:68(title)
 #: chsh.1.xml:133(title) chpasswd.8.xml:208(title) chgpasswd.8.xml:184(title)
 #: chfn.1.xml:113(title) chage.1.xml:206(title)
@@ -205,61 +205,62 @@
 
 #: vipw.8.xml:127(filename) usermod.8.xml:375(filename)
 #: userdel.8.xml:143(filename) useradd.8.xml:659(filename)
-#: sg.1.xml:103(filename) pwck.8.xml:199(filename)
+#: sg.1.xml:103(filename) pwck.8.xml:230(filename)
 #: newusers.8.xml:372(filename) newgrp.1.xml:114(filename)
-#: gshadow.5.xml:144(filename) grpck.8.xml:169(filename)
+#: gshadow.5.xml:144(filename) grpck.8.xml:188(filename)
 #: groups.1.xml:78(filename) groupmod.8.xml:167(filename)
 #: groupmems.8.xml:171(filename) groupdel.8.xml:92(filename)
-#: groupadd.8.xml:203(filename) gpasswd.1.xml:49(filename)
-#: gpasswd.1.xml:233(filename) chgpasswd.8.xml:187(filename)
+#: groupadd.8.xml:203(filename) gpasswd.1.xml:50(filename)
+#: gpasswd.1.xml:53(filename) gpasswd.1.xml:236(filename)
+#: chgpasswd.8.xml:187(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
 #: vipw.8.xml:129(para) usermod.8.xml:377(para) userdel.8.xml:145(para)
-#: useradd.8.xml:661(para) sg.1.xml:105(para) pwck.8.xml:201(para)
+#: useradd.8.xml:661(para) sg.1.xml:105(para) pwck.8.xml:232(para)
 #: newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para)
-#: grpck.8.xml:171(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
+#: grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
 #: groupmems.8.xml:173(para) groupdel.8.xml:94(para) groupadd.8.xml:205(para)
-#: gpasswd.1.xml:235(para) chgpasswd.8.xml:189(para)
+#: gpasswd.1.xml:238(para) chgpasswd.8.xml:189(para)
 msgid "Group account information."
 msgstr "Informations sur les groupes."
 
 #: vipw.8.xml:133(filename) usermod.8.xml:381(filename)
 #: useradd.8.xml:665(filename) sg.1.xml:109(filename)
 #: newusers.8.xml:378(filename) newgrp.1.xml:120(filename)
-#: gshadow.5.xml:150(filename) grpck.8.xml:175(filename)
+#: gshadow.5.xml:150(filename) grpck.8.xml:194(filename)
 #: groupmod.8.xml:173(filename) groupmems.8.xml:177(filename)
 #: groupdel.8.xml:98(filename) groupadd.8.xml:209(filename)
-#: gpasswd.1.xml:50(filename) gpasswd.1.xml:239(filename)
+#: gpasswd.1.xml:54(filename) gpasswd.1.xml:242(filename)
 #: chgpasswd.8.xml:193(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
 #: vipw.8.xml:135(para) usermod.8.xml:383(para) useradd.8.xml:667(para)
 #: sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para)
-#: gshadow.5.xml:152(para) grpck.8.xml:177(para) groupmod.8.xml:175(para)
-#: groupdel.8.xml:100(para) groupadd.8.xml:211(para) gpasswd.1.xml:241(para)
+#: gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para)
+#: groupdel.8.xml:100(para) groupadd.8.xml:211(para) gpasswd.1.xml:244(para)
 #: chgpasswd.8.xml:195(para)
 msgid "Secure group account information."
 msgstr "Informations sécurisées sur les groupes."
 
 #: vipw.8.xml:139(filename) usermod.8.xml:387(filename)
 #: userdel.8.xml:155(filename) useradd.8.xml:647(filename)
-#: su.1.xml:256(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
-#: pwck.8.xml:205(filename) passwd.5.xml:119(filename)
-#: passwd.1.xml:378(filename) newusers.8.xml:360(filename)
+#: su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
+#: pwck.8.xml:236(filename) passwd.5.xml:119(filename)
+#: passwd.1.xml:377(filename) newusers.8.xml:360(filename)
 #: newgrp.1.xml:102(filename) login.1.xml:331(filename)
-#: grpck.8.xml:181(filename) expiry.1.xml:71(filename)
+#: grpck.8.xml:200(filename) expiry.1.xml:71(filename)
 #: chsh.1.xml:136(filename) chpasswd.8.xml:211(filename)
 #: chfn.1.xml:122(filename) chage.1.xml:210(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
 #: vipw.8.xml:141(para) usermod.8.xml:389(para) userdel.8.xml:157(para)
-#: useradd.8.xml:649(para) su.1.xml:258(para) sg.1.xml:93(para)
-#: shadow.5.xml:235(para) pwck.8.xml:207(para) passwd.5.xml:121(para)
-#: passwd.1.xml:380(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
-#: login.1.xml:333(para) grpck.8.xml:183(para) expiry.1.xml:73(para)
+#: useradd.8.xml:649(para) su.1.xml:343(para) sg.1.xml:93(para)
+#: shadow.5.xml:235(para) pwck.8.xml:238(para) passwd.5.xml:121(para)
+#: passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
+#: login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para)
 #: chsh.1.xml:138(para) chpasswd.8.xml:213(para) chfn.1.xml:124(para)
 #: chage.1.xml:213(para)
 msgid "User account information."
@@ -267,9 +268,9 @@
 
 #: vipw.8.xml:145(filename) usermod.8.xml:393(filename)
 #: userdel.8.xml:161(filename) useradd.8.xml:653(filename)
-#: su.1.xml:262(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
-#: shadow.3.xml:204(filename) pwck.8.xml:211(filename)
-#: passwd.5.xml:125(filename) passwd.1.xml:384(filename)
+#: su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
+#: shadow.3.xml:204(filename) pwck.8.xml:242(filename)
+#: passwd.5.xml:125(filename) passwd.1.xml:383(filename)
 #: newusers.8.xml:366(filename) newgrp.1.xml:108(filename)
 #: login.1.xml:337(filename) expiry.1.xml:77(filename)
 #: chpasswd.8.xml:217(filename) chage.1.xml:218(filename)
@@ -277,25 +278,25 @@
 msgstr "/etc/shadow"
 
 #: vipw.8.xml:147(para) usermod.8.xml:395(para) userdel.8.xml:163(para)
-#: useradd.8.xml:655(para) su.1.xml:264(para) sg.1.xml:99(para)
-#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:213(para)
-#: passwd.1.xml:386(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
+#: useradd.8.xml:655(para) su.1.xml:349(para) sg.1.xml:99(para)
+#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:244(para)
+#: passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
 #: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:219(para)
 #: chage.1.xml:221(para)
 msgid "Secure user account information."
 msgstr "Informations sécurisées sur les comptes utilisateurs."
 
 #: vipw.8.xml:154(title) usermod.8.xml:402(title) userdel.8.xml:248(title)
-#: useradd.8.xml:761(title) suauth.5.xml:197(title) su.1.xml:271(title)
-#: sg.1.xml:118(title) shadow.5.xml:248(title) shadow.3.xml:213(title)
-#: pwconv.8.xml:180(title) pwck.8.xml:220(title) porttime.5.xml:117(title)
-#: passwd.5.xml:134(title) passwd.1.xml:456(title) nologin.8.xml:64(title)
+#: useradd.8.xml:761(title) suauth.5.xml:197(title) su.1.xml:362(title)
+#: sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title)
+#: pwconv.8.xml:180(title) pwck.8.xml:302(title) porttime.5.xml:117(title)
+#: passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title)
 #: newusers.8.xml:399(title) newgrp.1.xml:129(title)
 #: login.defs.5.xml:471(title) login.access.5.xml:108(title)
-#: login.1.xml:370(title) limits.5.xml:150(title) gshadow.5.xml:159(title)
-#: grpck.8.xml:190(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
+#: login.1.xml:376(title) limits.5.xml:150(title) gshadow.5.xml:159(title)
+#: grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
 #: groupmems.8.xml:186(title) groupdel.8.xml:146(title)
-#: groupadd.8.xml:291(title) gpasswd.1.xml:248(title) faillog.8.xml:214(title)
+#: groupadd.8.xml:291(title) gpasswd.1.xml:251(title) faillog.8.xml:214(title)
 #: faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
 #: chpasswd.8.xml:238(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title)
 #: chage.1.xml:261(title)
@@ -642,9 +643,9 @@
 "in the user's home directory will have the file user ID changed "
 "automatically."
 msgstr ""
-"La boîte aux lettres et tous les fichiers possédés par l'utilisateur et qui sont situés dans son "
-"répertoire personnel verront leur identifiant d'utilisateur automatiquement "
-"modifié."
+"La boîte aux lettres et tous les fichiers possédés par l'utilisateur et qui "
+"sont situés dans son répertoire personnel verront leur identifiant "
+"d'utilisateur automatiquement modifié."
 
 #: usermod.8.xml:297(para)
 msgid ""
@@ -698,9 +699,9 @@
 "de commandes initial par défaut."
 
 #: usermod.8.xml:340(title) userdel.8.xml:221(title) useradd.8.xml:597(title)
-#: su.1.xml:217(title) shadow.3.xml:193(title) passwd.1.xml:339(title)
+#: su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
 #: newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title)
-#: groupdel.8.xml:65(title) groupadd.8.xml:224(title) gpasswd.1.xml:203(title)
+#: groupdel.8.xml:65(title) groupadd.8.xml:224(title) gpasswd.1.xml:206(title)
 #: faillog.8.xml:191(title) chpasswd.8.xml:182(title)
 #: chgpasswd.8.xml:157(title)
 msgid "CAVEATS"
@@ -726,30 +727,29 @@
 msgstr ""
 
 #: usermod.8.xml:359(title) userdel.8.xml:125(title) useradd.8.xml:621(title)
-#: su.1.xml:225(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
-#: pwck.8.xml:182(title) passwd.1.xml:357(title) newusers.8.xml:324(title)
-#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:154(title)
+#: su.1.xml:310(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
+#: pwck.8.xml:213(title) passwd.1.xml:356(title) newusers.8.xml:324(title)
+#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:173(title)
 #: groupmod.8.xml:152(title) groupmems.8.xml:156(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:186(title) gpasswd.1.xml:215(title)
+#: groupdel.8.xml:77(title) groupadd.8.xml:186(title) gpasswd.1.xml:218(title)
 #: chsh.1.xml:120(title) chpasswd.8.xml:194(title) chgpasswd.8.xml:169(title)
 #: chfn.1.xml:99(title)
 msgid "CONFIGURATION"
 msgstr "CONFIGURATION"
 
 #: usermod.8.xml:360(para) userdel.8.xml:126(para) useradd.8.xml:622(para)
-#: su.1.xml:226(para) sg.1.xml:77(para) pwck.8.xml:183(para)
-#: passwd.1.xml:358(para) newusers.8.xml:325(para) newgrp.1.xml:88(para)
-#: login.1.xml:273(para) grpck.8.xml:155(para) groupmod.8.xml:153(para)
+#: su.1.xml:311(para) sg.1.xml:77(para) pwck.8.xml:214(para)
+#: passwd.1.xml:357(para) newusers.8.xml:325(para) newgrp.1.xml:88(para)
+#: login.1.xml:273(para) grpck.8.xml:174(para) groupmod.8.xml:153(para)
 #: groupmems.8.xml:157(para) groupdel.8.xml:78(para) groupadd.8.xml:187(para)
-#: gpasswd.1.xml:216(para) chsh.1.xml:121(para) chpasswd.8.xml:195(para)
+#: gpasswd.1.xml:219(para) chsh.1.xml:121(para) chpasswd.8.xml:195(para)
 #: chgpasswd.8.xml:170(para) chfn.1.xml:100(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of this tool:"
 msgstr ""
-"Les variables de configuration suivantes de "
-"<filename>/etc/login.defs</filename> modifient le comportement de cet "
-"outil :"
+"Les variables de configuration suivantes de <filename>/etc/login.defs</"
+"filename> modifient le comportement de cet outil :"
 
 #: usermod.8.xml:32(term) userdel.8.xml:32(term) useradd.8.xml:32(term)
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
@@ -1098,46 +1098,48 @@
 msgstr ""
 
 #: userdel.8.xml:149(filename) useradd.8.xml:683(filename)
-#: pwconv.8.xml:171(filename) passwd.1.xml:390(filename)
-#: newusers.8.xml:384(filename) login.access.5.xml:99(filename)
+#: su.1.xml:353(filename) pwconv.8.xml:171(filename)
+#: passwd.1.xml:389(filename) newusers.8.xml:384(filename)
+#: login.access.5.xml:99(filename) login.1.xml:367(filename)
 #: groupadd.8.xml:215(filename) chsh.1.xml:148(filename)
 #: chpasswd.8.xml:223(filename) chgpasswd.8.xml:199(filename)
 #: chfn.1.xml:116(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:151(para) useradd.8.xml:685(para) pwconv.8.xml:173(para)
-#: passwd.1.xml:392(para) newusers.8.xml:386(para)
-#: login.access.5.xml:101(para) groupadd.8.xml:217(para) chsh.1.xml:150(para)
-#: chpasswd.8.xml:225(para) chgpasswd.8.xml:201(para) chfn.1.xml:118(para)
+#: userdel.8.xml:151(para) useradd.8.xml:685(para) su.1.xml:355(para)
+#: pwconv.8.xml:173(para) passwd.1.xml:391(para) newusers.8.xml:386(para)
+#: login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:217(para)
+#: chsh.1.xml:150(para) chpasswd.8.xml:225(para) chgpasswd.8.xml:201(para)
+#: chfn.1.xml:118(para)
 msgid "Shadow password suite configuration."
 msgstr "Configuration de la suite des mots de passe cachés « shadow password »."
 
-#: userdel.8.xml:170(title) useradd.8.xml:692(title) pwck.8.xml:241(title)
-#: passwd.1.xml:405(title) grpck.8.xml:214(title) groupmod.8.xml:182(title)
+#: userdel.8.xml:170(title) useradd.8.xml:692(title) pwck.8.xml:251(title)
+#: passwd.1.xml:404(title) grpck.8.xml:209(title) groupmod.8.xml:182(title)
 #: groupdel.8.xml:107(title) groupadd.8.xml:246(title) chage.1.xml:228(title)
 msgid "EXIT VALUES"
 msgstr "VALEURS DE RETOUR"
 
 #: userdel.8.xml:175(replaceable) useradd.8.xml:697(replaceable)
-#: pwck.8.xml:246(replaceable) passwd.1.xml:410(replaceable)
-#: grpck.8.xml:219(replaceable) groupmod.8.xml:187(replaceable)
+#: pwck.8.xml:256(replaceable) passwd.1.xml:409(replaceable)
+#: grpck.8.xml:214(replaceable) groupmod.8.xml:187(replaceable)
 #: groupdel.8.xml:112(replaceable) groupadd.8.xml:251(replaceable)
 #: chage.1.xml:233(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:177(para) useradd.8.xml:699(para) pwck.8.xml:248(para)
-#: passwd.1.xml:412(para) grpck.8.xml:221(para) groupmod.8.xml:189(para)
+#: userdel.8.xml:177(para) useradd.8.xml:699(para) pwck.8.xml:258(para)
+#: passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para)
 #: groupdel.8.xml:114(para) groupadd.8.xml:253(para) chage.1.xml:235(para)
 msgid "success"
 msgstr "succès"
 
 #: userdel.8.xml:181(replaceable) useradd.8.xml:703(replaceable)
-#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:252(replaceable)
-#: passwd.1.xml:45(manvolnum) passwd.1.xml:416(replaceable)
+#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:262(replaceable)
+#: passwd.1.xml:45(manvolnum) passwd.1.xml:415(replaceable)
 #: newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum)
-#: grpck.8.xml:225(replaceable) groups.1.xml:35(manvolnum)
+#: grpck.8.xml:220(replaceable) groups.1.xml:35(manvolnum)
 #: gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum)
 #: chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:35(manvolnum)
 #: chage.1.xml:239(replaceable)
@@ -1149,21 +1151,21 @@
 msgstr "impossible de mettre à jour le fichier des mots de passe"
 
 #: userdel.8.xml:187(replaceable) useradd.8.xml:709(replaceable)
-#: pwck.8.xml:258(replaceable) passwd.1.xml:422(replaceable)
-#: grpck.8.xml:231(replaceable) groupmod.8.xml:193(replaceable)
+#: pwck.8.xml:268(replaceable) passwd.1.xml:421(replaceable)
+#: grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable)
 #: groupdel.8.xml:118(replaceable) groupadd.8.xml:257(replaceable)
 #: chage.1.xml:245(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:189(para) useradd.8.xml:711(para) pwck.8.xml:254(para)
-#: grpck.8.xml:227(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
+#: userdel.8.xml:189(para) useradd.8.xml:711(para) pwck.8.xml:264(para)
+#: grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
 #: groupadd.8.xml:259(para) chage.1.xml:247(para)
 msgid "invalid command syntax"
 msgstr "erreur de syntaxe"
 
 #: userdel.8.xml:193(replaceable) useradd.8.xml:727(replaceable)
-#: pwck.8.xml:282(replaceable) passwd.1.xml:446(replaceable)
+#: pwck.8.xml:292(replaceable) passwd.1.xml:445(replaceable)
 #: groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
 msgid "6"
 msgstr "6"
@@ -1512,13 +1514,14 @@
 "replaceable>=<replaceable>499</replaceable>"
 msgstr ""
 "Surcharge les valeurs par défaut du fichier <filename>/etc/login.defs</"
-"filename> (<option>UID_MIN</option>, <option>UID_MAX</option>, <option>UMASK</option>, <option>PASS_MAX_DAYS</option> et autres). <placeholder-1/"
-"> Par exemple : <option>-K</option> <replaceable>PASS_MAX_DAYS</"
-"replaceable>=<replaceable>-1</replaceable> peut être utilisé pour la "
-"création de comptes système pour désactiver la gestion de la durée de "
-"validité des mots de passe, même si les comptes système n'ont pas de mot de "
-"passe. Plusieurs options <option>-K</option> peuvent être spécifiées, comme "
-"par exemple : <option>-K</option> <replaceable>UID_MIN</"
+"filename> (<option>UID_MIN</option>, <option>UID_MAX</option>, "
+"<option>UMASK</option>, <option>PASS_MAX_DAYS</option> et autres). "
+"<placeholder-1/> Par exemple : <option>-K</option> "
+"<replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</replaceable> peut "
+"être utilisé pour la création de comptes système pour désactiver la gestion "
+"de la durée de validité des mots de passe, même si les comptes système n'ont "
+"pas de mot de passe. Plusieurs options <option>-K</option> peuvent être "
+"spécifiées, comme par exemple : <option>-K</option> <replaceable>UID_MIN</"
 "replaceable>=<replaceable>100</replaceable> <option>-K</option> "
 "<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>"
 
@@ -1600,8 +1603,7 @@
 #: useradd.8.xml:371(para)
 msgid ""
 "This option is only valid in combination with the <option>-o</option> option."
-msgstr ""
-"Cette option n'est valable qu'avec l'option <option>-o</option>."
+msgstr "Cette option n'est valable qu'avec l'option <option>-o</option>."
 
 #: useradd.8.xml:383(para) groupadd.8.xml:150(para)
 msgid ""
@@ -1650,8 +1652,8 @@
 "Le nom de l'interpréteur de commandes initial de l'utilisateur (« login "
 "shell »). Le comportement par défaut est de laisser ce champ vide. Le "
 "système sélectionnera alors l'interpréteur par défaut indiqué par la "
-"variable <option>SHELL</option> dans "
-"<filename>/etc/default/useradd</filename>, ou une chaîne vide par défaut."
+"variable <option>SHELL</option> dans <filename>/etc/default/useradd</"
+"filename>, ou une chaîne vide par défaut."
 
 #: useradd.8.xml:447(para)
 msgid ""
@@ -1788,9 +1790,9 @@
 "command line)."
 msgstr ""
 "L'administrateur système doit se charger de placer les fichiers par défaut "
-"dans le répertoire <filename>/etc/skel</filename> (ou tout autre "
-"répertoire de modèles indiqué dans "
-"<filename>/etc/default/useradd</filename> ou sur la ligne de commande)."
+"dans le répertoire <filename>/etc/skel</filename> (ou tout autre répertoire "
+"de modèles indiqué dans <filename>/etc/default/useradd</filename> ou sur la "
+"ligne de commande)."
 
 #: useradd.8.xml:598(para)
 #, fuzzy
@@ -1820,8 +1822,9 @@
 msgstr ""
 "Les noms d'utilisateur doivent commencer par une lettre minuscule ou un "
 "tiret bas (« underscore »), et seuls des lettres minuscules, des chiffres, "
-"des « underscore », ou des tirets peuvent suivre. Ils peuvent se terminer par un signe dollar. Soit, sous la "
-"forme d'une expression rationnelle : [a-z_][a-z0-9_-]*[$]?"
+"des « underscore », ou des tirets peuvent suivre. Ils peuvent se terminer par "
+"un signe dollar. Soit, sous la forme d'une expression rationnelle : [a-z_][a-"
+"z0-9_-]*[$]?"
 
 #: useradd.8.xml:615(para)
 msgid "Usernames may only be up to 32 characters long."
@@ -1863,9 +1866,10 @@
 "<command>useradd</command>, <command>groupadd</command>, or "
 "<command>newusers</command>."
 msgstr ""
-"Plage d'identifiants numériques de groupes que les commandes <command>useradd</"
-"command>, <command>groupadd</command> ou <command>newusers</command> "
-"peuvent utiliser pour la création des groupes normaux."
+"Plage d'identifiants numériques de groupes que les commandes "
+"<command>useradd</command>, <command>groupadd</command> ou "
+"<command>newusers</command> peuvent utiliser pour la création des groupes "
+"normaux."
 
 #: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
 #: newusers.8.xml:32(term) login.defs.5.xml:32(term)
@@ -1934,9 +1938,10 @@
 "<command>useradd</command>, <command>groupadd</command>, or "
 "<command>newusers</command>."
 msgstr ""
-"Plage d'identifiants numériques de groupes que les commandes <command>useradd</"
-"command>, <command>groupadd</command> ou <command>newusers</command> peuvent utiliser pour la création "
-"de groupes système."
+"Plage d'identifiants numériques de groupes que les commandes "
+"<command>useradd</command>, <command>groupadd</command> ou "
+"<command>newusers</command> peuvent utiliser pour la création de groupes "
+"système."
 
 #: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
 msgid "<option>SYS_UID_MAX</option> (number)"
@@ -1951,8 +1956,9 @@
 "Range of user IDs used for the creation of system users by <command>useradd</"
 "command> or <command>newusers</command>."
 msgstr ""
-"Plage d'identifiants numériques d'utilisateurs que les commandes <command>useradd</"
-"command> ou <command>newusers</command> peuvent utiliser pour la création d'utilisateurs système."
+"Plage d'identifiants numériques d'utilisateurs que les commandes "
+"<command>useradd</command> ou <command>newusers</command> peuvent utiliser "
+"pour la création d'utilisateurs système."
 
 #: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
 msgid "<option>UID_MAX</option> (number)"
@@ -1967,8 +1973,9 @@
 "Range of user IDs used for the creation of regular users by "
 "<command>useradd</command> or <command>newusers</command>."
 msgstr ""
-"Plage d'identifiants numériques d'utilisateurs que les commandes <command>useradd</"
-"command> ou <command>newusers</command> peuvent utiliser pour la création d'utilisateurs normaux."
+"Plage d'identifiants numériques d'utilisateurs que les commandes "
+"<command>useradd</command> ou <command>newusers</command> peuvent utiliser "
+"pour la création d'utilisateurs normaux."
 
 #: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #: login.1.xml:32(term)
@@ -2023,19 +2030,19 @@
 msgstr "Répertoire contenant les fichiers par défaut."
 
 #: useradd.8.xml:715(replaceable) shadow.3.xml:35(manvolnum)
-#: pwck.8.xml:264(replaceable) passwd.1.xml:428(replaceable)
-#: grpck.8.xml:237(replaceable) groupmod.8.xml:199(replaceable)
+#: pwck.8.xml:274(replaceable) passwd.1.xml:427(replaceable)
+#: grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable)
 #: groupadd.8.xml:263(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:717(para) passwd.1.xml:448(para) groupmod.8.xml:201(para)
+#: useradd.8.xml:717(para) passwd.1.xml:447(para) groupmod.8.xml:201(para)
 #: groupadd.8.xml:265(para)
 msgid "invalid argument to option"
 msgstr "paramètre non valable pour l'option"
 
-#: useradd.8.xml:721(replaceable) pwck.8.xml:270(replaceable)
-#: passwd.1.xml:434(replaceable) grpck.8.xml:243(replaceable)
+#: useradd.8.xml:721(replaceable) pwck.8.xml:280(replaceable)
+#: passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable)
 #: groupmod.8.xml:205(replaceable) groupadd.8.xml:269(replaceable)
 msgid "4"
 msgstr "4"
@@ -2121,11 +2128,11 @@
 msgstr "suauth"
 
 #: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
-#: pwck.8.xml:276(replaceable) porttime.5.xml:35(manvolnum)
-#: passwd.5.xml:35(manvolnum) passwd.1.xml:440(replaceable)
+#: pwck.8.xml:286(replaceable) porttime.5.xml:35(manvolnum)
+#: passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable)
 #: login.defs.5.xml:98(manvolnum) login.access.5.xml:36(manvolnum)
 #: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
-#: grpck.8.xml:249(replaceable) faillog.5.xml:35(manvolnum)
+#: grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
 msgid "5"
 msgstr "5"
 
@@ -2440,8 +2447,8 @@
 "The current environment is passed to the new shell. The value of <envar>"
 "$PATH</envar> is reset to <filename>/bin:/usr/bin</filename> for normal "
 "users, or <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the "
-"superuser. This may be changed with the <emphasis>ENV_PATH</emphasis> and "
-"<emphasis>ENV_SUPATH</emphasis> definitions in <filename>/etc/login.defs</"
+"superuser. This may be changed with the <option>ENV_PATH</option> and "
+"<option>ENV_SUPATH</option> definitions in <filename>/etc/login.defs</"
 "filename>."
 msgstr ""
 "L'environnement actuel est fourni au nouvel interpréteur de commandes. La "
@@ -2509,11 +2516,11 @@
 msgid "The shell that will be invoked."
 msgstr "Interpréteur de commande devant être appelé."
 
-#: su.1.xml:167(para)
+#: su.1.xml:170(para)
 msgid "The shell specified with --shell."
 msgstr "Interpréteur de commande indiqué par --shell."
 
-#: su.1.xml:170(para)
+#: su.1.xml:173(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
@@ -2522,7 +2529,7 @@
 "commandes indiqué par la variable d'environnement <envar>$SHELL</envar> sera "
 "utilisé."
 
-#: su.1.xml:177(para)
+#: su.1.xml:180(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
@@ -2530,7 +2537,7 @@
 "Interpréteur de commandes indiqué dans <filename>/etc/passwd</filename> pour "
 "l'utilisateur cible."
 
-#: su.1.xml:183(para)
+#: su.1.xml:186(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
@@ -2546,7 +2553,7 @@
 "L'interpréteur de commandes est choisi parmi (celui de plus haute priorité "
 "en tête) : <placeholder-1/>"
 
-#: su.1.xml:190(para)
+#: su.1.xml:191(para)
 #, fuzzy
 msgid ""
 "If the target user has a restricted shell (i.e. the shell field of this "
@@ -2562,7 +2569,7 @@
 "$SHELL</envar> ne seront prises en compte à moins que <command>su</command> "
 "ne soit appelé par le superutilisateur."
 
-#: su.1.xml:201(term)
+#: su.1.xml:202(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2570,11 +2577,33 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:206(para)
-msgid "Preserve the current environment."
+#: su.1.xml:211(envar)
+msgid "$PATH"
+msgstr ""
+
+#: su.1.xml:213(para)
+msgid ""
+"reset according to the <filename>/etc/login.defs</filename> options "
+"<option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
+msgstr ""
+
+#: su.1.xml:222(envar)
+msgid "$IFS"
+msgstr ""
+
+#: su.1.xml:224(para)
+msgid ""
+"reset to <quote>&lt;space&gt;&lt;tab&gt;&lt;newline&gt;</quote>, if it was "
+"set."
+msgstr ""
+
+#: su.1.xml:207(para)
+#, fuzzy
+#| msgid "Preserve the current environment."
+msgid "Preserve the current environment, except for: <placeholder-1/>"
 msgstr "Préserver l'environnement actuel."
 
-#: su.1.xml:207(para)
+#: su.1.xml:233(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
@@ -2583,8 +2612,53 @@
 "option n'a aucun effet (à moins que <command>su</command> ne soit appelé par "
 "le superutilisateur)."
 
-#: su.1.xml:218(para)
+#: su.1.xml:242(para)
 msgid ""
+"The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, "
+"<envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> "
+"environment variables are reset."
+msgstr ""
+
+#: su.1.xml:251(para)
+msgid ""
+"If <option>--login</option> is not used, the environment is copied, except "
+"for the variables above."
+msgstr ""
+
+#: su.1.xml:258(para)
+msgid ""
+"If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>"
+"$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> "
+"environment variables are copied if they were set."
+msgstr ""
+
+#: su.1.xml:268(para)
+msgid ""
+"If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</"
+"envar>, and <envar>$MAIL</envar> environment variables are set according to "
+"the <filename>/etc/login.defs</filename> options <option>ENV_TZ</option>, "
+"<option>ENV_HZ</option>, <option>MAIL_DIR</option>, and <option>MAIL_FILE</"
+"option> (see below)."
+msgstr ""
+
+#: su.1.xml:281(para)
+msgid ""
+"If <option>--login</option> is used, other environment variables might be "
+"set by the <option>ENVIRON_FILE</option> file (see below)."
+msgstr ""
+
+#: su.1.xml:289(para)
+msgid "Other environment might be set by PAM modules."
+msgstr ""
+
+#: su.1.xml:237(para)
+msgid ""
+"Note that the default behavior for the environment is the following: "
+"<placeholder-1/>"
+msgstr ""
+
+#: su.1.xml:303(para)
+msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
 msgstr ""
@@ -2693,6 +2767,16 @@
 "Si ce fichier existe et est lisible, l'environnement de connexion sera lu à  "
 "partir de lui. Chaque ligne doit être sous la forme nom=valeur."
 
+#: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
+#, fuzzy
+#| msgid ""
+#| "The file is formatted like this, with lines starting with a # being "
+#| "treated as comment lines and ignored;"
+msgid "Lines starting with a # are treated as comment lines and ignored."
+msgstr ""
+"Le fichier est formaté de la façon suivante (les lignes commençant par un "
+"« # » sont des commentaires, et sont ignorées) :"
+
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 msgid "<option>ENV_PATH</option> (string)"
 msgstr "<option>ENV_PATH</option> (chaîne ce caractères)"
@@ -2856,14 +2940,22 @@
 "sulog file logging."
 msgstr ""
 
-#: su.1.xml:272(para)
+#: su.1.xml:363(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>sh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -2926,6 +3018,19 @@
 msgstr ""
 
 #: sg.1.xml:119(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>login</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry "
+#| "condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -2935,8 +3040,9 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>"
+"citerefentry><phrase condition=\"gshadow\">, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry></phrase>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -2951,7 +3057,7 @@
 
 #: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
 #: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
-#: pwck.8.xml:60(replaceable) pwck.8.xml:74(replaceable)
+#: pwck.8.xml:60(replaceable) pwck.8.xml:75(replaceable)
 #: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
 msgid "shadow"
 msgstr "shadow"
@@ -3179,8 +3285,24 @@
 msgid "This field is reserved for future use."
 msgstr "Ce champ est réservé pour une utilisation future."
 
-#: shadow.5.xml:249(para)
+#: shadow.5.xml:245(filename)
+#, fuzzy
+#| msgid "/etc/shadow"
+msgid "/etc/shadow-"
+msgstr "/etc/shadow"
+
+#: shadow.5.xml:247(para)
+msgid "Backup file for /etc/shadow."
+msgstr ""
+
+#: shadow.5.xml:248(para) passwd.5.xml:134(para)
 msgid ""
+"Note that this file is used by the tools of the shadow toolsuite, but not by "
+"all user and password management tools."
+msgstr ""
+
+#: shadow.5.xml:259(para)
+msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
@@ -3660,12 +3782,12 @@
 msgid "verify integrity of password files"
 msgstr "Vérifier l'intégrité des fichiers de mots de passe"
 
-#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:140(option)
+#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:171(option)
 msgid "-q"
 msgstr "-q"
 
-#: pwck.8.xml:53(arg) pwck.8.xml:161(option) grpck.8.xml:58(arg)
-#: grpck.8.xml:130(option)
+#: pwck.8.xml:53(arg) pwck.8.xml:192(option) grpck.8.xml:58(arg)
+#: grpck.8.xml:149(option)
 msgid "-s"
 msgstr "-s"
 
@@ -3676,20 +3798,19 @@
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:68(arg) pwck.8.xml:151(option) login.1.xml:222(option)
-#: grpck.8.xml:49(arg) grpck.8.xml:120(option)
+#: pwck.8.xml:68(arg) pwck.8.xml:182(option) login.1.xml:222(option)
+#: grpck.8.xml:49(arg) grpck.8.xml:139(option)
 msgid "-r"
 msgstr "-r"
 
-#: pwck.8.xml:82(para)
+#: pwck.8.xml:84(para)
 #, fuzzy
 msgid ""
-"The <command>pwck</command> command verifies the integrity of the system "
-"authentication information. All entries in the <filename>/etc/passwd</"
-"filename> and <filename>/etc/shadow</filename> are checked to see that the "
-"entry has the proper format and valid data in each field. The user is "
-"prompted to delete entries that are improperly formatted or which have other "
-"uncorrectable errors."
+"The <command>pwck</command> command verifies the integrity of the users and "
+"authentication information. It checks that all entries in <filename>/etc/"
+"passwd</filename> and <filename>/etc/shadow</filename> have the proper "
+"format and contain valid data. The user is prompted to delete entries that "
+"are improperly formatted or which have other uncorrectable errors."
 msgstr ""
 "<command>Pwck</command> vérifie l'intégrité des informations "
 "d'authentification du système. Toutes les entrées des fichiers <filename>/"
@@ -3699,36 +3820,74 @@
 "demandée pour détruire les entrées mal formatées ou ayant d'autres erreurs "
 "non récupérables."
 
-#: pwck.8.xml:91(para) grpck.8.xml:80(para)
+#: pwck.8.xml:93(para) grpck.8.xml:80(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr "Voici les vérifications effectuées :"
 
-#: pwck.8.xml:94(para) grpck.8.xml:84(para)
+#: pwck.8.xml:96(para) grpck.8.xml:84(para)
 msgid "the correct number of fields"
 msgstr "nombre correct de champs"
 
-#: pwck.8.xml:97(para)
-msgid "a unique user name"
+#: pwck.8.xml:99(para)
+#, fuzzy
+#| msgid "a unique user name"
+msgid "a unique and valid user name"
 msgstr "unicité des noms d'utilisateur"
 
-#: pwck.8.xml:100(para)
+#: pwck.8.xml:102(para)
 msgid "a valid user and group identifier"
 msgstr "validité des identifiants d'utilisateur et de groupe"
 
-#: pwck.8.xml:103(para)
+#: pwck.8.xml:105(para)
 msgid "a valid primary group"
 msgstr "validité du groupe primaire"
 
-#: pwck.8.xml:106(para)
+#: pwck.8.xml:108(para)
 msgid "a valid home directory"
 msgstr "validité du répertoire personnel"
 
-#: pwck.8.xml:109(para)
+#: pwck.8.xml:111(para)
 msgid "a valid login shell"
 msgstr "validité de l'interpréteur de commandes initial (« login shell »)"
 
-#: pwck.8.xml:113(para)
+#: pwck.8.xml:115(para)
 msgid ""
+"<filename>shadow</filename> checks are enabled when a second file parameter "
+"is specified or when <filename>/etc/shadow</filename> exists on the system."
+msgstr ""
+
+#: pwck.8.xml:120(para)
+msgid "These checks are the following:"
+msgstr ""
+
+#: pwck.8.xml:125(para)
+msgid ""
+"every passwd entry has a matching shadow entry, and every shadow entry has a "
+"matching passwd entry"
+msgstr ""
+
+#: pwck.8.xml:131(para)
+msgid "passwords are specified in the shadowed file"
+msgstr ""
+
+#: pwck.8.xml:134(para)
+#, fuzzy
+#| msgid "the correct number of fields"
+msgid "shadow entries have the correct number of fields"
+msgstr "nombre correct de champs"
+
+#: pwck.8.xml:137(para)
+msgid "shadow entries are unique in shadow"
+msgstr ""
+
+#: pwck.8.xml:140(para)
+#, fuzzy
+#| msgid "date of last password change"
+msgid "the last password changes are not in the future"
+msgstr "date du dernier changement de mot de passe"
+
+#: pwck.8.xml:144(para)
+msgid ""
 "The checks for correct number of fields and unique user name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
 "delete the entire line. If the user does not answer affirmatively, all "
@@ -3747,7 +3906,7 @@
 "l'utilisateur est encouragé à utiliser <command>usermod</command> pour les "
 "corriger."
 
-#: pwck.8.xml:124(para)
+#: pwck.8.xml:155(para)
 msgid ""
 "The commands which operate on the <filename>/etc/passwd</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>pwck</command> "
@@ -3757,12 +3916,12 @@
 "peuvent pas modifier les entrées corrompues ou redondantes. <command>Pwck</"
 "command> doit être utilisé dans ce cas pour retirer ces entrées."
 
-#: pwck.8.xml:134(para)
+#: pwck.8.xml:165(para)
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>pwck</command> sont :"
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:174(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
@@ -3770,11 +3929,11 @@
 "Ne signaler que les erreurs. Les avertissements qui ne nécessite pas une "
 "action de la part de l'utilisateur ne seront pas affichés."
 
-#: pwck.8.xml:154(para)
+#: pwck.8.xml:185(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr "Permet d'exécuter <command>pwck</command> dans le mode lecture seule."
 
-#: pwck.8.xml:164(para)
+#: pwck.8.xml:195(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
@@ -3782,7 +3941,7 @@
 "Trie les entrées de <filename>/etc/passwd</filename> et <filename>/etc/"
 "shadow</filename> par UID."
 
-#: pwck.8.xml:172(para)
+#: pwck.8.xml:203(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename>. The user may select "
@@ -3795,47 +3954,27 @@
 "\">fichier_passwd</emphasis> et <emphasis remap=\"I\">fichier_shadow</"
 "emphasis>."
 
-#: pwck.8.xml:221(para)
-msgid ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>grpck</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
-msgstr ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>grpck</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
-
-#: pwck.8.xml:260(para)
+#: pwck.8.xml:270(para)
 msgid "one or more bad password entries"
 msgstr "une entrée de mot de passe ou plus est incorrecte"
 
-#: pwck.8.xml:266(para)
+#: pwck.8.xml:276(para)
 msgid "can't open password files"
 msgstr "impossible d'ouvrir les fichiers de mots de passe"
 
-#: pwck.8.xml:272(para)
+#: pwck.8.xml:282(para)
 msgid "can't lock password files"
 msgstr "impossible de verrouiller les fichiers de mots de passe"
 
-#: pwck.8.xml:278(para)
+#: pwck.8.xml:288(para)
 msgid "can't update password files"
 msgstr "impossible de mettre à jour les fichiers des mots de passe"
 
-#: pwck.8.xml:284(para)
+#: pwck.8.xml:294(para)
 msgid "can't sort password files"
 msgstr "impossible de trier les fichiers de mots de passe"
 
-#: pwck.8.xml:242(para)
+#: pwck.8.xml:252(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -3843,6 +3982,26 @@
 "La commande <command>pwck</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
+#: pwck.8.xml:303(para)
+msgid ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>grpck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>grpck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
+
 #: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
 msgid "porttime"
 msgstr "porttime"
@@ -4079,7 +4238,17 @@
 msgid "optional encrypted password file"
 msgstr "un mot de passe chiffré optionnel"
 
-#: passwd.5.xml:135(para)
+#: passwd.5.xml:131(filename)
+#, fuzzy
+#| msgid "/etc/passwd"
+msgid "/etc/passwd-"
+msgstr "/etc/passwd"
+
+#: passwd.5.xml:133(para)
+msgid "Backup file for /etc/passwd."
+msgstr ""
+
+#: passwd.5.xml:145(para)
 msgid ""
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getent</"
@@ -4223,8 +4392,8 @@
 "chiffrement et sur la taille de l'espace de clés utilisé. La méthode de "
 "chiffrement des systèmes <emphasis>UNIX</emphasis> est basée sur "
 "l'algorithme NBS DES. Des méthodes plus récentes sont maintenant "
-"recommandées (voir <option>ENCRYPT_METHOD</option>). La taille de l'espace de clés "
-"dépend de l'aléa du mot de passe utilisé."
+"recommandées (voir <option>ENCRYPT_METHOD</option>). La taille de l'espace "
+"de clés dépend de l'aléa du mot de passe utilisé."
 
 #: passwd.1.xml:135(para)
 msgid ""
@@ -4357,9 +4526,13 @@
 msgid "Users with a locked password are not allowed to change their password."
 msgstr ""
 
-#: passwd.1.xml:247(term) chage.1.xml:138(term)
+#: passwd.1.xml:247(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+#| "replaceable>"
 msgid ""
-"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+"<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--mindays</option> <replaceable>JOURS_MIN</"
@@ -4404,12 +4577,13 @@
 "days."
 msgstr ""
 "Afficher l'état d'un compte. Cet état est constitué de 7 champs. Le premier "
-"champ est le nom du compte. Le second champ indique si le mot de passe est bloqué "
-"(L), n'a pas de mot de passe (NP) ou a un mot de passe utilisable (P). Le "
-"troisième champ donne la date de dernière modification du mot de passe. Les "
-"quatre champs suivants sont : la durée minimum avant modification, la durée "
-"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."
+"champ est le nom du compte. Le second champ indique si le mot de passe est "
+"bloqué (L), n'a pas de mot de passe (NP) ou a un mot de passe utilisable "
+"(P). Le troisième champ donne la date de dernière modification du mot de "
+"passe. Les quatre champs suivants sont : la durée minimum avant "
+"modification, la durée 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:297(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
@@ -4421,11 +4595,11 @@
 "by changing the password back to its previous value (to the value before "
 "using the <option>-l</option> option)."
 msgstr ""
-"Déverrouille le mot de passe du compte indiqué. Cette option réactive un mot de passe en remettant "
-"le mot de passe à sa valeur précédente (la valeur présente avant "
-"l'utilisation de l'option <option>-l</option>)."
+"Déverrouille le mot de passe du compte indiqué. Cette option réactive un mot "
+"de passe en remettant le mot de passe à sa valeur précédente (la valeur "
+"présente avant l'utilisation de l'option <option>-l</option>)."
 
-#: passwd.1.xml:311(term)
+#: passwd.1.xml:310(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -4433,7 +4607,7 @@
 "<option>-w</option>, <option>--warndays</option> "
 "<replaceable>DURÉE_AVERTISSEMENT</replaceable>"
 
-#: passwd.1.xml:315(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -4446,7 +4620,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:324(term)
+#: passwd.1.xml:323(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -4454,7 +4628,7 @@
 "<option>-x</option>, <option>--maxdays</option> <replaceable>JOURS_MAX</"
 "replaceable>"
 
-#: passwd.1.xml:328(para)
+#: passwd.1.xml:327(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -4463,7 +4637,7 @@
 "valable. Après <replaceable>JOURS_MAX</replaceable>, le mot de passe devra "
 "être modifié."
 
-#: passwd.1.xml:340(para)
+#: passwd.1.xml:339(para)
 msgid ""
 "Password complexity checking may vary from site to site. The user is urged "
 "to select a password as complex as he or she feels comfortable with."
@@ -4473,7 +4647,7 @@
 "passe aussi complexe que possible dans la limite de ce qu'il est capable de "
 "mémoriser. "
 
-#: passwd.1.xml:345(para)
+#: passwd.1.xml:344(para)
 msgid ""
 "Users may not be able to change their password on a system if NIS is enabled "
 "and they are not logged into the NIS server."
@@ -4481,7 +4655,7 @@
 "Il se peut que les utilisateurs ne puisse pas changer leur mot de passe sur "
 "un système si NIS est activé et qu'ils ne sont pas connectés au serveur NIS."
 
-#: passwd.1.xml:350(para)
+#: passwd.1.xml:349(para)
 msgid ""
 "<command>passwd</command> uses PAM to authenticate users and to change their "
 "passwords."
@@ -4672,37 +4846,37 @@
 "option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:396(filename)
+#: passwd.1.xml:395(filename)
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/pam.d/passwd"
 
-#: passwd.1.xml:398(para)
+#: passwd.1.xml:397(para)
 msgid "PAM configuration for <command>passwd</command>."
 msgstr ""
 
-#: passwd.1.xml:418(para) chage.1.xml:241(para)
+#: passwd.1.xml:417(para) chage.1.xml:241(para)
 msgid "permission denied"
 msgstr "permission refusée"
 
-#: passwd.1.xml:424(para)
+#: passwd.1.xml:423(para)
 msgid "invalid combination of options"
 msgstr "combinaison d'options non valable"
 
-#: passwd.1.xml:430(para)
+#: passwd.1.xml:429(para)
 msgid "unexpected failure, nothing done"
 msgstr "échec inattendu, rien n'a été fait"
 
-#: passwd.1.xml:436(para)
+#: passwd.1.xml:435(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr "échec inattendu, le fichier <filename>passwd</filename> est manquant"
 
-#: passwd.1.xml:442(para)
+#: passwd.1.xml:441(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:406(para)
+#: passwd.1.xml:405(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4710,14 +4884,24 @@
 "La commande <command>passwd</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: passwd.1.xml:457(para)
+#: passwd.1.xml:456(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry "
+#| "condition=\"no_pam\"><refentrytitle>login.defs</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry "
-"condition=\"no_pam\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -5073,7 +5257,7 @@
 
 #: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
 #: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
-#: groupadd.8.xml:58(replaceable) gpasswd.1.xml:63(replaceable)
+#: groupadd.8.xml:58(replaceable) gpasswd.1.xml:66(replaceable)
 msgid "group"
 msgstr "groupe"
 
@@ -5132,6 +5316,19 @@
 "utilisée."
 
 #: newgrp.1.xml:130(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>sg</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry "
+#| "condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -5141,8 +5338,9 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+"citerefentry><phrase condition=\"gshadow\">, <citerefentry condition="
+"\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry></phrase>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -5638,7 +5836,7 @@
 msgstr "CHSH_AUTH LOGIN_STRING"
 
 #: login.defs.5.xml:258(term) gpasswd.1.xml:42(refentrytitle)
-#: gpasswd.1.xml:47(refname) gpasswd.1.xml:58(command)
+#: gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
@@ -6188,7 +6386,7 @@
 msgid "Suppress printing of system messages."
 msgstr "Supprimer l'affichage des messages du système."
 
-#: login.1.xml:371(para)
+#: login.1.xml:377(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -6500,8 +6698,7 @@
 
 #: lastlog.8.xml:107(para)
 msgid "Print the lastlog record of the specified user(s)."
-msgstr ""
-"N'afficher que les entrées correspondant aux utilisateurs indiqués."
+msgstr "N'afficher que les entrées correspondant aux utilisateurs indiqués."
 
 #: lastlog.8.xml:110(para) faillog.8.xml:161(para)
 msgid ""
@@ -6590,7 +6787,9 @@
 
 #: gshadow.5.xml:54(para)
 msgid "Each line of this file contains the following colon-separated fields:"
-msgstr "Chaque ligne de ce fichier contient les champs suivants, séparés par des deux-points (« : ») :"
+msgstr ""
+"Chaque ligne de ce fichier contient les champs suivants, séparés par des "
+"deux-points (« : ») :"
 
 #: gshadow.5.xml:60(emphasis)
 msgid "group name"
@@ -6610,9 +6809,9 @@
 "Si le champ du mot de passe contient une chaîne qui ne peut pas être un "
 "résultat valable de <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>, par exemple si elle "
-"contient les caractères ! ou *, les utilisateurs ne pourront pas utiliser "
-"le mot de passe UNIX pour accéder au groupe (mais les membres du groupe "
-"n'ont pas besoin de mot de passe)."
+"contient les caractères ! ou *, les utilisateurs ne pourront pas utiliser le "
+"mot de passe UNIX pour accéder au groupe (mais les membres du groupe n'ont "
+"pas besoin de mot de passe)."
 
 #: gshadow.5.xml:82(para)
 #, fuzzy
@@ -6640,8 +6839,8 @@
 "This password supersedes any password specified in <filename>/etc/group</"
 "filename>."
 msgstr ""
-"Ce mot de passe remplace tout mot de passe indiqué dans "
-"<filename>/etc/group</filename>."
+"Ce mot de passe remplace tout mot de passe indiqué dans <filename>/etc/"
+"group</filename>."
 
 #: gshadow.5.xml:106(emphasis)
 msgid "administrators"
@@ -6706,12 +6905,12 @@
 #: grpck.8.xml:70(para)
 #, fuzzy
 msgid ""
-"The <command>grpck</command> command verifies the integrity of the system "
-"authentication information. All entries in <filename>/etc/group</"
+"The <command>grpck</command> command verifies the integrity of the groups "
+"information. It checks that all entries in <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\">and <filename>/etc/gshadow</"
-"filename></phrase> are checked to see that the entry has the proper format "
-"and valid data in each field. The user is prompted to delete entries that "
-"are improperly formatted or which have other uncorrectable errors."
+"filename></phrase> have the proper format and contain valid data. The user "
+"is prompted to delete entries that are improperly formatted or which have "
+"other uncorrectable errors."
 msgstr ""
 "<command>Grpck</command> vérifie l'intégrité des informations "
 "d'authentification du système. Toutes les entrées des fichiers <filename>/"
@@ -6722,22 +6921,66 @@
 "non récupérables."
 
 #: grpck.8.xml:87(para)
-msgid "a unique group name"
+#, fuzzy
+#| msgid "a unique group name"
+msgid "a unique and valid group name"
 msgstr "unicité des noms de groupe"
 
 #: grpck.8.xml:90(para)
-msgid "a valid list of members and administrators"
+#, fuzzy
+#| msgid ""
+#| "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
+#| "\">and <filename>/etc/gshadow</filename></phrase> by GID."
+msgid ""
+"a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/"
+"group</filename> only)</phrase>"
+msgstr ""
+"Trie les entrées de <filename>/etc/group</filename><phrase condition="
+"\"gshadow\"> et <filename>/etc/gshadow</filename></phrase> par GID."
+
+#: grpck.8.xml:97(para)
+#, fuzzy
+#| msgid "a valid list of members and administrators"
+msgid ""
+"a valid list of members <phrase condition=\"gshadow\"> and administrators</"
+"phrase>"
 msgstr "validité des membres et administrateurs"
 
-#: grpck.8.xml:94(para)
+#: grpck.8.xml:103(para)
+#, fuzzy
+#| msgid ""
+#| "These four programs all operate on the normal and shadow password and "
+#| "group files: <filename>/etc/passwd</filename>, <filename>/etc/group</"
+#| "filename>, <filename>/etc/shadow</filename>, and <filename>/etc/gshadow</"
+#| "filename>."
 msgid ""
+"a corresponding entry in the <filename>/etc/gshadow</filename> file "
+"(respectively <filename>/etc/group</filename> for the <filename>gshadow</"
+"filename> checks)"
+msgstr ""
+"Ces quatre programmes opèrent sur les fichiers de mots de passe et "
+"d'informations sur les groupes cachés ou non : <filename>/etc/passwd</"
+"filename>, <filename>/etc/group</filename>, <filename>/etc/shadow</"
+"filename>, et <filename>/etc/gshadow</filename>."
+
+#: grpck.8.xml:111(para)
+#, fuzzy
+#| msgid ""
+#| "The checks for correct number of fields and unique group name are fatal. "
+#| "If the entry has the wrong number of fields, the user will be prompted to "
+#| "delete the entire line. If the user does not answer affirmatively, all "
+#| "further checks are bypassed. An entry with a duplicated group name is "
+#| "prompted for deletion, but the remaining checks will still be made. All "
+#| "other errors are warnings and the user is encouraged to run the "
+#| "<command>groupmod</command> command to correct the error."
+msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
-"the entry has the wrong number of fields, the user will be prompted to "
-"delete the entire line. If the user does not answer affirmatively, all "
-"further checks are bypassed. An entry with a duplicated group name is "
-"prompted for deletion, but the remaining checks will still be made. All "
-"other errors are warnings and the user is encouraged to run the "
-"<command>groupmod</command> command to correct the error."
+"an entry has the wrong number of fields, the user will be prompted to delete "
+"the entire line. If the user does not answer affirmatively, all further "
+"checks are bypassed. An entry with a duplicated group name is prompted for "
+"deletion, but the remaining checks will still be made. All other errors are "
+"warnings and the user is encouraged to run the <command>groupmod</command> "
+"command to correct the error."
 msgstr ""
 "Une erreur dans le nombre de champs ou la non unicité d'un nom de groupe "
 "sera fatale. Si le nombre de champs n'est pas correct, il sera demandé à "
@@ -6748,29 +6991,37 @@
 "Toutes les autres erreurs ne sont que des avertissements et l'utilisateur "
 "est encouragé à utiliser <command>groupmod</command> pour les corriger."
 
-#: grpck.8.xml:105(para)
+#: grpck.8.xml:122(para)
+#, fuzzy
+#| msgid ""
+#| "The commands which operate on the <filename>/etc/group</filename> file "
+#| "are not able to alter corrupted or duplicated entries. <command>grpck</"
+#| "command> should be used in those circumstances to remove the offending "
+#| "entry."
 msgid ""
-"The commands which operate on the <filename>/etc/group</filename> file are "
-"not able to alter corrupted or duplicated entries. <command>grpck</command> "
-"should be used in those circumstances to remove the offending entry."
+"The commands which operate on the <filename>/etc/group</filename><phrase "
+"condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
+"<filename>/etc/gshadow</filename> files</phrase> are not able to alter "
+"corrupted or duplicated entries. <command>grpck</command> should be used in "
+"those circumstances to remove the offending entries."
 msgstr ""
 "Les commandes qui opèrent sur le fichier <filename>/etc/group</filename> ne "
 "peuvent pas modifier les entrées corrompues ou redondantes. <command>Grpck</"
 "command> doit être utilisé dans ce cas pour supprimer ces entrées."
 
-#: grpck.8.xml:115(para)
+#: grpck.8.xml:134(para)
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>grpck</command> sont :"
 
-#: grpck.8.xml:122(para)
+#: grpck.8.xml:141(para)
 msgid ""
 "Execute the <command>grpck</command> command in read-only mode. This causes "
 "all questions regarding changes to be answered <emphasis>no</emphasis> "
 "without user intervention."
 msgstr ""
 
-#: grpck.8.xml:132(para)
+#: grpck.8.xml:151(para)
 msgid ""
 "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
 "\">and <filename>/etc/gshadow</filename></phrase> by GID."
@@ -6778,7 +7029,7 @@
 "Trie les entrées de <filename>/etc/group</filename><phrase condition="
 "\"gshadow\"> et <filename>/etc/gshadow</filename></phrase> par GID."
 
-#: grpck.8.xml:141(para)
+#: grpck.8.xml:160(para)
 #, fuzzy
 #| msgid ""
 #| "By default, <command>pwck</command> operates on the files <filename>/etc/"
@@ -6799,45 +7050,23 @@
 "\">fichier_passwd</emphasis> et <emphasis remap=\"I\">fichier_shadow</"
 "emphasis>."
 
-#: grpck.8.xml:191(para)
-msgid ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>groupmod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
-"condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-"manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-msgstr ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>groupmod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
-"condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-"manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-
-#: grpck.8.xml:233(para)
+#: grpck.8.xml:228(para)
 msgid "one or more bad group entries"
 msgstr "une entrée de groupe ou plus est incorrecte"
 
-#: grpck.8.xml:239(para)
+#: grpck.8.xml:234(para)
 msgid "can't open group files"
 msgstr "impossible d'ouvrir les fichiers group"
 
-#: grpck.8.xml:245(para)
+#: grpck.8.xml:240(para)
 msgid "can't lock group files"
 msgstr "impossible de verrouiller les fichiers group"
 
-#: grpck.8.xml:251(para)
+#: grpck.8.xml:246(para)
 msgid "can't update group files"
 msgstr "impossible de mettre à jour les fichiers group"
 
-#: grpck.8.xml:215(para)
+#: grpck.8.xml:210(para)
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6845,6 +7074,40 @@
 "La commande <command>grpck</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
+#: grpck.8.xml:255(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
+#| "condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition="
+"\"gshadow\"><citerefentry><refentrytitle>gshadow</"
+"refentrytitle><manvolnum>5</manvolnum>, </citerefentry>, </"
+"phrase><citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>pwck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
+"condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+
 #: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
 #: groups.1.xml:45(command)
 msgid "groups"
@@ -7407,8 +7670,9 @@
 msgstr ""
 "Les noms de groupe doivent commencer par une lettre minuscule ou un tiret "
 "bas (« underscore »), et seuls des lettres minuscules, des chiffres, des "
-"« underscore », ou des tirets peuvent suivre. Ils peuvent se terminer par un signe dollar. Soit, sous la forme "
-"d'une expression rationnelle : [a-z_][a-z0-9_-]*[$]?"
+"« underscore », ou des tirets peuvent suivre. Ils peuvent se terminer par un "
+"signe dollar. Soit, sous la forme d'une expression rationnelle : [a-z_][a-z0-"
+"9_-]*[$]?"
 
 #: groupadd.8.xml:231(para)
 msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
@@ -7482,24 +7746,24 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:50(phrase)
-msgid "and <placeholder-1/> files"
-msgstr ""
+#: gpasswd.1.xml:49(phrase)
+#, fuzzy
+#| msgid "administer the <placeholder-1/> file"
+msgid "administer <placeholder-1/>"
+msgstr "Administrer le fichier <placeholder-1/>"
 
 #: gpasswd.1.xml:52(phrase)
-msgid "file"
-msgstr ""
+#, fuzzy
+#| msgid "-K <placeholder-1/>=<placeholder-2/>"
+msgid "administer <placeholder-1/> and <placeholder-2/>"
+msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:48(refpurpose)
-msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
-msgstr ""
-
-#: gpasswd.1.xml:60(replaceable)
+#: gpasswd.1.xml:63(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "options"
 
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:73(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -7507,12 +7771,12 @@
 "\">administrators,</phrase> members and a password."
 msgstr ""
 
-#: gpasswd.1.xml:78(para)
+#: gpasswd.1.xml:81(para)
 #, fuzzy
 msgid ""
 "System administrators 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."
+"administrator(s) and the <option>-M</option> option to define members. They "
+"have 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/"
@@ -7523,7 +7787,7 @@
 "l'option <option>-M</option> pour en définir les membres. Il possède "
 "également tous les droits des administrateurs et des membres du groupe."
 
-#: gpasswd.1.xml:83(para)
+#: gpasswd.1.xml:86(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -7531,7 +7795,7 @@
 "of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:90(para)
+#: gpasswd.1.xml:93(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still use "
@@ -7545,11 +7809,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:98(title)
+#: gpasswd.1.xml:101(title)
 msgid "Notes about group passwords"
 msgstr "Notes sur les mots de passe de groupe"
 
-#: gpasswd.1.xml:99(para)
+#: gpasswd.1.xml:102(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 "
@@ -7560,7 +7824,7 @@
 "Cependant, les groupes sont utiles pour permettre la coopération entre "
 "différents utilisateurs."
 
-#: gpasswd.1.xml:110(para)
+#: gpasswd.1.xml:113(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
@@ -7569,24 +7833,24 @@
 "Les options <option>-r</option>, <option>-h</option> et <option>-f</option> "
 "ne peuvent être utilisées que par root."
 
-#: gpasswd.1.xml:114(para)
+#: gpasswd.1.xml:117(para)
 msgid "The options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:117(para)
+#: gpasswd.1.xml:120(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:122(term)
+#: gpasswd.1.xml:125(term)
 msgid ""
 "<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
 msgstr ""
 "<option>-a</option>, <option>--add</option><replaceable>utilisateur</"
 "replaceable>"
 
-#: gpasswd.1.xml:126(para)
+#: gpasswd.1.xml:129(para)
 #, fuzzy
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
@@ -7595,14 +7859,14 @@
 "Le nom du groupe sera modifié de <emphasis remap=\"I\">GROUPE</emphasis> "
 "vers <emphasis remap=\"I\">NOUVEAU_NOM_GROUPE</emphasis>."
 
-#: gpasswd.1.xml:135(term)
+#: gpasswd.1.xml:138(term)
 msgid ""
 "<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
 msgstr ""
 "<option>-d</option>, <option>--delete</option><replaceable>utilisateur</"
 "replaceable>"
 
-#: gpasswd.1.xml:139(para)
+#: gpasswd.1.xml:142(para)
 #, fuzzy
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
@@ -7611,29 +7875,29 @@
 "Le nom du groupe sera modifié de <emphasis remap=\"I\">GROUPE</emphasis> "
 "vers <emphasis remap=\"I\">NOUVEAU_NOM_GROUPE</emphasis>."
 
-#: gpasswd.1.xml:148(term)
+#: gpasswd.1.xml:151(term)
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr "<option>-r</option>, <option>--remove-password</option>"
 
-#: gpasswd.1.xml:152(para)
+#: gpasswd.1.xml:155(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:163(term)
+#: gpasswd.1.xml:166(term)
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-R</option>, <option>--restrict</option>"
 
-#: gpasswd.1.xml:167(para)
+#: gpasswd.1.xml:170(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:178(term)
+#: gpasswd.1.xml:181(term)
 msgid ""
 "<option>-A</option>, <option>--administrators</option><replaceable>user</"
 "replaceable>,..."
@@ -7641,12 +7905,12 @@
 "<option>-A</option>, <option>--administrators</"
 "option><replaceable>utilisateur</replaceable>,..."
 
-#: gpasswd.1.xml:182(para)
+#: gpasswd.1.xml:185(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr "liste d'administrateurs du groupe séparés par des virgules"
 
-#: gpasswd.1.xml:190(term)
+#: gpasswd.1.xml:193(term)
 msgid ""
 "<option>-M</option>, <option>--members</option><replaceable>user</"
 "replaceable>,..."
@@ -7654,12 +7918,12 @@
 "<option>-M</option>, <option>--members</option><replaceable>utilisateur</"
 "replaceable>,..."
 
-#: gpasswd.1.xml:194(para)
+#: gpasswd.1.xml:197(para)
 #, fuzzy
 msgid "Set the list of group members."
 msgstr "liste des membres du groupe séparés par des virgules"
 
-#: gpasswd.1.xml:204(para)
+#: gpasswd.1.xml:207(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -7668,7 +7932,7 @@
 "server."
 msgstr ""
 
-#: gpasswd.1.xml:249(para)
+#: gpasswd.1.xml:252(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>groupadd</"
@@ -8166,13 +8430,23 @@
 msgstr ""
 
 #: chpasswd.8.xml:239(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
+#| "condition=\"no_pam\"><refentrytitle>login.defs</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
-"condition=\"no_pam\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition="
+"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+"phrase><citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
@@ -8447,6 +8721,14 @@
 msgid "Show account aging information."
 msgstr "Afficher les informations sur l'âge des comptes."
 
+#: chage.1.xml:138(term)
+msgid ""
+"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+"replaceable>"
+msgstr ""
+"<option>-m</option>, <option>--mindays</option> <replaceable>JOURS_MIN</"
+"replaceable>"
+
 #: chage.1.xml:150(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
@@ -8881,9 +9163,6 @@
 #~ msgid "VALUE"
 #~ msgstr "VALEUR"
 
-#~ msgid "-K <placeholder-1/>=<placeholder-2/>"
-#~ msgstr "-K <placeholder-1/>=<placeholder-2/>"
-
 #, fuzzy
 #~ msgid "-R"
 #~ msgstr "-"
@@ -9066,9 +9345,6 @@
 #~ msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 #~ msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 
-#~ msgid "administer the <placeholder-1/> file"
-#~ msgstr "Administrer le fichier <placeholder-1/>"
-
 #~ msgid ""
 #~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
 #~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"

Modified: upstream/trunk/man/po/it.po
===================================================================
--- upstream/trunk/man/po/it.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/man/po/it.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.3\n"
-"POT-Creation-Date: 2009-05-22 13:15+0200\n"
+"POT-Creation-Date: 2009-07-24 03:03+0200\n"
 "PO-Revision-Date: 2007-05-27 16:42+0200\n"
 "Last-Translator: Giuseppe Sacco <eppesuig at debian.org>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -78,14 +78,14 @@
 #: vipw.8.xml:66(title) usermod.8.xml:59(title) userdel.8.xml:60(title)
 #: useradd.8.xml:79(title) suauth.5.xml:50(title) su.1.xml:77(title)
 #: sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title)
-#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:81(title)
+#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:83(title)
 #: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
 #: nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title)
 #: logoutd.8.xml:50(title) login.defs.5.xml:107(title)
 #: login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title)
 #: lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title)
 #: groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title)
-#: groupdel.8.xml:57(title) groupadd.8.xml:64(title) gpasswd.1.xml:69(title)
+#: groupdel.8.xml:57(title) groupadd.8.xml:64(title) gpasswd.1.xml:72(title)
 #: faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title)
 #: chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title)
 #: chfn.1.xml:63(title) chage.1.xml:55(title)
@@ -121,10 +121,10 @@
 
 # type: SH
 #: vipw.8.xml:84(title) usermod.8.xml:67(title) userdel.8.xml:69(title)
-#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:133(title)
+#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:164(title)
 #: passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title)
-#: lastlog.8.xml:66(title) grpck.8.xml:114(title) groupmod.8.xml:67(title)
-#: groupmems.8.xml:75(title) groupadd.8.xml:73(title) gpasswd.1.xml:109(title)
+#: lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title)
+#: groupmems.8.xml:75(title) groupadd.8.xml:73(title) gpasswd.1.xml:112(title)
 #: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:109(title)
 #: chgpasswd.8.xml:88(title) chage.1.xml:65(title)
 msgid "OPTIONS"
@@ -194,15 +194,15 @@
 
 # type: SH
 #: vipw.8.xml:124(title) usermod.8.xml:372(title) userdel.8.xml:140(title)
-#: useradd.8.xml:644(title) suauth.5.xml:168(title) su.1.xml:253(title)
+#: useradd.8.xml:644(title) suauth.5.xml:168(title) su.1.xml:338(title)
 #: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
-#: pwconv.8.xml:168(title) pwck.8.xml:196(title) porttime.5.xml:105(title)
-#: passwd.5.xml:116(title) passwd.1.xml:375(title) newusers.8.xml:357(title)
+#: pwconv.8.xml:168(title) pwck.8.xml:227(title) porttime.5.xml:105(title)
+#: passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(title)
 #: newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title)
 #: login.1.xml:316(title) limits.5.xml:140(title) lastlog.8.xml:147(title)
-#: gshadow.5.xml:141(title) grpck.8.xml:166(title) groups.1.xml:75(title)
+#: gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title)
 #: groupmod.8.xml:164(title) groupmems.8.xml:168(title)
-#: groupdel.8.xml:89(title) groupadd.8.xml:200(title) gpasswd.1.xml:230(title)
+#: groupdel.8.xml:89(title) groupadd.8.xml:200(title) gpasswd.1.xml:233(title)
 #: faillog.8.xml:202(title) faillog.5.xml:71(title) expiry.1.xml:68(title)
 #: chsh.1.xml:133(title) chpasswd.8.xml:208(title) chgpasswd.8.xml:184(title)
 #: chfn.1.xml:113(title) chage.1.xml:206(title)
@@ -211,33 +211,34 @@
 
 #: vipw.8.xml:127(filename) usermod.8.xml:375(filename)
 #: userdel.8.xml:143(filename) useradd.8.xml:659(filename)
-#: sg.1.xml:103(filename) pwck.8.xml:199(filename)
+#: sg.1.xml:103(filename) pwck.8.xml:230(filename)
 #: newusers.8.xml:372(filename) newgrp.1.xml:114(filename)
-#: gshadow.5.xml:144(filename) grpck.8.xml:169(filename)
+#: gshadow.5.xml:144(filename) grpck.8.xml:188(filename)
 #: groups.1.xml:78(filename) groupmod.8.xml:167(filename)
 #: groupmems.8.xml:171(filename) groupdel.8.xml:92(filename)
-#: groupadd.8.xml:203(filename) gpasswd.1.xml:49(filename)
-#: gpasswd.1.xml:233(filename) chgpasswd.8.xml:187(filename)
+#: groupadd.8.xml:203(filename) gpasswd.1.xml:50(filename)
+#: gpasswd.1.xml:53(filename) gpasswd.1.xml:236(filename)
+#: chgpasswd.8.xml:187(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
 # type: Plain text
 #: vipw.8.xml:129(para) usermod.8.xml:377(para) userdel.8.xml:145(para)
-#: useradd.8.xml:661(para) sg.1.xml:105(para) pwck.8.xml:201(para)
+#: useradd.8.xml:661(para) sg.1.xml:105(para) pwck.8.xml:232(para)
 #: newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para)
-#: grpck.8.xml:171(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
+#: grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
 #: groupmems.8.xml:173(para) groupdel.8.xml:94(para) groupadd.8.xml:205(para)
-#: gpasswd.1.xml:235(para) chgpasswd.8.xml:189(para)
+#: gpasswd.1.xml:238(para) chgpasswd.8.xml:189(para)
 msgid "Group account information."
 msgstr "Informazioni sugli account di gruppo."
 
 #: vipw.8.xml:133(filename) usermod.8.xml:381(filename)
 #: useradd.8.xml:665(filename) sg.1.xml:109(filename)
 #: newusers.8.xml:378(filename) newgrp.1.xml:120(filename)
-#: gshadow.5.xml:150(filename) grpck.8.xml:175(filename)
+#: gshadow.5.xml:150(filename) grpck.8.xml:194(filename)
 #: groupmod.8.xml:173(filename) groupmems.8.xml:177(filename)
 #: groupdel.8.xml:98(filename) groupadd.8.xml:209(filename)
-#: gpasswd.1.xml:50(filename) gpasswd.1.xml:239(filename)
+#: gpasswd.1.xml:54(filename) gpasswd.1.xml:242(filename)
 #: chgpasswd.8.xml:193(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
@@ -245,19 +246,19 @@
 # type: Plain text
 #: vipw.8.xml:135(para) usermod.8.xml:383(para) useradd.8.xml:667(para)
 #: sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para)
-#: gshadow.5.xml:152(para) grpck.8.xml:177(para) groupmod.8.xml:175(para)
-#: groupdel.8.xml:100(para) groupadd.8.xml:211(para) gpasswd.1.xml:241(para)
+#: gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para)
+#: groupdel.8.xml:100(para) groupadd.8.xml:211(para) gpasswd.1.xml:244(para)
 #: chgpasswd.8.xml:195(para)
 msgid "Secure group account information."
 msgstr "Informazioni sicure sugli account di gruppo."
 
 #: vipw.8.xml:139(filename) usermod.8.xml:387(filename)
 #: userdel.8.xml:155(filename) useradd.8.xml:647(filename)
-#: su.1.xml:256(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
-#: pwck.8.xml:205(filename) passwd.5.xml:119(filename)
-#: passwd.1.xml:378(filename) newusers.8.xml:360(filename)
+#: su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
+#: pwck.8.xml:236(filename) passwd.5.xml:119(filename)
+#: passwd.1.xml:377(filename) newusers.8.xml:360(filename)
 #: newgrp.1.xml:102(filename) login.1.xml:331(filename)
-#: grpck.8.xml:181(filename) expiry.1.xml:71(filename)
+#: grpck.8.xml:200(filename) expiry.1.xml:71(filename)
 #: chsh.1.xml:136(filename) chpasswd.8.xml:211(filename)
 #: chfn.1.xml:122(filename) chage.1.xml:210(filename)
 msgid "/etc/passwd"
@@ -265,10 +266,10 @@
 
 # type: Plain text
 #: vipw.8.xml:141(para) usermod.8.xml:389(para) userdel.8.xml:157(para)
-#: useradd.8.xml:649(para) su.1.xml:258(para) sg.1.xml:93(para)
-#: shadow.5.xml:235(para) pwck.8.xml:207(para) passwd.5.xml:121(para)
-#: passwd.1.xml:380(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
-#: login.1.xml:333(para) grpck.8.xml:183(para) expiry.1.xml:73(para)
+#: useradd.8.xml:649(para) su.1.xml:343(para) sg.1.xml:93(para)
+#: shadow.5.xml:235(para) pwck.8.xml:238(para) passwd.5.xml:121(para)
+#: passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
+#: login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para)
 #: chsh.1.xml:138(para) chpasswd.8.xml:213(para) chfn.1.xml:124(para)
 #: chage.1.xml:213(para)
 msgid "User account information."
@@ -276,9 +277,9 @@
 
 #: vipw.8.xml:145(filename) usermod.8.xml:393(filename)
 #: userdel.8.xml:161(filename) useradd.8.xml:653(filename)
-#: su.1.xml:262(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
-#: shadow.3.xml:204(filename) pwck.8.xml:211(filename)
-#: passwd.5.xml:125(filename) passwd.1.xml:384(filename)
+#: su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
+#: shadow.3.xml:204(filename) pwck.8.xml:242(filename)
+#: passwd.5.xml:125(filename) passwd.1.xml:383(filename)
 #: newusers.8.xml:366(filename) newgrp.1.xml:108(filename)
 #: login.1.xml:337(filename) expiry.1.xml:77(filename)
 #: chpasswd.8.xml:217(filename) chage.1.xml:218(filename)
@@ -287,9 +288,9 @@
 
 # type: Plain text
 #: vipw.8.xml:147(para) usermod.8.xml:395(para) userdel.8.xml:163(para)
-#: useradd.8.xml:655(para) su.1.xml:264(para) sg.1.xml:99(para)
-#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:213(para)
-#: passwd.1.xml:386(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
+#: useradd.8.xml:655(para) su.1.xml:349(para) sg.1.xml:99(para)
+#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:244(para)
+#: passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
 #: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:219(para)
 #: chage.1.xml:221(para)
 msgid "Secure user account information."
@@ -297,16 +298,16 @@
 
 # type: SH
 #: vipw.8.xml:154(title) usermod.8.xml:402(title) userdel.8.xml:248(title)
-#: useradd.8.xml:761(title) suauth.5.xml:197(title) su.1.xml:271(title)
-#: sg.1.xml:118(title) shadow.5.xml:248(title) shadow.3.xml:213(title)
-#: pwconv.8.xml:180(title) pwck.8.xml:220(title) porttime.5.xml:117(title)
-#: passwd.5.xml:134(title) passwd.1.xml:456(title) nologin.8.xml:64(title)
+#: useradd.8.xml:761(title) suauth.5.xml:197(title) su.1.xml:362(title)
+#: sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title)
+#: pwconv.8.xml:180(title) pwck.8.xml:302(title) porttime.5.xml:117(title)
+#: passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title)
 #: newusers.8.xml:399(title) newgrp.1.xml:129(title)
 #: login.defs.5.xml:471(title) login.access.5.xml:108(title)
-#: login.1.xml:370(title) limits.5.xml:150(title) gshadow.5.xml:159(title)
-#: grpck.8.xml:190(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
+#: login.1.xml:376(title) limits.5.xml:150(title) gshadow.5.xml:159(title)
+#: grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
 #: groupmems.8.xml:186(title) groupdel.8.xml:146(title)
-#: groupadd.8.xml:291(title) gpasswd.1.xml:248(title) faillog.8.xml:214(title)
+#: groupadd.8.xml:291(title) gpasswd.1.xml:251(title) faillog.8.xml:214(title)
 #: faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
 #: chpasswd.8.xml:238(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title)
 #: chage.1.xml:261(title)
@@ -775,9 +776,9 @@
 
 # type: SH
 #: usermod.8.xml:340(title) userdel.8.xml:221(title) useradd.8.xml:597(title)
-#: su.1.xml:217(title) shadow.3.xml:193(title) passwd.1.xml:339(title)
+#: su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
 #: newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title)
-#: groupdel.8.xml:65(title) groupadd.8.xml:224(title) gpasswd.1.xml:203(title)
+#: groupdel.8.xml:65(title) groupadd.8.xml:224(title) gpasswd.1.xml:206(title)
 #: faillog.8.xml:191(title) chpasswd.8.xml:182(title)
 #: chgpasswd.8.xml:157(title)
 msgid "CAVEATS"
@@ -803,22 +804,22 @@
 msgstr ""
 
 #: usermod.8.xml:359(title) userdel.8.xml:125(title) useradd.8.xml:621(title)
-#: su.1.xml:225(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
-#: pwck.8.xml:182(title) passwd.1.xml:357(title) newusers.8.xml:324(title)
-#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:154(title)
+#: su.1.xml:310(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
+#: pwck.8.xml:213(title) passwd.1.xml:356(title) newusers.8.xml:324(title)
+#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:173(title)
 #: groupmod.8.xml:152(title) groupmems.8.xml:156(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:186(title) gpasswd.1.xml:215(title)
+#: groupdel.8.xml:77(title) groupadd.8.xml:186(title) gpasswd.1.xml:218(title)
 #: chsh.1.xml:120(title) chpasswd.8.xml:194(title) chgpasswd.8.xml:169(title)
 #: chfn.1.xml:99(title)
 msgid "CONFIGURATION"
 msgstr ""
 
 #: usermod.8.xml:360(para) userdel.8.xml:126(para) useradd.8.xml:622(para)
-#: su.1.xml:226(para) sg.1.xml:77(para) pwck.8.xml:183(para)
-#: passwd.1.xml:358(para) newusers.8.xml:325(para) newgrp.1.xml:88(para)
-#: login.1.xml:273(para) grpck.8.xml:155(para) groupmod.8.xml:153(para)
+#: su.1.xml:311(para) sg.1.xml:77(para) pwck.8.xml:214(para)
+#: passwd.1.xml:357(para) newusers.8.xml:325(para) newgrp.1.xml:88(para)
+#: login.1.xml:273(para) grpck.8.xml:174(para) groupmod.8.xml:153(para)
 #: groupmems.8.xml:157(para) groupdel.8.xml:78(para) groupadd.8.xml:187(para)
-#: gpasswd.1.xml:216(para) chsh.1.xml:121(para) chpasswd.8.xml:195(para)
+#: gpasswd.1.xml:219(para) chsh.1.xml:121(para) chpasswd.8.xml:195(para)
 #: chgpasswd.8.xml:170(para) chfn.1.xml:100(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
@@ -1117,50 +1118,52 @@
 msgstr ""
 
 #: userdel.8.xml:149(filename) useradd.8.xml:683(filename)
-#: pwconv.8.xml:171(filename) passwd.1.xml:390(filename)
-#: newusers.8.xml:384(filename) login.access.5.xml:99(filename)
+#: su.1.xml:353(filename) pwconv.8.xml:171(filename)
+#: passwd.1.xml:389(filename) newusers.8.xml:384(filename)
+#: login.access.5.xml:99(filename) login.1.xml:367(filename)
 #: groupadd.8.xml:215(filename) chsh.1.xml:148(filename)
 #: chpasswd.8.xml:223(filename) chgpasswd.8.xml:199(filename)
 #: chfn.1.xml:116(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:151(para) useradd.8.xml:685(para) pwconv.8.xml:173(para)
-#: passwd.1.xml:392(para) newusers.8.xml:386(para)
-#: login.access.5.xml:101(para) groupadd.8.xml:217(para) chsh.1.xml:150(para)
-#: chpasswd.8.xml:225(para) chgpasswd.8.xml:201(para) chfn.1.xml:118(para)
+#: userdel.8.xml:151(para) useradd.8.xml:685(para) su.1.xml:355(para)
+#: pwconv.8.xml:173(para) passwd.1.xml:391(para) newusers.8.xml:386(para)
+#: login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:217(para)
+#: chsh.1.xml:150(para) chpasswd.8.xml:225(para) chgpasswd.8.xml:201(para)
+#: chfn.1.xml:118(para)
 msgid "Shadow password suite configuration."
 msgstr ""
 
 # type: SH
-#: userdel.8.xml:170(title) useradd.8.xml:692(title) pwck.8.xml:241(title)
-#: passwd.1.xml:405(title) grpck.8.xml:214(title) groupmod.8.xml:182(title)
+#: userdel.8.xml:170(title) useradd.8.xml:692(title) pwck.8.xml:251(title)
+#: passwd.1.xml:404(title) grpck.8.xml:209(title) groupmod.8.xml:182(title)
 #: groupdel.8.xml:107(title) groupadd.8.xml:246(title) chage.1.xml:228(title)
 msgid "EXIT VALUES"
 msgstr "VALORI RESTITUITI"
 
 # type: IP
 #: userdel.8.xml:175(replaceable) useradd.8.xml:697(replaceable)
-#: pwck.8.xml:246(replaceable) passwd.1.xml:410(replaceable)
-#: grpck.8.xml:219(replaceable) groupmod.8.xml:187(replaceable)
+#: pwck.8.xml:256(replaceable) passwd.1.xml:409(replaceable)
+#: grpck.8.xml:214(replaceable) groupmod.8.xml:187(replaceable)
 #: groupdel.8.xml:112(replaceable) groupadd.8.xml:251(replaceable)
 #: chage.1.xml:233(replaceable)
 msgid "0"
 msgstr "0"
 
 # type: Plain text
-#: userdel.8.xml:177(para) useradd.8.xml:699(para) pwck.8.xml:248(para)
-#: passwd.1.xml:412(para) grpck.8.xml:221(para) groupmod.8.xml:189(para)
+#: userdel.8.xml:177(para) useradd.8.xml:699(para) pwck.8.xml:258(para)
+#: passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para)
 #: groupdel.8.xml:114(para) groupadd.8.xml:253(para) chage.1.xml:235(para)
 msgid "success"
 msgstr "successo"
 
 # type: IP
 #: userdel.8.xml:181(replaceable) useradd.8.xml:703(replaceable)
-#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:252(replaceable)
-#: passwd.1.xml:45(manvolnum) passwd.1.xml:416(replaceable)
+#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:262(replaceable)
+#: passwd.1.xml:45(manvolnum) passwd.1.xml:415(replaceable)
 #: newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum)
-#: grpck.8.xml:225(replaceable) groups.1.xml:35(manvolnum)
+#: grpck.8.xml:220(replaceable) groups.1.xml:35(manvolnum)
 #: gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum)
 #: chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:35(manvolnum)
 #: chage.1.xml:239(replaceable)
@@ -1175,22 +1178,22 @@
 
 # type: IP
 #: userdel.8.xml:187(replaceable) useradd.8.xml:709(replaceable)
-#: pwck.8.xml:258(replaceable) passwd.1.xml:422(replaceable)
-#: grpck.8.xml:231(replaceable) groupmod.8.xml:193(replaceable)
+#: pwck.8.xml:268(replaceable) passwd.1.xml:421(replaceable)
+#: grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable)
 #: groupdel.8.xml:118(replaceable) groupadd.8.xml:257(replaceable)
 #: chage.1.xml:245(replaceable)
 msgid "2"
 msgstr "2"
 
 # type: Plain text
-#: userdel.8.xml:189(para) useradd.8.xml:711(para) pwck.8.xml:254(para)
-#: grpck.8.xml:227(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
+#: userdel.8.xml:189(para) useradd.8.xml:711(para) pwck.8.xml:264(para)
+#: grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
 #: groupadd.8.xml:259(para) chage.1.xml:247(para)
 msgid "invalid command syntax"
 msgstr "sintassi del comando errata"
 
 #: userdel.8.xml:193(replaceable) useradd.8.xml:727(replaceable)
-#: pwck.8.xml:282(replaceable) passwd.1.xml:446(replaceable)
+#: pwck.8.xml:292(replaceable) passwd.1.xml:445(replaceable)
 #: groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
 msgid "6"
 msgstr "6"
@@ -2073,20 +2076,20 @@
 
 # type: IP
 #: useradd.8.xml:715(replaceable) shadow.3.xml:35(manvolnum)
-#: pwck.8.xml:264(replaceable) passwd.1.xml:428(replaceable)
-#: grpck.8.xml:237(replaceable) groupmod.8.xml:199(replaceable)
+#: pwck.8.xml:274(replaceable) passwd.1.xml:427(replaceable)
+#: grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable)
 #: groupadd.8.xml:263(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:717(para) passwd.1.xml:448(para) groupmod.8.xml:201(para)
+#: useradd.8.xml:717(para) passwd.1.xml:447(para) groupmod.8.xml:201(para)
 #: groupadd.8.xml:265(para)
 msgid "invalid argument to option"
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:721(replaceable) pwck.8.xml:270(replaceable)
-#: passwd.1.xml:434(replaceable) grpck.8.xml:243(replaceable)
+#: useradd.8.xml:721(replaceable) pwck.8.xml:280(replaceable)
+#: passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable)
 #: groupmod.8.xml:205(replaceable) groupadd.8.xml:269(replaceable)
 msgid "4"
 msgstr "4"
@@ -2181,11 +2184,11 @@
 
 # type: IP
 #: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
-#: pwck.8.xml:276(replaceable) porttime.5.xml:35(manvolnum)
-#: passwd.5.xml:35(manvolnum) passwd.1.xml:440(replaceable)
+#: pwck.8.xml:286(replaceable) porttime.5.xml:35(manvolnum)
+#: passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable)
 #: login.defs.5.xml:98(manvolnum) login.access.5.xml:36(manvolnum)
 #: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
-#: grpck.8.xml:249(replaceable) faillog.5.xml:35(manvolnum)
+#: grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
 msgid "5"
 msgstr "5"
 
@@ -2449,8 +2452,8 @@
 "The current environment is passed to the new shell. The value of <envar>"
 "$PATH</envar> is reset to <filename>/bin:/usr/bin</filename> for normal "
 "users, or <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the "
-"superuser. This may be changed with the <emphasis>ENV_PATH</emphasis> and "
-"<emphasis>ENV_SUPATH</emphasis> definitions in <filename>/etc/login.defs</"
+"superuser. This may be changed with the <option>ENV_PATH</option> and "
+"<option>ENV_SUPATH</option> definitions in <filename>/etc/login.defs</"
 "filename>."
 msgstr ""
 "Le variabili d'ambiente in uso vengono passate alla nuova shell, eccetto il "
@@ -2520,23 +2523,23 @@
 msgid "The shell that will be invoked."
 msgstr ""
 
-#: su.1.xml:167(para)
+#: su.1.xml:170(para)
 msgid "The shell specified with --shell."
 msgstr ""
 
-#: su.1.xml:170(para)
+#: su.1.xml:173(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
 msgstr ""
 
-#: su.1.xml:177(para)
+#: su.1.xml:180(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
 msgstr ""
 
-#: su.1.xml:183(para)
+#: su.1.xml:186(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
@@ -2547,7 +2550,7 @@
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:190(para)
+#: su.1.xml:191(para)
 msgid ""
 "If the target user has a restricted shell (i.e. the shell field of this "
 "user's entry in <filename>/etc/passwd</filename> is not listed in <filename>/"
@@ -2557,7 +2560,7 @@
 msgstr ""
 
 # type: IP
-#: su.1.xml:201(term)
+#: su.1.xml:202(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2565,20 +2568,85 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
+#: su.1.xml:211(envar)
+msgid "$PATH"
+msgstr ""
+
+#: su.1.xml:213(para)
+msgid ""
+"reset according to the <filename>/etc/login.defs</filename> options "
+"<option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
+msgstr ""
+
+#: su.1.xml:222(envar)
+msgid "$IFS"
+msgstr ""
+
+#: su.1.xml:224(para)
+msgid ""
+"reset to <quote>&lt;space&gt;&lt;tab&gt;&lt;newline&gt;</quote>, if it was "
+"set."
+msgstr ""
+
 # type: Plain text
-#: su.1.xml:206(para)
+#: su.1.xml:207(para)
 #, fuzzy
-msgid "Preserve the current environment."
+msgid "Preserve the current environment, except for: <placeholder-1/>"
 msgstr "Non modifica l'ambiente."
 
-#: su.1.xml:207(para)
+#: su.1.xml:233(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
 msgstr ""
 
+#: su.1.xml:242(para)
+msgid ""
+"The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, "
+"<envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> "
+"environment variables are reset."
+msgstr ""
+
+#: su.1.xml:251(para)
+msgid ""
+"If <option>--login</option> is not used, the environment is copied, except "
+"for the variables above."
+msgstr ""
+
+#: su.1.xml:258(para)
+msgid ""
+"If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>"
+"$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> "
+"environment variables are copied if they were set."
+msgstr ""
+
+#: su.1.xml:268(para)
+msgid ""
+"If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</"
+"envar>, and <envar>$MAIL</envar> environment variables are set according to "
+"the <filename>/etc/login.defs</filename> options <option>ENV_TZ</option>, "
+"<option>ENV_HZ</option>, <option>MAIL_DIR</option>, and <option>MAIL_FILE</"
+"option> (see below)."
+msgstr ""
+
+#: su.1.xml:281(para)
+msgid ""
+"If <option>--login</option> is used, other environment variables might be "
+"set by the <option>ENVIRON_FILE</option> file (see below)."
+msgstr ""
+
+#: su.1.xml:289(para)
+msgid "Other environment might be set by PAM modules."
+msgstr ""
+
+#: su.1.xml:237(para)
+msgid ""
+"Note that the default behavior for the environment is the following: "
+"<placeholder-1/>"
+msgstr ""
+
 # type: Plain text
-#: su.1.xml:218(para)
+#: su.1.xml:303(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -2672,6 +2740,10 @@
 "Every line should be in the form name=value."
 msgstr ""
 
+#: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
+msgid "Lines starting with a # are treated as comment lines and ignored."
+msgstr ""
+
 # type: IP
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
@@ -2824,7 +2896,7 @@
 msgstr ""
 
 # type: Plain text
-#: su.1.xml:272(para)
+#: su.1.xml:363(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
@@ -2832,7 +2904,7 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -2925,8 +2997,9 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>"
+"citerefentry><phrase condition=\"gshadow\">, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry></phrase>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -2941,7 +3014,7 @@
 
 #: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
 #: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
-#: pwck.8.xml:60(replaceable) pwck.8.xml:74(replaceable)
+#: pwck.8.xml:60(replaceable) pwck.8.xml:75(replaceable)
 #: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
 msgid "shadow"
 msgstr "shadow"
@@ -3212,8 +3285,24 @@
 msgid "This field is reserved for future use."
 msgstr "sp_flag - riservato per uso futuro."
 
+#: shadow.5.xml:245(filename)
+#, fuzzy
+#| msgid "/etc/shadow"
+msgid "/etc/shadow-"
+msgstr "/etc/shadow"
+
+#: shadow.5.xml:247(para)
+msgid "Backup file for /etc/shadow."
+msgstr ""
+
+#: shadow.5.xml:248(para) passwd.5.xml:134(para)
+msgid ""
+"Note that this file is used by the tools of the shadow toolsuite, but not by "
+"all user and password management tools."
+msgstr ""
+
 # type: Plain text
-#: shadow.5.xml:249(para)
+#: shadow.5.xml:259(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
@@ -3720,12 +3809,12 @@
 msgid "verify integrity of password files"
 msgstr "verifica l'integrità dei file delle password"
 
-#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:140(option)
+#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:171(option)
 msgid "-q"
 msgstr "-q"
 
-#: pwck.8.xml:53(arg) pwck.8.xml:161(option) grpck.8.xml:58(arg)
-#: grpck.8.xml:130(option)
+#: pwck.8.xml:53(arg) pwck.8.xml:192(option) grpck.8.xml:58(arg)
+#: grpck.8.xml:149(option)
 msgid "-s"
 msgstr "-s"
 
@@ -3736,21 +3825,20 @@
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:68(arg) pwck.8.xml:151(option) login.1.xml:222(option)
-#: grpck.8.xml:49(arg) grpck.8.xml:120(option)
+#: pwck.8.xml:68(arg) pwck.8.xml:182(option) login.1.xml:222(option)
+#: grpck.8.xml:49(arg) grpck.8.xml:139(option)
 msgid "-r"
 msgstr "-r"
 
 # type: Plain text
-#: pwck.8.xml:82(para)
+#: pwck.8.xml:84(para)
 #, fuzzy
 msgid ""
-"The <command>pwck</command> command verifies the integrity of the system "
-"authentication information. All entries in the <filename>/etc/passwd</"
-"filename> and <filename>/etc/shadow</filename> are checked to see that the "
-"entry has the proper format and valid data in each field. The user is "
-"prompted to delete entries that are improperly formatted or which have other "
-"uncorrectable errors."
+"The <command>pwck</command> command verifies the integrity of the users and "
+"authentication information. It checks that all entries in <filename>/etc/"
+"passwd</filename> and <filename>/etc/shadow</filename> have the proper "
+"format and contain valid data. The user is prompted to delete entries that "
+"are improperly formatted or which have other uncorrectable errors."
 msgstr ""
 "<command>grpck</command> verifica l'integrità delle informazioni di "
 "autenticazione del sistema. Ogni voce in <filename>/etc/passwd</filename> e "
@@ -3760,42 +3848,85 @@
 "hanno altri errori impossibili da correggere."
 
 # type: Plain text
-#: pwck.8.xml:91(para) grpck.8.xml:80(para)
+#: pwck.8.xml:93(para) grpck.8.xml:80(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr "Vengono fatti controlli per verificare che ogni voce abbia:"
 
 # type: Plain text
-#: pwck.8.xml:94(para) grpck.8.xml:84(para)
+#: pwck.8.xml:96(para) grpck.8.xml:84(para)
 msgid "the correct number of fields"
 msgstr "il corretto numero di campi"
 
 # type: Plain text
-#: pwck.8.xml:97(para)
-msgid "a unique user name"
+#: pwck.8.xml:99(para)
+#, fuzzy
+#| msgid "a unique user name"
+msgid "a unique and valid user name"
 msgstr "un nome utente univoco"
 
 # type: Plain text
-#: pwck.8.xml:100(para)
+#: pwck.8.xml:102(para)
 msgid "a valid user and group identifier"
 msgstr "identificatori validi dell'utente e del gruppo"
 
 # type: Plain text
-#: pwck.8.xml:103(para)
+#: pwck.8.xml:105(para)
 msgid "a valid primary group"
 msgstr "un gruppo primario valido"
 
 # type: Plain text
-#: pwck.8.xml:106(para)
+#: pwck.8.xml:108(para)
 msgid "a valid home directory"
 msgstr "una home directory valida"
 
 # type: Plain text
-#: pwck.8.xml:109(para)
+#: pwck.8.xml:111(para)
 msgid "a valid login shell"
 msgstr "una shell di login valida"
 
+#: pwck.8.xml:115(para)
+msgid ""
+"<filename>shadow</filename> checks are enabled when a second file parameter "
+"is specified or when <filename>/etc/shadow</filename> exists on the system."
+msgstr ""
+
+#: pwck.8.xml:120(para)
+msgid "These checks are the following:"
+msgstr ""
+
+#: pwck.8.xml:125(para)
+msgid ""
+"every passwd entry has a matching shadow entry, and every shadow entry has a "
+"matching passwd entry"
+msgstr ""
+
+#: pwck.8.xml:131(para)
+msgid "passwords are specified in the shadowed file"
+msgstr ""
+
 # type: Plain text
-#: pwck.8.xml:113(para)
+#: pwck.8.xml:134(para)
+#, fuzzy
+#| msgid "the correct number of fields"
+msgid "shadow entries have the correct number of fields"
+msgstr "il corretto numero di campi"
+
+#: pwck.8.xml:137(para)
+msgid "shadow entries are unique in shadow"
+msgstr ""
+
+# type: Plain text
+#: pwck.8.xml:140(para)
+#, fuzzy
+msgid "the last password changes are not in the future"
+msgstr ""
+"#-#-#-#-#  it.po (shadow 4.0.3)  #-#-#-#-#\n"
+"Giorni prima che la password possa essere modificata\n"
+"#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Giorni prima dei quali la password non può essere cambiata"
+
+# type: Plain text
+#: pwck.8.xml:144(para)
 msgid ""
 "The checks for correct number of fields and unique user name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
@@ -3815,7 +3946,7 @@
 "<command>usermod</command> per correggerli."
 
 # type: Plain text
-#: pwck.8.xml:124(para)
+#: pwck.8.xml:155(para)
 msgid ""
 "The commands which operate on the <filename>/etc/passwd</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>pwck</command> "
@@ -3826,28 +3957,28 @@
 "<command>pwck</command> per rimuovere la voce scorretta."
 
 # type: Plain text
-#: pwck.8.xml:134(para)
+#: pwck.8.xml:165(para)
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr "Il comando <command>pwck</command> accetta le seguenti opzioni:"
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:174(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
 msgstr ""
 
 # type: TP
-#: pwck.8.xml:154(para)
+#: pwck.8.xml:185(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr ""
 
-#: pwck.8.xml:164(para)
+#: pwck.8.xml:195(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
 msgstr ""
 
-#: pwck.8.xml:172(para)
+#: pwck.8.xml:203(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename>. The user may select "
@@ -3860,8 +3991,44 @@
 "\">passwd</emphasis> e <emphasis remap=\"I\">shadow</emphasis>."
 
 # type: Plain text
-#: pwck.8.xml:221(para)
+#: pwck.8.xml:270(para)
+msgid "one or more bad password entries"
+msgstr "una o più voci di password conengono errori"
+
+# type: Plain text
+#: pwck.8.xml:276(para)
+msgid "can't open password files"
+msgstr "impossibile aprire i file delle password"
+
+# type: Plain text
+#: pwck.8.xml:282(para)
+msgid "can't lock password files"
+msgstr "impossibile fare il lock dei file delle password"
+
+# type: Plain text
+#: pwck.8.xml:288(para)
+msgid "can't update password files"
+msgstr "impossibile aggiornare i file delle password"
+
+# type: Plain text
+#: pwck.8.xml:294(para)
 #, fuzzy
+#| msgid "can't open password files"
+msgid "can't sort password files"
+msgstr "impossibile aprire i file delle password"
+
+# type: TP
+#: pwck.8.xml:252(para)
+msgid ""
+"The <command>pwck</command> command exits with the following values: "
+"<placeholder-1/>"
+msgstr ""
+"Il comando <command>pwck</command> restituisce i seguenti valori: "
+"<placeholder-1/>"
+
+# type: Plain text
+#: pwck.8.xml:303(para)
+#, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 #| "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -3890,42 +4057,6 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-# type: Plain text
-#: pwck.8.xml:260(para)
-msgid "one or more bad password entries"
-msgstr "una o più voci di password conengono errori"
-
-# type: Plain text
-#: pwck.8.xml:266(para)
-msgid "can't open password files"
-msgstr "impossibile aprire i file delle password"
-
-# type: Plain text
-#: pwck.8.xml:272(para)
-msgid "can't lock password files"
-msgstr "impossibile fare il lock dei file delle password"
-
-# type: Plain text
-#: pwck.8.xml:278(para)
-msgid "can't update password files"
-msgstr "impossibile aggiornare i file delle password"
-
-# type: Plain text
-#: pwck.8.xml:284(para)
-#, fuzzy
-#| msgid "can't open password files"
-msgid "can't sort password files"
-msgstr "impossibile aprire i file delle password"
-
-# type: TP
-#: pwck.8.xml:242(para)
-msgid ""
-"The <command>pwck</command> command exits with the following values: "
-"<placeholder-1/>"
-msgstr ""
-"Il comando <command>pwck</command> restituisce i seguenti valori: "
-"<placeholder-1/>"
-
 #: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
 msgid "porttime"
 msgstr "porttime"
@@ -4162,8 +4293,18 @@
 "#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "shadow - file delle password cifrate"
 
+#: passwd.5.xml:131(filename)
+#, fuzzy
+#| msgid "/etc/passwd"
+msgid "/etc/passwd-"
+msgstr "/etc/passwd"
+
+#: passwd.5.xml:133(para)
+msgid "Backup file for /etc/passwd."
+msgstr ""
+
 # type: Plain text
-#: passwd.5.xml:135(para)
+#: passwd.5.xml:145(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
@@ -4459,11 +4600,16 @@
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:247(term) chage.1.xml:138(term)
+#: passwd.1.xml:247(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
 msgid ""
-"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+"<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
 
 # type: Plain text
 #: passwd.1.xml:251(para) chage.1.xml:142(para)
@@ -4524,19 +4670,18 @@
 msgid ""
 "Unlock the password of the named account. This option re-enables a password "
 "by changing the password back to its previous value (to the value before "
-"using the <option>-l</option> option), and by resetting the account expiry "
-"field."
+"using the <option>-l</option> option)."
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:311(term)
+#: passwd.1.xml:310(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: passwd.1.xml:315(para)
+#: passwd.1.xml:314(para)
 #, fuzzy
 msgid ""
 "Set the number of days of warning before a password change is required. The "
@@ -4550,20 +4695,20 @@
 "scadenza."
 
 # type: IP
-#: passwd.1.xml:324(term)
+#: passwd.1.xml:323(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
 msgstr ""
 
-#: passwd.1.xml:328(para)
+#: passwd.1.xml:327(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
 msgstr ""
 
 # type: Plain text
-#: passwd.1.xml:340(para)
+#: passwd.1.xml:339(para)
 #, fuzzy
 #| msgid ""
 #| "Not all options may be supported. Password complexity checking may vary "
@@ -4582,13 +4727,13 @@
 "di modificare la propria password se NIS è abilitato e loro non hanno fatto "
 "il login sul server NIS."
 
-#: passwd.1.xml:345(para)
+#: passwd.1.xml:344(para)
 msgid ""
 "Users may not be able to change their password on a system if NIS is enabled "
 "and they are not logged into the NIS server."
 msgstr ""
 
-#: passwd.1.xml:350(para)
+#: passwd.1.xml:349(para)
 msgid ""
 "<command>passwd</command> uses PAM to authenticate users and to change their "
 "passwords."
@@ -4785,49 +4930,49 @@
 "option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:396(filename)
+#: passwd.1.xml:395(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/passwd"
 
 # type: Plain text
-#: passwd.1.xml:398(para)
+#: passwd.1.xml:397(para)
 #, fuzzy
 #| msgid "<command>gpasswd </command>I<group>"
 msgid "PAM configuration for <command>passwd</command>."
 msgstr "<command>gpasswd </command>I<gruppo>"
 
-#: passwd.1.xml:418(para) chage.1.xml:241(para)
+#: passwd.1.xml:417(para) chage.1.xml:241(para)
 msgid "permission denied"
 msgstr ""
 
-#: passwd.1.xml:424(para)
+#: passwd.1.xml:423(para)
 msgid "invalid combination of options"
 msgstr ""
 
-#: passwd.1.xml:430(para)
+#: passwd.1.xml:429(para)
 msgid "unexpected failure, nothing done"
 msgstr ""
 
-#: passwd.1.xml:436(para)
+#: passwd.1.xml:435(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr ""
 
 # type: TP
-#: passwd.1.xml:442(para)
+#: passwd.1.xml:441(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 
 # type: TP
-#: passwd.1.xml:406(para)
+#: passwd.1.xml:405(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:457(para)
+#: passwd.1.xml:456(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
@@ -4839,10 +4984,11 @@
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry "
-"condition=\"no_pam\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5205,7 +5351,7 @@
 
 #: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
 #: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
-#: groupadd.8.xml:58(replaceable) gpasswd.1.xml:63(replaceable)
+#: groupadd.8.xml:58(replaceable) gpasswd.1.xml:66(replaceable)
 msgid "group"
 msgstr ""
 
@@ -5274,8 +5420,9 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+"citerefentry><phrase condition=\"gshadow\">, <citerefentry condition="
+"\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry></phrase>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -5744,7 +5891,7 @@
 msgstr ""
 
 #: login.defs.5.xml:258(term) gpasswd.1.xml:42(refentrytitle)
-#: gpasswd.1.xml:47(refname) gpasswd.1.xml:58(command)
+#: gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
@@ -6292,7 +6439,7 @@
 "Impedisce che vengano mostrati i messaggi di sistema."
 
 # type: Plain text
-#: login.1.xml:371(para)
+#: login.1.xml:377(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -6826,12 +6973,12 @@
 #: grpck.8.xml:70(para)
 #, fuzzy
 msgid ""
-"The <command>grpck</command> command verifies the integrity of the system "
-"authentication information. All entries in <filename>/etc/group</"
+"The <command>grpck</command> command verifies the integrity of the groups "
+"information. It checks that all entries in <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\">and <filename>/etc/gshadow</"
-"filename></phrase> are checked to see that the entry has the proper format "
-"and valid data in each field. The user is prompted to delete entries that "
-"are improperly formatted or which have other uncorrectable errors."
+"filename></phrase> have the proper format and contain valid data. The user "
+"is prompted to delete entries that are improperly formatted or which have "
+"other uncorrectable errors."
 msgstr ""
 "<command>grpck</command> verifica l'integrità delle informazioni di "
 "autenticazione del sistema. Ogni voce in <filename>/etc/group</filename> e "
@@ -6842,13 +6989,23 @@
 
 # type: Plain text
 #: grpck.8.xml:87(para)
-msgid "a unique group name"
+#, fuzzy
+#| msgid "a unique group name"
+msgid "a unique and valid group name"
 msgstr "un nome univoco di gruppo"
 
+#: grpck.8.xml:90(para)
+msgid ""
+"a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/"
+"group</filename> only)</phrase>"
+msgstr ""
+
 # type: Plain text
-#: grpck.8.xml:90(para)
+#: grpck.8.xml:97(para)
 #, fuzzy
-msgid "a valid list of members and administrators"
+msgid ""
+"a valid list of members <phrase condition=\"gshadow\"> and administrators</"
+"phrase>"
 msgstr ""
 "#-#-#-#-#  it.po (shadow 4.0.3)  #-#-#-#-#\n"
 "- una lista valida di membri ed amministratori\n"
@@ -6856,15 +7013,42 @@
 "- una lista valida di membri e amministratori"
 
 # type: Plain text
-#: grpck.8.xml:94(para)
+#: grpck.8.xml:103(para)
+#, fuzzy
+#| msgid ""
+#| "These four programs all operate on the normal and shadow password and "
+#| "group files: <filename>/etc/passwd</filename>, <filename>/etc/group</"
+#| "filename>, <filename>/etc/shadow</filename>, and <filename>/etc/gshadow</"
+#| "filename>."
 msgid ""
+"a corresponding entry in the <filename>/etc/gshadow</filename> file "
+"(respectively <filename>/etc/group</filename> for the <filename>gshadow</"
+"filename> checks)"
+msgstr ""
+"Questi quattro programmi agiscono tutti sui file normali e oscurati "
+"(shadow)  delle password e dei gruppi: <filename>/etc/passwd</filename>, "
+"<filename>/etc/group</filename>, <filename>/etc/shadow</filename> e "
+"<filename>/etc/gshadow</filename>."
+
+# type: Plain text
+#: grpck.8.xml:111(para)
+#, fuzzy
+#| msgid ""
+#| "The checks for correct number of fields and unique group name are fatal. "
+#| "If the entry has the wrong number of fields, the user will be prompted to "
+#| "delete the entire line. If the user does not answer affirmatively, all "
+#| "further checks are bypassed. An entry with a duplicated group name is "
+#| "prompted for deletion, but the remaining checks will still be made. All "
+#| "other errors are warnings and the user is encouraged to run the "
+#| "<command>groupmod</command> command to correct the error."
+msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
-"the entry has the wrong number of fields, the user will be prompted to "
-"delete the entire line. If the user does not answer affirmatively, all "
-"further checks are bypassed. An entry with a duplicated group name is "
-"prompted for deletion, but the remaining checks will still be made. All "
-"other errors are warnings and the user is encouraged to run the "
-"<command>groupmod</command> command to correct the error."
+"an entry has the wrong number of fields, the user will be prompted to delete "
+"the entire line. If the user does not answer affirmatively, all further "
+"checks are bypassed. An entry with a duplicated group name is prompted for "
+"deletion, but the remaining checks will still be made. All other errors are "
+"warnings and the user is encouraged to run the <command>groupmod</command> "
+"command to correct the error."
 msgstr ""
 "Gli errori nelle verifiche sul corretto numero di campi e sull'univocità del "
 "nome del gruppo sono irrimediabili. Se una voce ha un numero errato di "
@@ -6876,37 +7060,45 @@
 "<command>groupmod</command> per correggerli."
 
 # type: Plain text
-#: grpck.8.xml:105(para)
+#: grpck.8.xml:122(para)
+#, fuzzy
+#| msgid ""
+#| "The commands which operate on the <filename>/etc/group</filename> file "
+#| "are not able to alter corrupted or duplicated entries. <command>grpck</"
+#| "command> should be used in those circumstances to remove the offending "
+#| "entry."
 msgid ""
-"The commands which operate on the <filename>/etc/group</filename> file are "
-"not able to alter corrupted or duplicated entries. <command>grpck</command> "
-"should be used in those circumstances to remove the offending entry."
+"The commands which operate on the <filename>/etc/group</filename><phrase "
+"condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
+"<filename>/etc/gshadow</filename> files</phrase> are not able to alter "
+"corrupted or duplicated entries. <command>grpck</command> should be used in "
+"those circumstances to remove the offending entries."
 msgstr ""
 "I comandi che operano sul file <filename>/etc/group</filename> non sono in "
 "grado di modificare voci corrotte o duplicate; in tali circostanze va usato "
 "<command>grpck</command> per rimuovere la voce scorretta."
 
 # type: Plain text
-#: grpck.8.xml:115(para)
+#: grpck.8.xml:134(para)
 #, fuzzy
 #| msgid "The options which apply to the <command>pwck</command> command are:"
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr "Il comando <command>pwck</command> accetta le seguenti opzioni:"
 
-#: grpck.8.xml:122(para)
+#: grpck.8.xml:141(para)
 msgid ""
 "Execute the <command>grpck</command> command in read-only mode. This causes "
 "all questions regarding changes to be answered <emphasis>no</emphasis> "
 "without user intervention."
 msgstr ""
 
-#: grpck.8.xml:132(para)
+#: grpck.8.xml:151(para)
 msgid ""
 "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
 "\">and <filename>/etc/gshadow</filename></phrase> by GID."
 msgstr ""
 
-#: grpck.8.xml:141(para)
+#: grpck.8.xml:160(para)
 #, fuzzy
 #| msgid ""
 #| "By default, <command>pwck</command> operates on the files <filename>/etc/"
@@ -6927,61 +7119,27 @@
 "\">passwd</emphasis> e <emphasis remap=\"I\">shadow</emphasis>."
 
 # type: Plain text
-#: grpck.8.xml:191(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</"
-#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-msgid ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>groupmod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
-"condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-"manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"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: Plain text
-#: grpck.8.xml:233(para)
+#: grpck.8.xml:228(para)
 msgid "one or more bad group entries"
 msgstr "una o più voci di gruppo contengono errori"
 
 # type: Plain text
-#: grpck.8.xml:239(para)
+#: grpck.8.xml:234(para)
 msgid "can't open group files"
 msgstr "impossibile aprire i file dei gruppi"
 
 # type: Plain text
-#: grpck.8.xml:245(para)
+#: grpck.8.xml:240(para)
 msgid "can't lock group files"
 msgstr "impossibile fare il lock dei file dei gruppi"
 
 # type: Plain text
-#: grpck.8.xml:251(para)
+#: grpck.8.xml:246(para)
 msgid "can't update group files"
 msgstr "impossibile aggiornare i file dei gruppi"
 
 # type: TP
-#: grpck.8.xml:215(para)
+#: grpck.8.xml:210(para)
 #, fuzzy
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
@@ -6992,6 +7150,41 @@
 "#-#-#-#-#  grpck.8.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
+# type: Plain text
+#: grpck.8.xml:255(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</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition="
+"\"gshadow\"><citerefentry><refentrytitle>gshadow</"
+"refentrytitle><manvolnum>5</manvolnum>, </citerefentry>, </"
+"phrase><citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>pwck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<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>."
+
 #: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
 #: groups.1.xml:45(command)
 msgid "groups"
@@ -7643,26 +7836,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:50(phrase)
+#: gpasswd.1.xml:49(phrase)
 #, fuzzy
-msgid "and <placeholder-1/> files"
-msgstr "-a <placeholder-1/>"
+#| msgid "administer the <placeholder-1/> file"
+msgid "administer <placeholder-1/>"
+msgstr "amministra il file <placeholder-1/>"
 
 #: gpasswd.1.xml:52(phrase)
-msgid "file"
-msgstr ""
-
-#: gpasswd.1.xml:48(refpurpose)
 #, fuzzy
-msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
+msgid "administer <placeholder-1/> and <placeholder-2/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:60(replaceable)
+#: gpasswd.1.xml:63(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "opzioni"
 
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:73(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -7671,12 +7861,12 @@
 msgstr ""
 
 # type: Plain text
-#: gpasswd.1.xml:78(para)
+#: gpasswd.1.xml:81(para)
 #, fuzzy
 msgid ""
 "System administrators 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."
+"administrator(s) and the <option>-M</option> option to define members. They "
+"have 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 "
@@ -7686,7 +7876,7 @@
 "gruppo e l'opzione <option>-M</option> per definire i membri ed ha tutti i "
 "diritti degli amministratori di gruppo e dei membri."
 
-#: gpasswd.1.xml:83(para)
+#: gpasswd.1.xml:86(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -7695,7 +7885,7 @@
 msgstr ""
 
 # type: Plain text
-#: gpasswd.1.xml:90(para)
+#: gpasswd.1.xml:93(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still use "
@@ -7709,12 +7899,12 @@
 "citerefentry> senza la password, i non-membri devono fornire la password."
 
 # type: SS
-#: gpasswd.1.xml:98(title)
+#: gpasswd.1.xml:101(title)
 msgid "Notes about group passwords"
 msgstr "Note sulle password di gruppo"
 
 # type: Plain text
-#: gpasswd.1.xml:99(para)
+#: gpasswd.1.xml:102(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 "
@@ -7725,7 +7915,7 @@
 "la cooperazione tra vari utenti."
 
 # type: Plain text
-#: gpasswd.1.xml:110(para)
+#: gpasswd.1.xml:113(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
@@ -7735,18 +7925,18 @@
 "possono essere utilizzate solo quando <command>login</command> viene "
 "invocato da root."
 
-#: gpasswd.1.xml:114(para)
+#: gpasswd.1.xml:117(para)
 msgid "The options cannot be combined."
 msgstr ""
 
 # type: Plain text
-#: gpasswd.1.xml:117(para)
+#: gpasswd.1.xml:120(para)
 #, fuzzy
 msgid "The options which apply to the <command>gpasswd</command> command are:"
 msgstr "Il comando <command>passwd</command> accetta le seguenti opzioni:"
 
 # type: IP
-#: gpasswd.1.xml:122(term)
+#: gpasswd.1.xml:125(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-m</option>, <option>--maximum</option><replaceable>MAX</"
@@ -7757,7 +7947,7 @@
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 
 # type: Plain text
-#: gpasswd.1.xml:126(para)
+#: gpasswd.1.xml:129(para)
 #, fuzzy
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
@@ -7767,7 +7957,7 @@
 "<replaceable>nome_gruppo</replaceable>."
 
 # type: IP
-#: gpasswd.1.xml:135(term)
+#: gpasswd.1.xml:138(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -7778,7 +7968,7 @@
 "<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
 
 # type: Plain text
-#: gpasswd.1.xml:139(para)
+#: gpasswd.1.xml:142(para)
 #, fuzzy
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
@@ -7788,13 +7978,13 @@
 "<replaceable>nome_gruppo</replaceable>."
 
 # type: IP
-#: gpasswd.1.xml:148(term)
+#: gpasswd.1.xml:151(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--remove</option>"
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
-#: gpasswd.1.xml:152(para)
+#: gpasswd.1.xml:155(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 "
@@ -7802,13 +7992,13 @@
 msgstr ""
 
 # type: IP
-#: gpasswd.1.xml:163(term)
+#: gpasswd.1.xml:166(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:167(para)
+#: gpasswd.1.xml:170(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 "
@@ -7816,7 +8006,7 @@
 msgstr ""
 
 # type: IP
-#: gpasswd.1.xml:178(term)
+#: gpasswd.1.xml:181(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
@@ -7828,7 +8018,7 @@
 "<option>-u</option>, <option>--user</option> <replaceable>LOGIN</replaceable>"
 
 # type: Plain text
-#: gpasswd.1.xml:182(para)
+#: gpasswd.1.xml:185(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr ""
@@ -7838,7 +8028,7 @@
 "- una lista valida di membri e amministratori"
 
 # type: IP
-#: gpasswd.1.xml:190(term)
+#: gpasswd.1.xml:193(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -7849,11 +8039,11 @@
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
 
-#: gpasswd.1.xml:194(para)
+#: gpasswd.1.xml:197(para)
 msgid "Set the list of group members."
 msgstr ""
 
-#: gpasswd.1.xml:204(para)
+#: gpasswd.1.xml:207(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -7863,7 +8053,7 @@
 msgstr ""
 
 # type: Plain text
-#: gpasswd.1.xml:249(para)
+#: gpasswd.1.xml:252(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -8413,10 +8603,11 @@
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
-"condition=\"no_pam\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition="
+"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+"phrase><citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -8700,6 +8891,13 @@
 msgstr ""
 
 # type: IP
+#: chage.1.xml:138(term)
+msgid ""
+"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+"replaceable>"
+msgstr ""
+
+# type: IP
 #: chage.1.xml:150(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
@@ -8814,6 +9012,10 @@
 "Giuseppe Sacco <eppesuig at debian.org>, 2005.\n"
 "Danilo Piazzalunga <danilopiazza at libero.it>, 2005."
 
+#, fuzzy
+#~ msgid "and <placeholder-1/> files"
+#~ msgstr "-a <placeholder-1/>"
+
 # type: Plain text
 #, fuzzy
 #~ msgid ""
@@ -9270,9 +9472,6 @@
 #~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
 #~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#~ msgid "administer the <placeholder-1/> file"
-#~ msgstr "amministra il file <placeholder-1/>"
-
 # type: Plain text
 #~ msgid ""
 #~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"

Modified: upstream/trunk/man/po/pl.po
===================================================================
--- upstream/trunk/man/po/pl.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/man/po/pl.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: man pages for shadow 4.0.16\n"
-"POT-Creation-Date: 2009-05-22 13:15+0200\n"
+"POT-Creation-Date: 2009-07-24 03:03+0200\n"
 "PO-Revision-Date: 2008-08-15 12:10-0300\n"
 "Last-Translator: Tomasz Kłoczko <kloczek at pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -64,14 +64,14 @@
 #: vipw.8.xml:66(title) usermod.8.xml:59(title) userdel.8.xml:60(title)
 #: useradd.8.xml:79(title) suauth.5.xml:50(title) su.1.xml:77(title)
 #: sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title)
-#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:81(title)
+#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:83(title)
 #: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
 #: nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title)
 #: logoutd.8.xml:50(title) login.defs.5.xml:107(title)
 #: login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title)
 #: lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title)
 #: groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title)
-#: groupdel.8.xml:57(title) groupadd.8.xml:64(title) gpasswd.1.xml:69(title)
+#: groupdel.8.xml:57(title) groupadd.8.xml:64(title) gpasswd.1.xml:72(title)
 #: faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title)
 #: chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title)
 #: chfn.1.xml:63(title) chage.1.xml:55(title)
@@ -104,10 +104,10 @@
 "citerefentry>."
 
 #: vipw.8.xml:84(title) usermod.8.xml:67(title) userdel.8.xml:69(title)
-#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:133(title)
+#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:164(title)
 #: passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title)
-#: lastlog.8.xml:66(title) grpck.8.xml:114(title) groupmod.8.xml:67(title)
-#: groupmems.8.xml:75(title) groupadd.8.xml:73(title) gpasswd.1.xml:109(title)
+#: lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title)
+#: groupmems.8.xml:75(title) groupadd.8.xml:73(title) gpasswd.1.xml:112(title)
 #: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:109(title)
 #: chgpasswd.8.xml:88(title) chage.1.xml:65(title)
 msgid "OPTIONS"
@@ -171,15 +171,15 @@
 msgstr "Edycja bazy shadow lub gshadow."
 
 #: vipw.8.xml:124(title) usermod.8.xml:372(title) userdel.8.xml:140(title)
-#: useradd.8.xml:644(title) suauth.5.xml:168(title) su.1.xml:253(title)
+#: useradd.8.xml:644(title) suauth.5.xml:168(title) su.1.xml:338(title)
 #: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
-#: pwconv.8.xml:168(title) pwck.8.xml:196(title) porttime.5.xml:105(title)
-#: passwd.5.xml:116(title) passwd.1.xml:375(title) newusers.8.xml:357(title)
+#: pwconv.8.xml:168(title) pwck.8.xml:227(title) porttime.5.xml:105(title)
+#: passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(title)
 #: newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title)
 #: login.1.xml:316(title) limits.5.xml:140(title) lastlog.8.xml:147(title)
-#: gshadow.5.xml:141(title) grpck.8.xml:166(title) groups.1.xml:75(title)
+#: gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title)
 #: groupmod.8.xml:164(title) groupmems.8.xml:168(title)
-#: groupdel.8.xml:89(title) groupadd.8.xml:200(title) gpasswd.1.xml:230(title)
+#: groupdel.8.xml:89(title) groupadd.8.xml:200(title) gpasswd.1.xml:233(title)
 #: faillog.8.xml:202(title) faillog.5.xml:71(title) expiry.1.xml:68(title)
 #: chsh.1.xml:133(title) chpasswd.8.xml:208(title) chgpasswd.8.xml:184(title)
 #: chfn.1.xml:113(title) chage.1.xml:206(title)
@@ -188,61 +188,62 @@
 
 #: vipw.8.xml:127(filename) usermod.8.xml:375(filename)
 #: userdel.8.xml:143(filename) useradd.8.xml:659(filename)
-#: sg.1.xml:103(filename) pwck.8.xml:199(filename)
+#: sg.1.xml:103(filename) pwck.8.xml:230(filename)
 #: newusers.8.xml:372(filename) newgrp.1.xml:114(filename)
-#: gshadow.5.xml:144(filename) grpck.8.xml:169(filename)
+#: gshadow.5.xml:144(filename) grpck.8.xml:188(filename)
 #: groups.1.xml:78(filename) groupmod.8.xml:167(filename)
 #: groupmems.8.xml:171(filename) groupdel.8.xml:92(filename)
-#: groupadd.8.xml:203(filename) gpasswd.1.xml:49(filename)
-#: gpasswd.1.xml:233(filename) chgpasswd.8.xml:187(filename)
+#: groupadd.8.xml:203(filename) gpasswd.1.xml:50(filename)
+#: gpasswd.1.xml:53(filename) gpasswd.1.xml:236(filename)
+#: chgpasswd.8.xml:187(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
 #: vipw.8.xml:129(para) usermod.8.xml:377(para) userdel.8.xml:145(para)
-#: useradd.8.xml:661(para) sg.1.xml:105(para) pwck.8.xml:201(para)
+#: useradd.8.xml:661(para) sg.1.xml:105(para) pwck.8.xml:232(para)
 #: newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para)
-#: grpck.8.xml:171(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
+#: grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
 #: groupmems.8.xml:173(para) groupdel.8.xml:94(para) groupadd.8.xml:205(para)
-#: gpasswd.1.xml:235(para) chgpasswd.8.xml:189(para)
+#: gpasswd.1.xml:238(para) chgpasswd.8.xml:189(para)
 msgid "Group account information."
 msgstr "Informacje o grupach użytkowników."
 
 #: vipw.8.xml:133(filename) usermod.8.xml:381(filename)
 #: useradd.8.xml:665(filename) sg.1.xml:109(filename)
 #: newusers.8.xml:378(filename) newgrp.1.xml:120(filename)
-#: gshadow.5.xml:150(filename) grpck.8.xml:175(filename)
+#: gshadow.5.xml:150(filename) grpck.8.xml:194(filename)
 #: groupmod.8.xml:173(filename) groupmems.8.xml:177(filename)
 #: groupdel.8.xml:98(filename) groupadd.8.xml:209(filename)
-#: gpasswd.1.xml:50(filename) gpasswd.1.xml:239(filename)
+#: gpasswd.1.xml:54(filename) gpasswd.1.xml:242(filename)
 #: chgpasswd.8.xml:193(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
 #: vipw.8.xml:135(para) usermod.8.xml:383(para) useradd.8.xml:667(para)
 #: sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para)
-#: gshadow.5.xml:152(para) grpck.8.xml:177(para) groupmod.8.xml:175(para)
-#: groupdel.8.xml:100(para) groupadd.8.xml:211(para) gpasswd.1.xml:241(para)
+#: gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para)
+#: groupdel.8.xml:100(para) groupadd.8.xml:211(para) gpasswd.1.xml:244(para)
 #: chgpasswd.8.xml:195(para)
 msgid "Secure group account information."
 msgstr "Informacje chronione o grupach użytkowników."
 
 #: vipw.8.xml:139(filename) usermod.8.xml:387(filename)
 #: userdel.8.xml:155(filename) useradd.8.xml:647(filename)
-#: su.1.xml:256(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
-#: pwck.8.xml:205(filename) passwd.5.xml:119(filename)
-#: passwd.1.xml:378(filename) newusers.8.xml:360(filename)
+#: su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
+#: pwck.8.xml:236(filename) passwd.5.xml:119(filename)
+#: passwd.1.xml:377(filename) newusers.8.xml:360(filename)
 #: newgrp.1.xml:102(filename) login.1.xml:331(filename)
-#: grpck.8.xml:181(filename) expiry.1.xml:71(filename)
+#: grpck.8.xml:200(filename) expiry.1.xml:71(filename)
 #: chsh.1.xml:136(filename) chpasswd.8.xml:211(filename)
 #: chfn.1.xml:122(filename) chage.1.xml:210(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
 #: vipw.8.xml:141(para) usermod.8.xml:389(para) userdel.8.xml:157(para)
-#: useradd.8.xml:649(para) su.1.xml:258(para) sg.1.xml:93(para)
-#: shadow.5.xml:235(para) pwck.8.xml:207(para) passwd.5.xml:121(para)
-#: passwd.1.xml:380(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
-#: login.1.xml:333(para) grpck.8.xml:183(para) expiry.1.xml:73(para)
+#: useradd.8.xml:649(para) su.1.xml:343(para) sg.1.xml:93(para)
+#: shadow.5.xml:235(para) pwck.8.xml:238(para) passwd.5.xml:121(para)
+#: passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
+#: login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para)
 #: chsh.1.xml:138(para) chpasswd.8.xml:213(para) chfn.1.xml:124(para)
 #: chage.1.xml:213(para)
 msgid "User account information."
@@ -250,9 +251,9 @@
 
 #: vipw.8.xml:145(filename) usermod.8.xml:393(filename)
 #: userdel.8.xml:161(filename) useradd.8.xml:653(filename)
-#: su.1.xml:262(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
-#: shadow.3.xml:204(filename) pwck.8.xml:211(filename)
-#: passwd.5.xml:125(filename) passwd.1.xml:384(filename)
+#: su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
+#: shadow.3.xml:204(filename) pwck.8.xml:242(filename)
+#: passwd.5.xml:125(filename) passwd.1.xml:383(filename)
 #: newusers.8.xml:366(filename) newgrp.1.xml:108(filename)
 #: login.1.xml:337(filename) expiry.1.xml:77(filename)
 #: chpasswd.8.xml:217(filename) chage.1.xml:218(filename)
@@ -260,25 +261,25 @@
 msgstr "/etc/shadow"
 
 #: vipw.8.xml:147(para) usermod.8.xml:395(para) userdel.8.xml:163(para)
-#: useradd.8.xml:655(para) su.1.xml:264(para) sg.1.xml:99(para)
-#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:213(para)
-#: passwd.1.xml:386(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
+#: useradd.8.xml:655(para) su.1.xml:349(para) sg.1.xml:99(para)
+#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:244(para)
+#: passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
 #: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:219(para)
 #: chage.1.xml:221(para)
 msgid "Secure user account information."
 msgstr "Informacje chronione o użytkownikach."
 
 #: vipw.8.xml:154(title) usermod.8.xml:402(title) userdel.8.xml:248(title)
-#: useradd.8.xml:761(title) suauth.5.xml:197(title) su.1.xml:271(title)
-#: sg.1.xml:118(title) shadow.5.xml:248(title) shadow.3.xml:213(title)
-#: pwconv.8.xml:180(title) pwck.8.xml:220(title) porttime.5.xml:117(title)
-#: passwd.5.xml:134(title) passwd.1.xml:456(title) nologin.8.xml:64(title)
+#: useradd.8.xml:761(title) suauth.5.xml:197(title) su.1.xml:362(title)
+#: sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title)
+#: pwconv.8.xml:180(title) pwck.8.xml:302(title) porttime.5.xml:117(title)
+#: passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title)
 #: newusers.8.xml:399(title) newgrp.1.xml:129(title)
 #: login.defs.5.xml:471(title) login.access.5.xml:108(title)
-#: login.1.xml:370(title) limits.5.xml:150(title) gshadow.5.xml:159(title)
-#: grpck.8.xml:190(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
+#: login.1.xml:376(title) limits.5.xml:150(title) gshadow.5.xml:159(title)
+#: grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
 #: groupmems.8.xml:186(title) groupdel.8.xml:146(title)
-#: groupadd.8.xml:291(title) gpasswd.1.xml:248(title) faillog.8.xml:214(title)
+#: groupadd.8.xml:291(title) gpasswd.1.xml:251(title) faillog.8.xml:214(title)
 #: faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
 #: chpasswd.8.xml:238(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title)
 #: chage.1.xml:261(title)
@@ -695,9 +696,9 @@
 "powoduje, że system wybierze domyślną powłokę logowania."
 
 #: usermod.8.xml:340(title) userdel.8.xml:221(title) useradd.8.xml:597(title)
-#: su.1.xml:217(title) shadow.3.xml:193(title) passwd.1.xml:339(title)
+#: su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
 #: newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title)
-#: groupdel.8.xml:65(title) groupadd.8.xml:224(title) gpasswd.1.xml:203(title)
+#: groupdel.8.xml:65(title) groupadd.8.xml:224(title) gpasswd.1.xml:206(title)
 #: faillog.8.xml:191(title) chpasswd.8.xml:182(title)
 #: chgpasswd.8.xml:157(title)
 msgid "CAVEATS"
@@ -723,22 +724,22 @@
 msgstr ""
 
 #: usermod.8.xml:359(title) userdel.8.xml:125(title) useradd.8.xml:621(title)
-#: su.1.xml:225(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
-#: pwck.8.xml:182(title) passwd.1.xml:357(title) newusers.8.xml:324(title)
-#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:154(title)
+#: su.1.xml:310(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
+#: pwck.8.xml:213(title) passwd.1.xml:356(title) newusers.8.xml:324(title)
+#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:173(title)
 #: groupmod.8.xml:152(title) groupmems.8.xml:156(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:186(title) gpasswd.1.xml:215(title)
+#: groupdel.8.xml:77(title) groupadd.8.xml:186(title) gpasswd.1.xml:218(title)
 #: chsh.1.xml:120(title) chpasswd.8.xml:194(title) chgpasswd.8.xml:169(title)
 #: chfn.1.xml:99(title)
 msgid "CONFIGURATION"
 msgstr ""
 
 #: usermod.8.xml:360(para) userdel.8.xml:126(para) useradd.8.xml:622(para)
-#: su.1.xml:226(para) sg.1.xml:77(para) pwck.8.xml:183(para)
-#: passwd.1.xml:358(para) newusers.8.xml:325(para) newgrp.1.xml:88(para)
-#: login.1.xml:273(para) grpck.8.xml:155(para) groupmod.8.xml:153(para)
+#: su.1.xml:311(para) sg.1.xml:77(para) pwck.8.xml:214(para)
+#: passwd.1.xml:357(para) newusers.8.xml:325(para) newgrp.1.xml:88(para)
+#: login.1.xml:273(para) grpck.8.xml:174(para) groupmod.8.xml:153(para)
 #: groupmems.8.xml:157(para) groupdel.8.xml:78(para) groupadd.8.xml:187(para)
-#: gpasswd.1.xml:216(para) chsh.1.xml:121(para) chpasswd.8.xml:195(para)
+#: gpasswd.1.xml:219(para) chsh.1.xml:121(para) chpasswd.8.xml:195(para)
 #: chgpasswd.8.xml:170(para) chfn.1.xml:100(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
@@ -1024,46 +1025,48 @@
 msgstr ""
 
 #: userdel.8.xml:149(filename) useradd.8.xml:683(filename)
-#: pwconv.8.xml:171(filename) passwd.1.xml:390(filename)
-#: newusers.8.xml:384(filename) login.access.5.xml:99(filename)
+#: su.1.xml:353(filename) pwconv.8.xml:171(filename)
+#: passwd.1.xml:389(filename) newusers.8.xml:384(filename)
+#: login.access.5.xml:99(filename) login.1.xml:367(filename)
 #: groupadd.8.xml:215(filename) chsh.1.xml:148(filename)
 #: chpasswd.8.xml:223(filename) chgpasswd.8.xml:199(filename)
 #: chfn.1.xml:116(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:151(para) useradd.8.xml:685(para) pwconv.8.xml:173(para)
-#: passwd.1.xml:392(para) newusers.8.xml:386(para)
-#: login.access.5.xml:101(para) groupadd.8.xml:217(para) chsh.1.xml:150(para)
-#: chpasswd.8.xml:225(para) chgpasswd.8.xml:201(para) chfn.1.xml:118(para)
+#: userdel.8.xml:151(para) useradd.8.xml:685(para) su.1.xml:355(para)
+#: pwconv.8.xml:173(para) passwd.1.xml:391(para) newusers.8.xml:386(para)
+#: login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:217(para)
+#: chsh.1.xml:150(para) chpasswd.8.xml:225(para) chgpasswd.8.xml:201(para)
+#: chfn.1.xml:118(para)
 msgid "Shadow password suite configuration."
 msgstr "Konfiguracja pakietu shadow."
 
-#: userdel.8.xml:170(title) useradd.8.xml:692(title) pwck.8.xml:241(title)
-#: passwd.1.xml:405(title) grpck.8.xml:214(title) groupmod.8.xml:182(title)
+#: userdel.8.xml:170(title) useradd.8.xml:692(title) pwck.8.xml:251(title)
+#: passwd.1.xml:404(title) grpck.8.xml:209(title) groupmod.8.xml:182(title)
 #: groupdel.8.xml:107(title) groupadd.8.xml:246(title) chage.1.xml:228(title)
 msgid "EXIT VALUES"
 msgstr "KOD ZAKOŃCZENIA"
 
 #: userdel.8.xml:175(replaceable) useradd.8.xml:697(replaceable)
-#: pwck.8.xml:246(replaceable) passwd.1.xml:410(replaceable)
-#: grpck.8.xml:219(replaceable) groupmod.8.xml:187(replaceable)
+#: pwck.8.xml:256(replaceable) passwd.1.xml:409(replaceable)
+#: grpck.8.xml:214(replaceable) groupmod.8.xml:187(replaceable)
 #: groupdel.8.xml:112(replaceable) groupadd.8.xml:251(replaceable)
 #: chage.1.xml:233(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:177(para) useradd.8.xml:699(para) pwck.8.xml:248(para)
-#: passwd.1.xml:412(para) grpck.8.xml:221(para) groupmod.8.xml:189(para)
+#: userdel.8.xml:177(para) useradd.8.xml:699(para) pwck.8.xml:258(para)
+#: passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para)
 #: groupdel.8.xml:114(para) groupadd.8.xml:253(para) chage.1.xml:235(para)
 msgid "success"
 msgstr "poprawne zakończenie działania programu"
 
 #: userdel.8.xml:181(replaceable) useradd.8.xml:703(replaceable)
-#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:252(replaceable)
-#: passwd.1.xml:45(manvolnum) passwd.1.xml:416(replaceable)
+#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:262(replaceable)
+#: passwd.1.xml:45(manvolnum) passwd.1.xml:415(replaceable)
 #: newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum)
-#: grpck.8.xml:225(replaceable) groups.1.xml:35(manvolnum)
+#: grpck.8.xml:220(replaceable) groups.1.xml:35(manvolnum)
 #: gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum)
 #: chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:35(manvolnum)
 #: chage.1.xml:239(replaceable)
@@ -1075,21 +1078,21 @@
 msgstr "nie można zaktualizować pliku z hasłami"
 
 #: userdel.8.xml:187(replaceable) useradd.8.xml:709(replaceable)
-#: pwck.8.xml:258(replaceable) passwd.1.xml:422(replaceable)
-#: grpck.8.xml:231(replaceable) groupmod.8.xml:193(replaceable)
+#: pwck.8.xml:268(replaceable) passwd.1.xml:421(replaceable)
+#: grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable)
 #: groupdel.8.xml:118(replaceable) groupadd.8.xml:257(replaceable)
 #: chage.1.xml:245(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:189(para) useradd.8.xml:711(para) pwck.8.xml:254(para)
-#: grpck.8.xml:227(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
+#: userdel.8.xml:189(para) useradd.8.xml:711(para) pwck.8.xml:264(para)
+#: grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
 #: groupadd.8.xml:259(para) chage.1.xml:247(para)
 msgid "invalid command syntax"
 msgstr "niepoprawna składnia polecenia"
 
 #: userdel.8.xml:193(replaceable) useradd.8.xml:727(replaceable)
-#: pwck.8.xml:282(replaceable) passwd.1.xml:446(replaceable)
+#: pwck.8.xml:292(replaceable) passwd.1.xml:445(replaceable)
 #: groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
 msgid "6"
 msgstr "6"
@@ -1853,19 +1856,19 @@
 msgstr ""
 
 #: useradd.8.xml:715(replaceable) shadow.3.xml:35(manvolnum)
-#: pwck.8.xml:264(replaceable) passwd.1.xml:428(replaceable)
-#: grpck.8.xml:237(replaceable) groupmod.8.xml:199(replaceable)
+#: pwck.8.xml:274(replaceable) passwd.1.xml:427(replaceable)
+#: grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable)
 #: groupadd.8.xml:263(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:717(para) passwd.1.xml:448(para) groupmod.8.xml:201(para)
+#: useradd.8.xml:717(para) passwd.1.xml:447(para) groupmod.8.xml:201(para)
 #: groupadd.8.xml:265(para)
 msgid "invalid argument to option"
 msgstr "nieprawidłowy argument opcji"
 
-#: useradd.8.xml:721(replaceable) pwck.8.xml:270(replaceable)
-#: passwd.1.xml:434(replaceable) grpck.8.xml:243(replaceable)
+#: useradd.8.xml:721(replaceable) pwck.8.xml:280(replaceable)
+#: passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable)
 #: groupmod.8.xml:205(replaceable) groupadd.8.xml:269(replaceable)
 msgid "4"
 msgstr "4"
@@ -1951,11 +1954,11 @@
 msgstr "suauth"
 
 #: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
-#: pwck.8.xml:276(replaceable) porttime.5.xml:35(manvolnum)
-#: passwd.5.xml:35(manvolnum) passwd.1.xml:440(replaceable)
+#: pwck.8.xml:286(replaceable) porttime.5.xml:35(manvolnum)
+#: passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable)
 #: login.defs.5.xml:98(manvolnum) login.access.5.xml:36(manvolnum)
 #: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
-#: grpck.8.xml:249(replaceable) faillog.5.xml:35(manvolnum)
+#: grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
 msgid "5"
 msgstr "5"
 
@@ -2188,8 +2191,8 @@
 "The current environment is passed to the new shell. The value of <envar>"
 "$PATH</envar> is reset to <filename>/bin:/usr/bin</filename> for normal "
 "users, or <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the "
-"superuser. This may be changed with the <emphasis>ENV_PATH</emphasis> and "
-"<emphasis>ENV_SUPATH</emphasis> definitions in <filename>/etc/login.defs</"
+"superuser. This may be changed with the <option>ENV_PATH</option> and "
+"<option>ENV_SUPATH</option> definitions in <filename>/etc/login.defs</"
 "filename>."
 msgstr ""
 
@@ -2239,23 +2242,23 @@
 msgid "The shell that will be invoked."
 msgstr ""
 
-#: su.1.xml:167(para)
+#: su.1.xml:170(para)
 msgid "The shell specified with --shell."
 msgstr ""
 
-#: su.1.xml:170(para)
+#: su.1.xml:173(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
 msgstr ""
 
-#: su.1.xml:177(para)
+#: su.1.xml:180(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
 msgstr ""
 
-#: su.1.xml:183(para)
+#: su.1.xml:186(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
@@ -2266,7 +2269,7 @@
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:190(para)
+#: su.1.xml:191(para)
 msgid ""
 "If the target user has a restricted shell (i.e. the shell field of this "
 "user's entry in <filename>/etc/passwd</filename> is not listed in <filename>/"
@@ -2275,7 +2278,7 @@
 "unless <command>su</command> is called by root."
 msgstr ""
 
-#: su.1.xml:201(term)
+#: su.1.xml:202(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2283,18 +2286,83 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:206(para)
-msgid "Preserve the current environment."
+#: su.1.xml:211(envar)
+msgid "$PATH"
 msgstr ""
 
+#: su.1.xml:213(para)
+msgid ""
+"reset according to the <filename>/etc/login.defs</filename> options "
+"<option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
+msgstr ""
+
+#: su.1.xml:222(envar)
+msgid "$IFS"
+msgstr ""
+
+#: su.1.xml:224(para)
+msgid ""
+"reset to <quote>&lt;space&gt;&lt;tab&gt;&lt;newline&gt;</quote>, if it was "
+"set."
+msgstr ""
+
 #: su.1.xml:207(para)
+msgid "Preserve the current environment, except for: <placeholder-1/>"
+msgstr ""
+
+#: su.1.xml:233(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
 msgstr ""
 
-#: su.1.xml:218(para)
+#: su.1.xml:242(para)
 msgid ""
+"The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, "
+"<envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> "
+"environment variables are reset."
+msgstr ""
+
+#: su.1.xml:251(para)
+msgid ""
+"If <option>--login</option> is not used, the environment is copied, except "
+"for the variables above."
+msgstr ""
+
+#: su.1.xml:258(para)
+msgid ""
+"If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>"
+"$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> "
+"environment variables are copied if they were set."
+msgstr ""
+
+#: su.1.xml:268(para)
+msgid ""
+"If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</"
+"envar>, and <envar>$MAIL</envar> environment variables are set according to "
+"the <filename>/etc/login.defs</filename> options <option>ENV_TZ</option>, "
+"<option>ENV_HZ</option>, <option>MAIL_DIR</option>, and <option>MAIL_FILE</"
+"option> (see below)."
+msgstr ""
+
+#: su.1.xml:281(para)
+msgid ""
+"If <option>--login</option> is used, other environment variables might be "
+"set by the <option>ENVIRON_FILE</option> file (see below)."
+msgstr ""
+
+#: su.1.xml:289(para)
+msgid "Other environment might be set by PAM modules."
+msgstr ""
+
+#: su.1.xml:237(para)
+msgid ""
+"Note that the default behavior for the environment is the following: "
+"<placeholder-1/>"
+msgstr ""
+
+#: su.1.xml:303(para)
+msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
 msgstr ""
@@ -2380,6 +2448,10 @@
 "Every line should be in the form name=value."
 msgstr ""
 
+#: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
+msgid "Lines starting with a # are treated as comment lines and ignored."
+msgstr ""
+
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_PATH</option> (string)"
@@ -2521,14 +2593,22 @@
 "sulog file logging."
 msgstr ""
 
-#: su.1.xml:272(para)
+#: su.1.xml:363(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>sh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -2602,8 +2682,9 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>"
+"citerefentry><phrase condition=\"gshadow\">, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry></phrase>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -2618,7 +2699,7 @@
 
 #: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
 #: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
-#: pwck.8.xml:60(replaceable) pwck.8.xml:74(replaceable)
+#: pwck.8.xml:60(replaceable) pwck.8.xml:75(replaceable)
 #: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
 msgid "shadow"
 msgstr ""
@@ -2829,8 +2910,24 @@
 msgid "This field is reserved for future use."
 msgstr ""
 
-#: shadow.5.xml:249(para)
+#: shadow.5.xml:245(filename)
 #, fuzzy
+#| msgid "/etc/shadow"
+msgid "/etc/shadow-"
+msgstr "/etc/shadow"
+
+#: shadow.5.xml:247(para)
+msgid "Backup file for /etc/shadow."
+msgstr ""
+
+#: shadow.5.xml:248(para) passwd.5.xml:134(para)
+msgid ""
+"Note that this file is used by the tools of the shadow toolsuite, but not by "
+"all user and password management tools."
+msgstr ""
+
+#: shadow.5.xml:259(para)
+#, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
 #| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -3214,12 +3311,12 @@
 msgid "verify integrity of password files"
 msgstr ""
 
-#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:140(option)
+#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:171(option)
 msgid "-q"
 msgstr "-q"
 
-#: pwck.8.xml:53(arg) pwck.8.xml:161(option) grpck.8.xml:58(arg)
-#: grpck.8.xml:130(option)
+#: pwck.8.xml:53(arg) pwck.8.xml:192(option) grpck.8.xml:58(arg)
+#: grpck.8.xml:149(option)
 msgid "-s"
 msgstr "-s"
 
@@ -3230,51 +3327,82 @@
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:68(arg) pwck.8.xml:151(option) login.1.xml:222(option)
-#: grpck.8.xml:49(arg) grpck.8.xml:120(option)
+#: pwck.8.xml:68(arg) pwck.8.xml:182(option) login.1.xml:222(option)
+#: grpck.8.xml:49(arg) grpck.8.xml:139(option)
 msgid "-r"
 msgstr "-r"
 
-#: pwck.8.xml:82(para)
+#: pwck.8.xml:84(para)
 msgid ""
-"The <command>pwck</command> command verifies the integrity of the system "
-"authentication information. All entries in the <filename>/etc/passwd</"
-"filename> and <filename>/etc/shadow</filename> are checked to see that the "
-"entry has the proper format and valid data in each field. The user is "
-"prompted to delete entries that are improperly formatted or which have other "
-"uncorrectable errors."
+"The <command>pwck</command> command verifies the integrity of the users and "
+"authentication information. It checks that all entries in <filename>/etc/"
+"passwd</filename> and <filename>/etc/shadow</filename> have the proper "
+"format and contain valid data. The user is prompted to delete entries that "
+"are improperly formatted or which have other uncorrectable errors."
 msgstr ""
 
-#: pwck.8.xml:91(para) grpck.8.xml:80(para)
+#: pwck.8.xml:93(para) grpck.8.xml:80(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr ""
 
-#: pwck.8.xml:94(para) grpck.8.xml:84(para)
+#: pwck.8.xml:96(para) grpck.8.xml:84(para)
 msgid "the correct number of fields"
 msgstr ""
 
-#: pwck.8.xml:97(para)
-msgid "a unique user name"
+#: pwck.8.xml:99(para)
+msgid "a unique and valid user name"
 msgstr ""
 
-#: pwck.8.xml:100(para)
+#: pwck.8.xml:102(para)
 msgid "a valid user and group identifier"
 msgstr ""
 
-#: pwck.8.xml:103(para)
+#: pwck.8.xml:105(para)
 msgid "a valid primary group"
 msgstr ""
 
-#: pwck.8.xml:106(para)
+#: pwck.8.xml:108(para)
 msgid "a valid home directory"
 msgstr ""
 
-#: pwck.8.xml:109(para)
+#: pwck.8.xml:111(para)
 msgid "a valid login shell"
 msgstr ""
 
-#: pwck.8.xml:113(para)
+#: pwck.8.xml:115(para)
 msgid ""
+"<filename>shadow</filename> checks are enabled when a second file parameter "
+"is specified or when <filename>/etc/shadow</filename> exists on the system."
+msgstr ""
+
+#: pwck.8.xml:120(para)
+msgid "These checks are the following:"
+msgstr ""
+
+#: pwck.8.xml:125(para)
+msgid ""
+"every passwd entry has a matching shadow entry, and every shadow entry has a "
+"matching passwd entry"
+msgstr ""
+
+#: pwck.8.xml:131(para)
+msgid "passwords are specified in the shadowed file"
+msgstr ""
+
+#: pwck.8.xml:134(para)
+msgid "shadow entries have the correct number of fields"
+msgstr ""
+
+#: pwck.8.xml:137(para)
+msgid "shadow entries are unique in shadow"
+msgstr ""
+
+#: pwck.8.xml:140(para)
+msgid "the last password changes are not in the future"
+msgstr ""
+
+#: pwck.8.xml:144(para)
+msgid ""
 "The checks for correct number of fields and unique user name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
 "delete the entire line. If the user does not answer affirmatively, all "
@@ -3284,34 +3412,34 @@
 "<command>usermod</command> command to correct the error."
 msgstr ""
 
-#: pwck.8.xml:124(para)
+#: pwck.8.xml:155(para)
 msgid ""
 "The commands which operate on the <filename>/etc/passwd</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>pwck</command> "
 "should be used in those circumstances to remove the offending entry."
 msgstr ""
 
-#: pwck.8.xml:134(para)
+#: pwck.8.xml:165(para)
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr "Polecenie <command>pwck</command> posiada następujące opcje:"
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:174(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
 msgstr ""
 
-#: pwck.8.xml:154(para)
+#: pwck.8.xml:185(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr ""
 
-#: pwck.8.xml:164(para)
+#: pwck.8.xml:195(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
 msgstr ""
 
-#: pwck.8.xml:172(para)
+#: pwck.8.xml:203(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename>. The user may select "
@@ -3319,8 +3447,38 @@
 "<emphasis remap=\"I\">shadow</emphasis> parameters."
 msgstr ""
 
-#: pwck.8.xml:221(para)
+#: pwck.8.xml:270(para)
+msgid "one or more bad password entries"
+msgstr ""
+
+#: pwck.8.xml:276(para)
+msgid "can't open password files"
+msgstr ""
+
+#: pwck.8.xml:282(para)
+msgid "can't lock password files"
+msgstr ""
+
+#: pwck.8.xml:288(para)
+msgid "can't update password files"
+msgstr ""
+
+#: pwck.8.xml:294(para)
 #, fuzzy
+#| msgid "can't update password file"
+msgid "can't sort password files"
+msgstr "nie można zaktualizować pliku z hasłami"
+
+#: pwck.8.xml:252(para)
+msgid ""
+"The <command>pwck</command> command exits with the following values: "
+"<placeholder-1/>"
+msgstr ""
+"Polecenie <command>pwck</command> kończy działanie z następującymi "
+"wartościami kodów zakończenia: <placeholder-1/>"
+
+#: pwck.8.xml:303(para)
+#, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 #| "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -3349,36 +3507,6 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: pwck.8.xml:260(para)
-msgid "one or more bad password entries"
-msgstr ""
-
-#: pwck.8.xml:266(para)
-msgid "can't open password files"
-msgstr ""
-
-#: pwck.8.xml:272(para)
-msgid "can't lock password files"
-msgstr ""
-
-#: pwck.8.xml:278(para)
-msgid "can't update password files"
-msgstr ""
-
-#: pwck.8.xml:284(para)
-#, fuzzy
-#| msgid "can't update password file"
-msgid "can't sort password files"
-msgstr "nie można zaktualizować pliku z hasłami"
-
-#: pwck.8.xml:242(para)
-msgid ""
-"The <command>pwck</command> command exits with the following values: "
-"<placeholder-1/>"
-msgstr ""
-"Polecenie <command>pwck</command> kończy działanie z następującymi "
-"wartościami kodów zakończenia: <placeholder-1/>"
-
 #: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
 msgid "porttime"
 msgstr ""
@@ -3555,8 +3683,18 @@
 msgid "optional encrypted password file"
 msgstr ""
 
-#: passwd.5.xml:135(para)
+#: passwd.5.xml:131(filename)
 #, fuzzy
+#| msgid "/etc/passwd"
+msgid "/etc/passwd-"
+msgstr "/etc/passwd"
+
+#: passwd.5.xml:133(para)
+msgid "Backup file for /etc/passwd."
+msgstr ""
+
+#: passwd.5.xml:145(para)
+#, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
 #| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -3788,9 +3926,13 @@
 msgid "Users with a locked password are not allowed to change their password."
 msgstr ""
 
-#: passwd.1.xml:247(term) chage.1.xml:138(term)
+#: passwd.1.xml:247(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+#| "replaceable>"
 msgid ""
-"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+"<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DNI</"
@@ -3841,11 +3983,10 @@
 msgid ""
 "Unlock the password of the named account. This option re-enables a password "
 "by changing the password back to its previous value (to the value before "
-"using the <option>-l</option> option), and by resetting the account expiry "
-"field."
+"using the <option>-l</option> option)."
 msgstr ""
 
-#: passwd.1.xml:311(term)
+#: passwd.1.xml:310(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -3853,7 +3994,7 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>DNI_OSTRZ</"
 "replaceable>"
 
-#: passwd.1.xml:315(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -3861,7 +4002,7 @@
 "about to expire."
 msgstr ""
 
-#: passwd.1.xml:324(term)
+#: passwd.1.xml:323(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -3869,25 +4010,25 @@
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DNI</"
 "replaceable>"
 
-#: passwd.1.xml:328(para)
+#: passwd.1.xml:327(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
 msgstr ""
 
-#: passwd.1.xml:340(para)
+#: passwd.1.xml:339(para)
 msgid ""
 "Password complexity checking may vary from site to site. The user is urged "
 "to select a password as complex as he or she feels comfortable with."
 msgstr ""
 
-#: passwd.1.xml:345(para)
+#: passwd.1.xml:344(para)
 msgid ""
 "Users may not be able to change their password on a system if NIS is enabled "
 "and they are not logged into the NIS server."
 msgstr ""
 
-#: passwd.1.xml:350(para)
+#: passwd.1.xml:349(para)
 msgid ""
 "<command>passwd</command> uses PAM to authenticate users and to change their "
 "passwords."
@@ -4079,37 +4220,37 @@
 "option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:396(filename)
+#: passwd.1.xml:395(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/passwd"
 
-#: passwd.1.xml:398(para)
+#: passwd.1.xml:397(para)
 msgid "PAM configuration for <command>passwd</command>."
 msgstr ""
 
-#: passwd.1.xml:418(para) chage.1.xml:241(para)
+#: passwd.1.xml:417(para) chage.1.xml:241(para)
 msgid "permission denied"
 msgstr "brak dostępu"
 
-#: passwd.1.xml:424(para)
+#: passwd.1.xml:423(para)
 msgid "invalid combination of options"
 msgstr "nieprawidłowa kombinacja opcji"
 
-#: passwd.1.xml:430(para)
+#: passwd.1.xml:429(para)
 msgid "unexpected failure, nothing done"
 msgstr ""
 
-#: passwd.1.xml:436(para)
+#: passwd.1.xml:435(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr ""
 
-#: passwd.1.xml:442(para)
+#: passwd.1.xml:441(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 
-#: passwd.1.xml:406(para)
+#: passwd.1.xml:405(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4117,7 +4258,7 @@
 "Polecenie <command>passwd</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: passwd.1.xml:457(para)
+#: passwd.1.xml:456(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
@@ -4129,10 +4270,11 @@
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry "
-"condition=\"no_pam\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4489,7 +4631,7 @@
 
 #: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
 #: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
-#: groupadd.8.xml:58(replaceable) gpasswd.1.xml:63(replaceable)
+#: groupadd.8.xml:58(replaceable) gpasswd.1.xml:66(replaceable)
 msgid "group"
 msgstr "group"
 
@@ -4535,8 +4677,9 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+"citerefentry><phrase condition=\"gshadow\">, <citerefentry condition="
+"\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry></phrase>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -4965,7 +5108,7 @@
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
 #: login.defs.5.xml:258(term) gpasswd.1.xml:42(refentrytitle)
-#: gpasswd.1.xml:47(refname) gpasswd.1.xml:58(command)
+#: gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
@@ -5407,7 +5550,7 @@
 msgid "Suppress printing of system messages."
 msgstr ""
 
-#: login.1.xml:371(para)
+#: login.1.xml:377(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5886,60 +6029,77 @@
 
 #: grpck.8.xml:70(para)
 msgid ""
-"The <command>grpck</command> command verifies the integrity of the system "
-"authentication information. All entries in <filename>/etc/group</"
+"The <command>grpck</command> command verifies the integrity of the groups "
+"information. It checks that all entries in <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\">and <filename>/etc/gshadow</"
-"filename></phrase> are checked to see that the entry has the proper format "
-"and valid data in each field. The user is prompted to delete entries that "
-"are improperly formatted or which have other uncorrectable errors."
+"filename></phrase> have the proper format and contain valid data. The user "
+"is prompted to delete entries that are improperly formatted or which have "
+"other uncorrectable errors."
 msgstr ""
 
 #: grpck.8.xml:87(para)
-msgid "a unique group name"
+msgid "a unique and valid group name"
 msgstr ""
 
 #: grpck.8.xml:90(para)
-msgid "a valid list of members and administrators"
+msgid ""
+"a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/"
+"group</filename> only)</phrase>"
 msgstr ""
 
-#: grpck.8.xml:94(para)
+#: grpck.8.xml:97(para)
 msgid ""
+"a valid list of members <phrase condition=\"gshadow\"> and administrators</"
+"phrase>"
+msgstr ""
+
+#: grpck.8.xml:103(para)
+msgid ""
+"a corresponding entry in the <filename>/etc/gshadow</filename> file "
+"(respectively <filename>/etc/group</filename> for the <filename>gshadow</"
+"filename> checks)"
+msgstr ""
+
+#: grpck.8.xml:111(para)
+msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
-"the entry has the wrong number of fields, the user will be prompted to "
-"delete the entire line. If the user does not answer affirmatively, all "
-"further checks are bypassed. An entry with a duplicated group name is "
-"prompted for deletion, but the remaining checks will still be made. All "
-"other errors are warnings and the user is encouraged to run the "
-"<command>groupmod</command> command to correct the error."
+"an entry has the wrong number of fields, the user will be prompted to delete "
+"the entire line. If the user does not answer affirmatively, all further "
+"checks are bypassed. An entry with a duplicated group name is prompted for "
+"deletion, but the remaining checks will still be made. All other errors are "
+"warnings and the user is encouraged to run the <command>groupmod</command> "
+"command to correct the error."
 msgstr ""
 
-#: grpck.8.xml:105(para)
+#: grpck.8.xml:122(para)
 msgid ""
-"The commands which operate on the <filename>/etc/group</filename> file are "
-"not able to alter corrupted or duplicated entries. <command>grpck</command> "
-"should be used in those circumstances to remove the offending entry."
+"The commands which operate on the <filename>/etc/group</filename><phrase "
+"condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
+"<filename>/etc/gshadow</filename> files</phrase> are not able to alter "
+"corrupted or duplicated entries. <command>grpck</command> should be used in "
+"those circumstances to remove the offending entries."
 msgstr ""
 
-#: grpck.8.xml:115(para)
+#: grpck.8.xml:134(para)
 #, fuzzy
 #| msgid "The options which apply to the <command>pwck</command> command are:"
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr "Polecenie <command>pwck</command> posiada następujące opcje:"
 
-#: grpck.8.xml:122(para)
+#: grpck.8.xml:141(para)
 msgid ""
 "Execute the <command>grpck</command> command in read-only mode. This causes "
 "all questions regarding changes to be answered <emphasis>no</emphasis> "
 "without user intervention."
 msgstr ""
 
-#: grpck.8.xml:132(para)
+#: grpck.8.xml:151(para)
 msgid ""
 "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
 "\">and <filename>/etc/gshadow</filename></phrase> by GID."
 msgstr ""
 
-#: grpck.8.xml:141(para)
+#: grpck.8.xml:160(para)
 msgid ""
 "By default, <command>grpck</command> operates on <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</"
@@ -5949,7 +6109,31 @@
 "emphasis> parameters.</phrase>"
 msgstr ""
 
-#: grpck.8.xml:191(para)
+#: grpck.8.xml:228(para)
+msgid "one or more bad group entries"
+msgstr ""
+
+#: grpck.8.xml:234(para)
+msgid "can't open group files"
+msgstr ""
+
+#: grpck.8.xml:240(para)
+msgid "can't lock group files"
+msgstr ""
+
+#: grpck.8.xml:246(para)
+msgid "can't update group files"
+msgstr ""
+
+#: grpck.8.xml:210(para)
+msgid ""
+"The <command>grpck</command> command exits with the following values: "
+"<placeholder-1/>"
+msgstr ""
+"Polecenie <command>grpckl</command> kończy działanie z następującymi "
+"wartościami kodów zakończenia: <placeholder-1/>"
+
+#: grpck.8.xml:255(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -5964,13 +6148,14 @@
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>groupmod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
-"condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-"manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition="
+"\"gshadow\"><citerefentry><refentrytitle>gshadow</"
+"refentrytitle><manvolnum>5</manvolnum>, </citerefentry>, </"
+"phrase><citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>pwck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -5982,30 +6167,6 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: grpck.8.xml:233(para)
-msgid "one or more bad group entries"
-msgstr ""
-
-#: grpck.8.xml:239(para)
-msgid "can't open group files"
-msgstr ""
-
-#: grpck.8.xml:245(para)
-msgid "can't lock group files"
-msgstr ""
-
-#: grpck.8.xml:251(para)
-msgid "can't update group files"
-msgstr ""
-
-#: grpck.8.xml:215(para)
-msgid ""
-"The <command>grpck</command> command exits with the following values: "
-"<placeholder-1/>"
-msgstr ""
-"Polecenie <command>grpckl</command> kończy działanie z następującymi "
-"wartościami kodów zakończenia: <placeholder-1/>"
-
 #: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
 #: groups.1.xml:45(command)
 msgid "groups"
@@ -6581,26 +6742,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:50(phrase)
+#: gpasswd.1.xml:49(phrase)
 #, fuzzy
-msgid "and <placeholder-1/> files"
-msgstr "-a <placeholder-1/>"
+#| msgid "-r <placeholder-1/>"
+msgid "administer <placeholder-1/>"
+msgstr "-r <placeholder-1/>"
 
 #: gpasswd.1.xml:52(phrase)
-msgid "file"
-msgstr ""
-
-#: gpasswd.1.xml:48(refpurpose)
 #, fuzzy
-msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
+msgid "administer <placeholder-1/> and <placeholder-2/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:60(replaceable)
+#: gpasswd.1.xml:63(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "opcje"
 
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:73(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -6608,14 +6766,14 @@
 "\">administrators,</phrase> members and a password."
 msgstr ""
 
-#: gpasswd.1.xml:78(para)
+#: gpasswd.1.xml:81(para)
 msgid ""
 "System administrators can use the <option>-A</option> option to define group "
-"administrator(s) and the <option>-M</option> option to define members and "
-"has all rights of group administrators and members."
+"administrator(s) and the <option>-M</option> option to define members. They "
+"have all rights of group administrators and members."
 msgstr ""
 
-#: gpasswd.1.xml:83(para)
+#: gpasswd.1.xml:86(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -6623,7 +6781,7 @@
 "of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:90(para)
+#: gpasswd.1.xml:93(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still use "
@@ -6634,34 +6792,34 @@
 "jest zmieniana przy pomocy polecenia <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:98(title)
+#: gpasswd.1.xml:101(title)
 msgid "Notes about group passwords"
 msgstr ""
 
-#: gpasswd.1.xml:99(para)
+#: gpasswd.1.xml:102(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:110(para)
+#: gpasswd.1.xml:113(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
 "options cannot be combined."
 msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
 
-#: gpasswd.1.xml:114(para)
+#: gpasswd.1.xml:117(para)
 msgid "The options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:117(para)
+#: gpasswd.1.xml:120(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:122(term)
+#: gpasswd.1.xml:125(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
@@ -6670,7 +6828,7 @@
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:126(para)
+#: gpasswd.1.xml:129(para)
 #, fuzzy
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
@@ -6679,7 +6837,7 @@
 "Nazwa grupy zostanie zmieniona z <replaceable>GRUPA</replaceable> na nazwę "
 "<replaceable>NOWA_GRUPA</replaceable>."
 
-#: gpasswd.1.xml:135(term)
+#: gpasswd.1.xml:138(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -6689,7 +6847,7 @@
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>DNI</replaceable>"
 
-#: gpasswd.1.xml:139(para)
+#: gpasswd.1.xml:142(para)
 #, fuzzy
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
@@ -6698,33 +6856,33 @@
 "Nazwa grupy zostanie zmieniona z <replaceable>GRUPA</replaceable> na nazwę "
 "<replaceable>NOWA_GRUPA</replaceable>."
 
-#: gpasswd.1.xml:148(term)
+#: gpasswd.1.xml:151(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--remove</option>"
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
-#: gpasswd.1.xml:152(para)
+#: gpasswd.1.xml:155(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:163(term)
+#: gpasswd.1.xml:166(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:167(para)
+#: gpasswd.1.xml:170(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:178(term)
+#: gpasswd.1.xml:181(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
@@ -6736,11 +6894,11 @@
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DNI</"
 "replaceable>"
 
-#: gpasswd.1.xml:182(para)
+#: gpasswd.1.xml:185(para)
 msgid "Set the list of administrative users."
 msgstr ""
 
-#: gpasswd.1.xml:190(term)
+#: gpasswd.1.xml:193(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
@@ -6751,11 +6909,11 @@
 msgstr ""
 "<option>-b</option>, <option>--before</option><replaceable>DNI</replaceable>"
 
-#: gpasswd.1.xml:194(para)
+#: gpasswd.1.xml:197(para)
 msgid "Set the list of group members."
 msgstr ""
 
-#: gpasswd.1.xml:204(para)
+#: gpasswd.1.xml:207(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -6764,7 +6922,7 @@
 "server."
 msgstr ""
 
-#: gpasswd.1.xml:249(para)
+#: gpasswd.1.xml:252(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -7209,10 +7367,11 @@
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
-"condition=\"no_pam\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition="
+"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+"phrase><citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -7463,6 +7622,14 @@
 msgid "Show account aging information."
 msgstr "Wyświetlenie informacji o terminach ważności konta i hasła."
 
+#: chage.1.xml:138(term)
+msgid ""
+"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+"replaceable>"
+msgstr ""
+"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DNI</"
+"replaceable>"
+
 #: chage.1.xml:150(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
@@ -7569,6 +7736,10 @@
 msgstr "Tomasz Kłoczko <kloczek at pld.org.pl>, 2006"
 
 #, fuzzy
+#~ msgid "and <placeholder-1/> files"
+#~ msgstr "-a <placeholder-1/>"
+
+#, fuzzy
 #~| msgid ""
 #~| "<command>usermod</command> will not allow you to change the name of a "
 #~| "user who is logged in. You must make certain that the named user is not "

Modified: upstream/trunk/man/po/ru.po
===================================================================
--- upstream/trunk/man/po/ru.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/man/po/ru.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1:4.0.18.2-1\n"
-"POT-Creation-Date: 2009-05-22 13:15+0200\n"
+"POT-Creation-Date: 2009-07-24 03:03+0200\n"
 "PO-Revision-Date: 2007-11-21 21:37+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -76,14 +76,14 @@
 #: vipw.8.xml:66(title) usermod.8.xml:59(title) userdel.8.xml:60(title)
 #: useradd.8.xml:79(title) suauth.5.xml:50(title) su.1.xml:77(title)
 #: sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title)
-#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:81(title)
+#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:83(title)
 #: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
 #: nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title)
 #: logoutd.8.xml:50(title) login.defs.5.xml:107(title)
 #: login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title)
 #: lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title)
 #: groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title)
-#: groupdel.8.xml:57(title) groupadd.8.xml:64(title) gpasswd.1.xml:69(title)
+#: groupdel.8.xml:57(title) groupadd.8.xml:64(title) gpasswd.1.xml:72(title)
 #: faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title)
 #: chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title)
 #: chfn.1.xml:63(title) chage.1.xml:55(title)
@@ -116,10 +116,10 @@
 
 # type: Content of: <refentry><refsect1><title>
 #: vipw.8.xml:84(title) usermod.8.xml:67(title) userdel.8.xml:69(title)
-#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:133(title)
+#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:164(title)
 #: passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title)
-#: lastlog.8.xml:66(title) grpck.8.xml:114(title) groupmod.8.xml:67(title)
-#: groupmems.8.xml:75(title) groupadd.8.xml:73(title) gpasswd.1.xml:109(title)
+#: lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title)
+#: groupmems.8.xml:75(title) groupadd.8.xml:73(title) gpasswd.1.xml:112(title)
 #: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:109(title)
 #: chgpasswd.8.xml:88(title) chage.1.xml:65(title)
 msgid "OPTIONS"
@@ -186,15 +186,15 @@
 
 # type: Content of: <refentry><refsect1><title>
 #: vipw.8.xml:124(title) usermod.8.xml:372(title) userdel.8.xml:140(title)
-#: useradd.8.xml:644(title) suauth.5.xml:168(title) su.1.xml:253(title)
+#: useradd.8.xml:644(title) suauth.5.xml:168(title) su.1.xml:338(title)
 #: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
-#: pwconv.8.xml:168(title) pwck.8.xml:196(title) porttime.5.xml:105(title)
-#: passwd.5.xml:116(title) passwd.1.xml:375(title) newusers.8.xml:357(title)
+#: pwconv.8.xml:168(title) pwck.8.xml:227(title) porttime.5.xml:105(title)
+#: passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(title)
 #: newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title)
 #: login.1.xml:316(title) limits.5.xml:140(title) lastlog.8.xml:147(title)
-#: gshadow.5.xml:141(title) grpck.8.xml:166(title) groups.1.xml:75(title)
+#: gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title)
 #: groupmod.8.xml:164(title) groupmems.8.xml:168(title)
-#: groupdel.8.xml:89(title) groupadd.8.xml:200(title) gpasswd.1.xml:230(title)
+#: groupdel.8.xml:89(title) groupadd.8.xml:200(title) gpasswd.1.xml:233(title)
 #: faillog.8.xml:202(title) faillog.5.xml:71(title) expiry.1.xml:68(title)
 #: chsh.1.xml:133(title) chpasswd.8.xml:208(title) chgpasswd.8.xml:184(title)
 #: chfn.1.xml:113(title) chage.1.xml:206(title)
@@ -204,23 +204,24 @@
 # type: Content of: <refentry><refsect1><para><filename>
 #: vipw.8.xml:127(filename) usermod.8.xml:375(filename)
 #: userdel.8.xml:143(filename) useradd.8.xml:659(filename)
-#: sg.1.xml:103(filename) pwck.8.xml:199(filename)
+#: sg.1.xml:103(filename) pwck.8.xml:230(filename)
 #: newusers.8.xml:372(filename) newgrp.1.xml:114(filename)
-#: gshadow.5.xml:144(filename) grpck.8.xml:169(filename)
+#: gshadow.5.xml:144(filename) grpck.8.xml:188(filename)
 #: groups.1.xml:78(filename) groupmod.8.xml:167(filename)
 #: groupmems.8.xml:171(filename) groupdel.8.xml:92(filename)
-#: groupadd.8.xml:203(filename) gpasswd.1.xml:49(filename)
-#: gpasswd.1.xml:233(filename) chgpasswd.8.xml:187(filename)
+#: groupadd.8.xml:203(filename) gpasswd.1.xml:50(filename)
+#: gpasswd.1.xml:53(filename) gpasswd.1.xml:236(filename)
+#: chgpasswd.8.xml:187(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: vipw.8.xml:129(para) usermod.8.xml:377(para) userdel.8.xml:145(para)
-#: useradd.8.xml:661(para) sg.1.xml:105(para) pwck.8.xml:201(para)
+#: useradd.8.xml:661(para) sg.1.xml:105(para) pwck.8.xml:232(para)
 #: newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para)
-#: grpck.8.xml:171(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
+#: grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
 #: groupmems.8.xml:173(para) groupdel.8.xml:94(para) groupadd.8.xml:205(para)
-#: gpasswd.1.xml:235(para) chgpasswd.8.xml:189(para)
+#: gpasswd.1.xml:238(para) chgpasswd.8.xml:189(para)
 msgid "Group account information."
 msgstr "содержит информацию о группах"
 
@@ -228,10 +229,10 @@
 #: vipw.8.xml:133(filename) usermod.8.xml:381(filename)
 #: useradd.8.xml:665(filename) sg.1.xml:109(filename)
 #: newusers.8.xml:378(filename) newgrp.1.xml:120(filename)
-#: gshadow.5.xml:150(filename) grpck.8.xml:175(filename)
+#: gshadow.5.xml:150(filename) grpck.8.xml:194(filename)
 #: groupmod.8.xml:173(filename) groupmems.8.xml:177(filename)
 #: groupdel.8.xml:98(filename) groupadd.8.xml:209(filename)
-#: gpasswd.1.xml:50(filename) gpasswd.1.xml:239(filename)
+#: gpasswd.1.xml:54(filename) gpasswd.1.xml:242(filename)
 #: chgpasswd.8.xml:193(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
@@ -239,8 +240,8 @@
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: vipw.8.xml:135(para) usermod.8.xml:383(para) useradd.8.xml:667(para)
 #: sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para)
-#: gshadow.5.xml:152(para) grpck.8.xml:177(para) groupmod.8.xml:175(para)
-#: groupdel.8.xml:100(para) groupadd.8.xml:211(para) gpasswd.1.xml:241(para)
+#: gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para)
+#: groupdel.8.xml:100(para) groupadd.8.xml:211(para) gpasswd.1.xml:244(para)
 #: chgpasswd.8.xml:195(para)
 msgid "Secure group account information."
 msgstr "содержит защищаемую информацию о группах"
@@ -248,11 +249,11 @@
 # type: Content of: <refentry><refsect1><para><filename>
 #: vipw.8.xml:139(filename) usermod.8.xml:387(filename)
 #: userdel.8.xml:155(filename) useradd.8.xml:647(filename)
-#: su.1.xml:256(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
-#: pwck.8.xml:205(filename) passwd.5.xml:119(filename)
-#: passwd.1.xml:378(filename) newusers.8.xml:360(filename)
+#: su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
+#: pwck.8.xml:236(filename) passwd.5.xml:119(filename)
+#: passwd.1.xml:377(filename) newusers.8.xml:360(filename)
 #: newgrp.1.xml:102(filename) login.1.xml:331(filename)
-#: grpck.8.xml:181(filename) expiry.1.xml:71(filename)
+#: grpck.8.xml:200(filename) expiry.1.xml:71(filename)
 #: chsh.1.xml:136(filename) chpasswd.8.xml:211(filename)
 #: chfn.1.xml:122(filename) chage.1.xml:210(filename)
 msgid "/etc/passwd"
@@ -260,10 +261,10 @@
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: vipw.8.xml:141(para) usermod.8.xml:389(para) userdel.8.xml:157(para)
-#: useradd.8.xml:649(para) su.1.xml:258(para) sg.1.xml:93(para)
-#: shadow.5.xml:235(para) pwck.8.xml:207(para) passwd.5.xml:121(para)
-#: passwd.1.xml:380(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
-#: login.1.xml:333(para) grpck.8.xml:183(para) expiry.1.xml:73(para)
+#: useradd.8.xml:649(para) su.1.xml:343(para) sg.1.xml:93(para)
+#: shadow.5.xml:235(para) pwck.8.xml:238(para) passwd.5.xml:121(para)
+#: passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
+#: login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para)
 #: chsh.1.xml:138(para) chpasswd.8.xml:213(para) chfn.1.xml:124(para)
 #: chage.1.xml:213(para)
 msgid "User account information."
@@ -272,9 +273,9 @@
 # type: Content of: <refentry><refsect1><para><filename>
 #: vipw.8.xml:145(filename) usermod.8.xml:393(filename)
 #: userdel.8.xml:161(filename) useradd.8.xml:653(filename)
-#: su.1.xml:262(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
-#: shadow.3.xml:204(filename) pwck.8.xml:211(filename)
-#: passwd.5.xml:125(filename) passwd.1.xml:384(filename)
+#: su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
+#: shadow.3.xml:204(filename) pwck.8.xml:242(filename)
+#: passwd.5.xml:125(filename) passwd.1.xml:383(filename)
 #: newusers.8.xml:366(filename) newgrp.1.xml:108(filename)
 #: login.1.xml:337(filename) expiry.1.xml:77(filename)
 #: chpasswd.8.xml:217(filename) chage.1.xml:218(filename)
@@ -283,9 +284,9 @@
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: vipw.8.xml:147(para) usermod.8.xml:395(para) userdel.8.xml:163(para)
-#: useradd.8.xml:655(para) su.1.xml:264(para) sg.1.xml:99(para)
-#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:213(para)
-#: passwd.1.xml:386(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
+#: useradd.8.xml:655(para) su.1.xml:349(para) sg.1.xml:99(para)
+#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:244(para)
+#: passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
 #: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:219(para)
 #: chage.1.xml:221(para)
 msgid "Secure user account information."
@@ -293,16 +294,16 @@
 
 # type: Content of: <refentry><refsect1><title>
 #: vipw.8.xml:154(title) usermod.8.xml:402(title) userdel.8.xml:248(title)
-#: useradd.8.xml:761(title) suauth.5.xml:197(title) su.1.xml:271(title)
-#: sg.1.xml:118(title) shadow.5.xml:248(title) shadow.3.xml:213(title)
-#: pwconv.8.xml:180(title) pwck.8.xml:220(title) porttime.5.xml:117(title)
-#: passwd.5.xml:134(title) passwd.1.xml:456(title) nologin.8.xml:64(title)
+#: useradd.8.xml:761(title) suauth.5.xml:197(title) su.1.xml:362(title)
+#: sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title)
+#: pwconv.8.xml:180(title) pwck.8.xml:302(title) porttime.5.xml:117(title)
+#: passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title)
 #: newusers.8.xml:399(title) newgrp.1.xml:129(title)
 #: login.defs.5.xml:471(title) login.access.5.xml:108(title)
-#: login.1.xml:370(title) limits.5.xml:150(title) gshadow.5.xml:159(title)
-#: grpck.8.xml:190(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
+#: login.1.xml:376(title) limits.5.xml:150(title) gshadow.5.xml:159(title)
+#: grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
 #: groupmems.8.xml:186(title) groupdel.8.xml:146(title)
-#: groupadd.8.xml:291(title) gpasswd.1.xml:248(title) faillog.8.xml:214(title)
+#: groupadd.8.xml:291(title) gpasswd.1.xml:251(title) faillog.8.xml:214(title)
 #: faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
 #: chpasswd.8.xml:238(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title)
 #: chage.1.xml:261(title)
@@ -796,9 +797,9 @@
 
 # type: Content of: <refentry><refsect1><title>
 #: usermod.8.xml:340(title) userdel.8.xml:221(title) useradd.8.xml:597(title)
-#: su.1.xml:217(title) shadow.3.xml:193(title) passwd.1.xml:339(title)
+#: su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
 #: newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title)
-#: groupdel.8.xml:65(title) groupadd.8.xml:224(title) gpasswd.1.xml:203(title)
+#: groupdel.8.xml:65(title) groupadd.8.xml:224(title) gpasswd.1.xml:206(title)
 #: faillog.8.xml:191(title) chpasswd.8.xml:182(title)
 #: chgpasswd.8.xml:157(title)
 msgid "CAVEATS"
@@ -824,22 +825,22 @@
 msgstr ""
 
 #: usermod.8.xml:359(title) userdel.8.xml:125(title) useradd.8.xml:621(title)
-#: su.1.xml:225(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
-#: pwck.8.xml:182(title) passwd.1.xml:357(title) newusers.8.xml:324(title)
-#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:154(title)
+#: su.1.xml:310(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
+#: pwck.8.xml:213(title) passwd.1.xml:356(title) newusers.8.xml:324(title)
+#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:173(title)
 #: groupmod.8.xml:152(title) groupmems.8.xml:156(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:186(title) gpasswd.1.xml:215(title)
+#: groupdel.8.xml:77(title) groupadd.8.xml:186(title) gpasswd.1.xml:218(title)
 #: chsh.1.xml:120(title) chpasswd.8.xml:194(title) chgpasswd.8.xml:169(title)
 #: chfn.1.xml:99(title)
 msgid "CONFIGURATION"
 msgstr ""
 
 #: usermod.8.xml:360(para) userdel.8.xml:126(para) useradd.8.xml:622(para)
-#: su.1.xml:226(para) sg.1.xml:77(para) pwck.8.xml:183(para)
-#: passwd.1.xml:358(para) newusers.8.xml:325(para) newgrp.1.xml:88(para)
-#: login.1.xml:273(para) grpck.8.xml:155(para) groupmod.8.xml:153(para)
+#: su.1.xml:311(para) sg.1.xml:77(para) pwck.8.xml:214(para)
+#: passwd.1.xml:357(para) newusers.8.xml:325(para) newgrp.1.xml:88(para)
+#: login.1.xml:273(para) grpck.8.xml:174(para) groupmod.8.xml:153(para)
 #: groupmems.8.xml:157(para) groupdel.8.xml:78(para) groupadd.8.xml:187(para)
-#: gpasswd.1.xml:216(para) chsh.1.xml:121(para) chpasswd.8.xml:195(para)
+#: gpasswd.1.xml:219(para) chsh.1.xml:121(para) chpasswd.8.xml:195(para)
 #: chgpasswd.8.xml:170(para) chfn.1.xml:100(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
@@ -1169,8 +1170,9 @@
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
 #: userdel.8.xml:149(filename) useradd.8.xml:683(filename)
-#: pwconv.8.xml:171(filename) passwd.1.xml:390(filename)
-#: newusers.8.xml:384(filename) login.access.5.xml:99(filename)
+#: su.1.xml:353(filename) pwconv.8.xml:171(filename)
+#: passwd.1.xml:389(filename) newusers.8.xml:384(filename)
+#: login.access.5.xml:99(filename) login.1.xml:367(filename)
 #: groupadd.8.xml:215(filename) chsh.1.xml:148(filename)
 #: chpasswd.8.xml:223(filename) chgpasswd.8.xml:199(filename)
 #: chfn.1.xml:116(filename)
@@ -1178,42 +1180,43 @@
 msgstr "/etc/login.defs"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:151(para) useradd.8.xml:685(para) pwconv.8.xml:173(para)
-#: passwd.1.xml:392(para) newusers.8.xml:386(para)
-#: login.access.5.xml:101(para) groupadd.8.xml:217(para) chsh.1.xml:150(para)
-#: chpasswd.8.xml:225(para) chgpasswd.8.xml:201(para) chfn.1.xml:118(para)
+#: userdel.8.xml:151(para) useradd.8.xml:685(para) su.1.xml:355(para)
+#: pwconv.8.xml:173(para) passwd.1.xml:391(para) newusers.8.xml:386(para)
+#: login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:217(para)
+#: chsh.1.xml:150(para) chpasswd.8.xml:225(para) chgpasswd.8.xml:201(para)
+#: chfn.1.xml:118(para)
 msgid "Shadow password suite configuration."
 msgstr "содержит конфигурацию подсистемы теневых паролей"
 
 # type: Content of: <refentry><refsect1><title>
-#: userdel.8.xml:170(title) useradd.8.xml:692(title) pwck.8.xml:241(title)
-#: passwd.1.xml:405(title) grpck.8.xml:214(title) groupmod.8.xml:182(title)
+#: userdel.8.xml:170(title) useradd.8.xml:692(title) pwck.8.xml:251(title)
+#: passwd.1.xml:404(title) grpck.8.xml:209(title) groupmod.8.xml:182(title)
 #: groupdel.8.xml:107(title) groupadd.8.xml:246(title) chage.1.xml:228(title)
 msgid "EXIT VALUES"
 msgstr "ВОЗВРАЩАЕМЫЕ ЗНАЧЕНИЯ"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
 #: userdel.8.xml:175(replaceable) useradd.8.xml:697(replaceable)
-#: pwck.8.xml:246(replaceable) passwd.1.xml:410(replaceable)
-#: grpck.8.xml:219(replaceable) groupmod.8.xml:187(replaceable)
+#: pwck.8.xml:256(replaceable) passwd.1.xml:409(replaceable)
+#: grpck.8.xml:214(replaceable) groupmod.8.xml:187(replaceable)
 #: groupdel.8.xml:112(replaceable) groupadd.8.xml:251(replaceable)
 #: chage.1.xml:233(replaceable)
 msgid "0"
 msgstr "0"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:177(para) useradd.8.xml:699(para) pwck.8.xml:248(para)
-#: passwd.1.xml:412(para) grpck.8.xml:221(para) groupmod.8.xml:189(para)
+#: userdel.8.xml:177(para) useradd.8.xml:699(para) pwck.8.xml:258(para)
+#: passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para)
 #: groupdel.8.xml:114(para) groupadd.8.xml:253(para) chage.1.xml:235(para)
 msgid "success"
 msgstr "успешное выполнение"
 
 # type: Content of: <refentry><refmeta><manvolnum>
 #: userdel.8.xml:181(replaceable) useradd.8.xml:703(replaceable)
-#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:252(replaceable)
-#: passwd.1.xml:45(manvolnum) passwd.1.xml:416(replaceable)
+#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:262(replaceable)
+#: passwd.1.xml:45(manvolnum) passwd.1.xml:415(replaceable)
 #: newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum)
-#: grpck.8.xml:225(replaceable) groups.1.xml:35(manvolnum)
+#: grpck.8.xml:220(replaceable) groups.1.xml:35(manvolnum)
 #: gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum)
 #: chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:35(manvolnum)
 #: chage.1.xml:239(replaceable)
@@ -1227,23 +1230,23 @@
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
 #: userdel.8.xml:187(replaceable) useradd.8.xml:709(replaceable)
-#: pwck.8.xml:258(replaceable) passwd.1.xml:422(replaceable)
-#: grpck.8.xml:231(replaceable) groupmod.8.xml:193(replaceable)
+#: pwck.8.xml:268(replaceable) passwd.1.xml:421(replaceable)
+#: grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable)
 #: groupdel.8.xml:118(replaceable) groupadd.8.xml:257(replaceable)
 #: chage.1.xml:245(replaceable)
 msgid "2"
 msgstr "2"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:189(para) useradd.8.xml:711(para) pwck.8.xml:254(para)
-#: grpck.8.xml:227(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
+#: userdel.8.xml:189(para) useradd.8.xml:711(para) pwck.8.xml:264(para)
+#: grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
 #: groupadd.8.xml:259(para) chage.1.xml:247(para)
 msgid "invalid command syntax"
 msgstr "ошибка в параметрах команды"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
 #: userdel.8.xml:193(replaceable) useradd.8.xml:727(replaceable)
-#: pwck.8.xml:282(replaceable) passwd.1.xml:446(replaceable)
+#: pwck.8.xml:292(replaceable) passwd.1.xml:445(replaceable)
 #: groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
 msgid "6"
 msgstr "6"
@@ -2243,21 +2246,21 @@
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
 #: useradd.8.xml:715(replaceable) shadow.3.xml:35(manvolnum)
-#: pwck.8.xml:264(replaceable) passwd.1.xml:428(replaceable)
-#: grpck.8.xml:237(replaceable) groupmod.8.xml:199(replaceable)
+#: pwck.8.xml:274(replaceable) passwd.1.xml:427(replaceable)
+#: grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable)
 #: groupadd.8.xml:263(replaceable)
 msgid "3"
 msgstr "3"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:717(para) passwd.1.xml:448(para) groupmod.8.xml:201(para)
+#: useradd.8.xml:717(para) passwd.1.xml:447(para) groupmod.8.xml:201(para)
 #: groupadd.8.xml:265(para)
 msgid "invalid argument to option"
 msgstr "недопустимое значение параметра"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: useradd.8.xml:721(replaceable) pwck.8.xml:270(replaceable)
-#: passwd.1.xml:434(replaceable) grpck.8.xml:243(replaceable)
+#: useradd.8.xml:721(replaceable) pwck.8.xml:280(replaceable)
+#: passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable)
 #: groupmod.8.xml:205(replaceable) groupadd.8.xml:269(replaceable)
 msgid "4"
 msgstr "4"
@@ -2353,11 +2356,11 @@
 
 # type: Content of: <refentry><refsect1><para><citerefentry><manvolnum>
 #: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
-#: pwck.8.xml:276(replaceable) porttime.5.xml:35(manvolnum)
-#: passwd.5.xml:35(manvolnum) passwd.1.xml:440(replaceable)
+#: pwck.8.xml:286(replaceable) porttime.5.xml:35(manvolnum)
+#: passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable)
 #: login.defs.5.xml:98(manvolnum) login.access.5.xml:36(manvolnum)
 #: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
-#: grpck.8.xml:249(replaceable) faillog.5.xml:35(manvolnum)
+#: grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
 msgid "5"
 msgstr "5"
 
@@ -2687,12 +2690,20 @@
 "протоколируются системой с целью обнаружения злоупотреблений."
 
 #: su.1.xml:106(para)
+#, fuzzy
+#| msgid ""
+#| "The current environment is passed to the new shell. The value of <envar>"
+#| "$PATH</envar> is reset to <filename>/bin:/usr/bin</filename> for normal "
+#| "users, or <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the "
+#| "superuser. This may be changed with the <emphasis>ENV_PATH</emphasis> and "
+#| "<emphasis>ENV_SUPATH</emphasis> definitions in <filename>/etc/login.defs</"
+#| "filename>."
 msgid ""
 "The current environment is passed to the new shell. The value of <envar>"
 "$PATH</envar> is reset to <filename>/bin:/usr/bin</filename> for normal "
 "users, or <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the "
-"superuser. This may be changed with the <emphasis>ENV_PATH</emphasis> and "
-"<emphasis>ENV_SUPATH</emphasis> definitions in <filename>/etc/login.defs</"
+"superuser. This may be changed with the <option>ENV_PATH</option> and "
+"<option>ENV_SUPATH</option> definitions in <filename>/etc/login.defs</"
 "filename>."
 msgstr ""
 "Текущая рабочая среда передаётся новой оболочке. Значение <envar>$PATH</"
@@ -2764,11 +2775,11 @@
 msgstr "Оболочка, которая будет запущена."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: su.1.xml:167(para)
+#: su.1.xml:170(para)
 msgid "The shell specified with --shell."
 msgstr "Оболочка указанная в параметре --shell."
 
-#: su.1.xml:170(para)
+#: su.1.xml:173(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
@@ -2777,7 +2788,7 @@
 "задаётся переменной среды <envar>$SHELL</envar>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: su.1.xml:177(para)
+#: su.1.xml:180(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
@@ -2786,7 +2797,7 @@
 "заданного пользователя."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: su.1.xml:183(para)
+#: su.1.xml:186(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
@@ -2802,7 +2813,7 @@
 "Запущенная оболочка выбирается из (в порядке убывания приоритета): "
 "<placeholder-1/>"
 
-#: su.1.xml:190(para)
+#: su.1.xml:191(para)
 msgid ""
 "If the target user has a restricted shell (i.e. the shell field of this "
 "user's entry in <filename>/etc/passwd</filename> is not listed in <filename>/"
@@ -2817,7 +2828,7 @@
 "учётную запись, если <command>su</command> не была запущена "
 "суперпользователем."
 
-#: su.1.xml:201(term)
+#: su.1.xml:202(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2825,13 +2836,35 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
+#: su.1.xml:211(envar)
+msgid "$PATH"
+msgstr ""
+
+#: su.1.xml:213(para)
+msgid ""
+"reset according to the <filename>/etc/login.defs</filename> options "
+"<option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
+msgstr ""
+
+#: su.1.xml:222(envar)
+msgid "$IFS"
+msgstr ""
+
+#: su.1.xml:224(para)
+msgid ""
+"reset to <quote>&lt;space&gt;&lt;tab&gt;&lt;newline&gt;</quote>, if it was "
+"set."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: su.1.xml:206(para)
-msgid "Preserve the current environment."
+#: su.1.xml:207(para)
+#, fuzzy
+#| msgid "Preserve the current environment."
+msgid "Preserve the current environment, except for: <placeholder-1/>"
 msgstr "Сохранить имеющуюся рабочую среду."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: su.1.xml:207(para)
+#: su.1.xml:233(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
@@ -2839,8 +2872,53 @@
 "Если заданный пользователь имеет ограниченную оболочку, то этот параметр не "
 "сработает (если <command>su</command> не запускается суперпользователем)."
 
+#: su.1.xml:242(para)
+msgid ""
+"The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, "
+"<envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> "
+"environment variables are reset."
+msgstr ""
+
+#: su.1.xml:251(para)
+msgid ""
+"If <option>--login</option> is not used, the environment is copied, except "
+"for the variables above."
+msgstr ""
+
+#: su.1.xml:258(para)
+msgid ""
+"If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>"
+"$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> "
+"environment variables are copied if they were set."
+msgstr ""
+
+#: su.1.xml:268(para)
+msgid ""
+"If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</"
+"envar>, and <envar>$MAIL</envar> environment variables are set according to "
+"the <filename>/etc/login.defs</filename> options <option>ENV_TZ</option>, "
+"<option>ENV_HZ</option>, <option>MAIL_DIR</option>, and <option>MAIL_FILE</"
+"option> (see below)."
+msgstr ""
+
+#: su.1.xml:281(para)
+msgid ""
+"If <option>--login</option> is used, other environment variables might be "
+"set by the <option>ENVIRON_FILE</option> file (see below)."
+msgstr ""
+
+#: su.1.xml:289(para)
+msgid "Other environment might be set by PAM modules."
+msgstr ""
+
+#: su.1.xml:237(para)
+msgid ""
+"Note that the default behavior for the environment is the following: "
+"<placeholder-1/>"
+msgstr ""
+
 # type: Content of: <refentry><refsect1><para>
-#: su.1.xml:218(para)
+#: su.1.xml:303(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -2935,6 +3013,17 @@
 "Every line should be in the form name=value."
 msgstr ""
 
+# type: Content of: <refentry><refsect1><para>
+#: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
+#, fuzzy
+#| msgid ""
+#| "The file is formatted like this, with lines starting with a # being "
+#| "treated as comment lines and ignored;"
+msgid "Lines starting with a # are treated as comment lines and ignored."
+msgstr ""
+"Формат файла показан ниже, строки начинающиеся с # считаются комментарием и "
+"игнорируются;"
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
@@ -3086,14 +3175,22 @@
 "sulog file logging."
 msgstr ""
 
-#: su.1.xml:272(para)
+#: su.1.xml:363(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>sh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -3182,8 +3279,9 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>"
+"citerefentry><phrase condition=\"gshadow\">, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry></phrase>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -3199,7 +3297,7 @@
 # type: Content of: <refentry><refsect1><para><emphasis>
 #: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
 #: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
-#: pwck.8.xml:60(replaceable) pwck.8.xml:74(replaceable)
+#: pwck.8.xml:60(replaceable) pwck.8.xml:75(replaceable)
 #: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
 msgid "shadow"
 msgstr "shadow"
@@ -3464,8 +3562,25 @@
 msgid "This field is reserved for future use."
 msgstr "sp_flag - зарезервировано"
 
-#: shadow.5.xml:249(para)
+# type: Content of: <refentry><refsect1><para><filename>
+#: shadow.5.xml:245(filename)
 #, fuzzy
+#| msgid "/etc/shadow"
+msgid "/etc/shadow-"
+msgstr "/etc/shadow"
+
+#: shadow.5.xml:247(para)
+msgid "Backup file for /etc/shadow."
+msgstr ""
+
+#: shadow.5.xml:248(para) passwd.5.xml:134(para)
+msgid ""
+"Note that this file is used by the tools of the shadow toolsuite, but not by "
+"all user and password management tools."
+msgstr ""
+
+#: shadow.5.xml:259(para)
+#, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
 #| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -3989,13 +4104,13 @@
 msgstr "проверяет целостность файлов паролей"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:140(option)
+#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:171(option)
 msgid "-q"
 msgstr "-q"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: pwck.8.xml:53(arg) pwck.8.xml:161(option) grpck.8.xml:58(arg)
-#: grpck.8.xml:130(option)
+#: pwck.8.xml:53(arg) pwck.8.xml:192(option) grpck.8.xml:58(arg)
+#: grpck.8.xml:149(option)
 msgid "-s"
 msgstr "-s"
 
@@ -4008,20 +4123,27 @@
 msgstr "passwd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: pwck.8.xml:68(arg) pwck.8.xml:151(option) login.1.xml:222(option)
-#: grpck.8.xml:49(arg) grpck.8.xml:120(option)
+#: pwck.8.xml:68(arg) pwck.8.xml:182(option) login.1.xml:222(option)
+#: grpck.8.xml:49(arg) grpck.8.xml:139(option)
 msgid "-r"
 msgstr "-r"
 
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:82(para)
+#: pwck.8.xml:84(para)
+#, fuzzy
+#| msgid ""
+#| "The <command>pwck</command> command verifies the integrity of the system "
+#| "authentication information. All entries in the <filename>/etc/passwd</"
+#| "filename> and <filename>/etc/shadow</filename> are checked to see that "
+#| "the entry has the proper format and valid data in each field. The user is "
+#| "prompted to delete entries that are improperly formatted or which have "
+#| "other uncorrectable errors."
 msgid ""
-"The <command>pwck</command> command verifies the integrity of the system "
-"authentication information. All entries in the <filename>/etc/passwd</"
-"filename> and <filename>/etc/shadow</filename> are checked to see that the "
-"entry has the proper format and valid data in each field. The user is "
-"prompted to delete entries that are improperly formatted or which have other "
-"uncorrectable errors."
+"The <command>pwck</command> command verifies the integrity of the users and "
+"authentication information. It checks that all entries in <filename>/etc/"
+"passwd</filename> and <filename>/etc/shadow</filename> have the proper "
+"format and contain valid data. The user is prompted to delete entries that "
+"are improperly formatted or which have other uncorrectable errors."
 msgstr ""
 "Программа <command>pwck</command> проверяет корректность аутентификационной "
 "информации в системе. Проверяется формат всех записей файлов <filename>/etc/"
@@ -4031,42 +4153,82 @@
 "которых невозможно."
 
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:91(para) grpck.8.xml:80(para)
+#: pwck.8.xml:93(para) grpck.8.xml:80(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr "Выполняются следующие проверки:"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:94(para) grpck.8.xml:84(para)
+#: pwck.8.xml:96(para) grpck.8.xml:84(para)
 msgid "the correct number of fields"
 msgstr "правильное количество полей"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:97(para)
-msgid "a unique user name"
+#: pwck.8.xml:99(para)
+#, fuzzy
+#| msgid "a unique user name"
+msgid "a unique and valid user name"
 msgstr "уникальность имени пользователя"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:100(para)
+#: pwck.8.xml:102(para)
 msgid "a valid user and group identifier"
 msgstr "допустимость идентификатора пользователя и группы"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:103(para)
+#: pwck.8.xml:105(para)
 msgid "a valid primary group"
 msgstr "допустимость первичной группы"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:106(para)
+#: pwck.8.xml:108(para)
 msgid "a valid home directory"
 msgstr "допустимость домашнего каталога"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:109(para)
+#: pwck.8.xml:111(para)
 msgid "a valid login shell"
 msgstr "допустимость регистрационной оболочки"
 
+#: pwck.8.xml:115(para)
+msgid ""
+"<filename>shadow</filename> checks are enabled when a second file parameter "
+"is specified or when <filename>/etc/shadow</filename> exists on the system."
+msgstr ""
+
+#: pwck.8.xml:120(para)
+msgid "These checks are the following:"
+msgstr ""
+
+#: pwck.8.xml:125(para)
+msgid ""
+"every passwd entry has a matching shadow entry, and every shadow entry has a "
+"matching passwd entry"
+msgstr ""
+
+#: pwck.8.xml:131(para)
+msgid "passwords are specified in the shadowed file"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: pwck.8.xml:134(para)
+#, fuzzy
+#| msgid "the correct number of fields"
+msgid "shadow entries have the correct number of fields"
+msgstr "правильное количество полей"
+
+#: pwck.8.xml:137(para)
+msgid "shadow entries are unique in shadow"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: pwck.8.xml:140(para)
+#, fuzzy
+#| msgid "days before password may be changed"
+msgid "the last password changes are not in the future"
+msgstr "число дней, перед тем как пароль может быть изменён"
+
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:113(para)
+#: pwck.8.xml:144(para)
 msgid ""
 "The checks for correct number of fields and unique user name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
@@ -4085,7 +4247,7 @@
 "пользователю предлагается запустить команду <command>usermod</command>, "
 "чтобы исправить ошибку."
 
-#: pwck.8.xml:124(para)
+#: pwck.8.xml:155(para)
 msgid ""
 "The commands which operate on the <filename>/etc/passwd</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>pwck</command> "
@@ -4096,12 +4258,12 @@
 "нужно использовать <command>pwck</command> для удаления испорченной записи."
 
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:134(para)
+#: pwck.8.xml:165(para)
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr "Параметры команды <command>pwck</command>:"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:174(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
@@ -4109,11 +4271,11 @@
 "Сообщать только об ошибках. Предупреждения, которые не требуют от "
 "пользователя никаких действий, показаны не будут."
 
-#: pwck.8.xml:154(para)
+#: pwck.8.xml:185(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr "Выполнять команду <command>pwck</command> в режиме \"только чтение\"."
 
-#: pwck.8.xml:164(para)
+#: pwck.8.xml:195(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
@@ -4121,7 +4283,7 @@
 "Отсортировать все записи в файлах <filename>/etc/passwd</filename> и "
 "<filename>/etc/shadow</filename> по числовому идентификатору пользователя."
 
-#: pwck.8.xml:172(para)
+#: pwck.8.xml:203(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename>. The user may select "
@@ -4133,65 +4295,35 @@
 "указать другие файлы с помощью параметров <emphasis remap=\"I\">passwd</"
 "emphasis> и <emphasis remap=\"I\">shadow</emphasis>"
 
-#: pwck.8.xml:221(para)
-#, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
-#| "citerefentry>, <citerefentry><refentrytitle>group</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>."
-msgid ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>grpck</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
-msgstr ""
-"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>group</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
-
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:260(para)
+#: pwck.8.xml:270(para)
 msgid "one or more bad password entries"
 msgstr "есть одна или более записей с недопустимыми паролями"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:266(para)
+#: pwck.8.xml:276(para)
 msgid "can't open password files"
 msgstr "не удалось открыть файл паролей"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:272(para)
+#: pwck.8.xml:282(para)
 msgid "can't lock password files"
 msgstr "не удалось заблокировать файл паролей"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:278(para)
+#: pwck.8.xml:288(para)
 msgid "can't update password files"
 msgstr "не удалось изменить файл паролей"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:284(para)
+#: pwck.8.xml:294(para)
 #, fuzzy
 #| msgid "can't open password files"
 msgid "can't sort password files"
 msgstr "не удалось открыть файл паролей"
 
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:242(para)
+#: pwck.8.xml:252(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4199,6 +4331,36 @@
 "Команда <command>pwck</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
+#: pwck.8.xml:303(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>."
+msgid ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>grpck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
+msgstr ""
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+
 # type: Content of: <refentry><refsect1><para><emphasis>
 #: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
 msgid "porttime"
@@ -4450,8 +4612,19 @@
 msgid "optional encrypted password file"
 msgstr "необязательный файл с шифрованными паролями"
 
-#: passwd.5.xml:135(para)
+# type: Content of: <refentry><refsect1><para><filename>
+#: passwd.5.xml:131(filename)
 #, fuzzy
+#| msgid "/etc/passwd"
+msgid "/etc/passwd-"
+msgstr "/etc/passwd"
+
+#: passwd.5.xml:133(para)
+msgid "Backup file for /etc/passwd."
+msgstr ""
+
+#: passwd.5.xml:145(para)
+#, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
 #| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -4769,9 +4942,13 @@
 msgid "Users with a locked password are not allowed to change their password."
 msgstr ""
 
-#: passwd.1.xml:247(term) chage.1.xml:138(term)
+#: passwd.1.xml:247(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+#| "replaceable>"
 msgid ""
-"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+"<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--mindays</option><replaceable>МИН_ДНЕЙ</"
@@ -4842,14 +5019,13 @@
 msgid ""
 "Unlock the password of the named account. This option re-enables a password "
 "by changing the password back to its previous value (to the value before "
-"using the <option>-l</option> option), and by resetting the account expiry "
-"field."
+"using the <option>-l</option> option)."
 msgstr ""
 "Разблокировать указанную учётную запись. Этот параметр активирует учётную "
 "запись изменяя пароль на прежнее значение (которое было перед использованием "
 "параметра <option>-l</option>)."
 
-#: passwd.1.xml:311(term)
+#: passwd.1.xml:310(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -4858,7 +5034,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:315(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -4870,7 +5046,7 @@
 "дней перед тем как пароль устареет, в течении которых пользователю будут "
 "напоминать, что пароль скоро устареет."
 
-#: passwd.1.xml:324(term)
+#: passwd.1.xml:323(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -4879,7 +5055,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:328(para)
+#: passwd.1.xml:327(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -4888,7 +5064,7 @@
 "рабочим. После <replaceable>МАКС_ДНЕЙ</replaceable> пароль нужно изменить."
 
 # type: Content of: <refentry><refsect1><para>
-#: passwd.1.xml:340(para)
+#: passwd.1.xml:339(para)
 #, fuzzy
 #| msgid ""
 #| "Not all options may be supported. Password complexity checking may vary "
@@ -4905,13 +5081,13 @@
 "сложности, чтобы ему нормально работалось. Пользователи не могут изменять "
 "свои пароли в системе, если включён NIS и они не вошли на сервер NIS."
 
-#: passwd.1.xml:345(para)
+#: passwd.1.xml:344(para)
 msgid ""
 "Users may not be able to change their password on a system if NIS is enabled "
 "and they are not logged into the NIS server."
 msgstr ""
 
-#: passwd.1.xml:350(para)
+#: passwd.1.xml:349(para)
 msgid ""
 "<command>passwd</command> uses PAM to authenticate users and to change their "
 "passwords."
@@ -5109,45 +5285,45 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: passwd.1.xml:396(filename)
+#: passwd.1.xml:395(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/passwd"
 
-#: passwd.1.xml:398(para)
+#: passwd.1.xml:397(para)
 msgid "PAM configuration for <command>passwd</command>."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:418(para) chage.1.xml:241(para)
+#: passwd.1.xml:417(para) chage.1.xml:241(para)
 msgid "permission denied"
 msgstr "доступ запрещён"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:424(para)
+#: passwd.1.xml:423(para)
 msgid "invalid combination of options"
 msgstr "недопустимая комбинация параметров"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:430(para)
+#: passwd.1.xml:429(para)
 msgid "unexpected failure, nothing done"
 msgstr "неожиданная ошибка при работе, ничего не сделано"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:436(para)
+#: passwd.1.xml:435(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr ""
 "неожиданная ошибка при работе, отсутствует файл <filename>passwd</filename>"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:442(para)
+#: passwd.1.xml:441(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 "файл <filename>passwd</filename> занят другой программой, попробуйте ещё раз"
 
 # type: Content of: <refentry><refsect1><para>
-#: passwd.1.xml:406(para)
+#: passwd.1.xml:405(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5155,7 +5331,7 @@
 "Программа <command>passwd</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: passwd.1.xml:457(para)
+#: passwd.1.xml:456(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
@@ -5167,10 +5343,11 @@
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry "
-"condition=\"no_pam\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5568,7 +5745,7 @@
 # type: Content of: <refentry><refsect1><para><emphasis>
 #: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
 #: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
-#: groupadd.8.xml:58(replaceable) gpasswd.1.xml:63(replaceable)
+#: groupadd.8.xml:58(replaceable) gpasswd.1.xml:66(replaceable)
 msgid "group"
 msgstr "группа"
 
@@ -5635,8 +5812,9 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+"citerefentry><phrase condition=\"gshadow\">, <citerefentry condition="
+"\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry></phrase>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -6167,7 +6345,7 @@
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
 #: login.defs.5.xml:258(term) gpasswd.1.xml:42(refentrytitle)
-#: gpasswd.1.xml:47(refname) gpasswd.1.xml:58(command)
+#: gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
@@ -6760,7 +6938,7 @@
 msgstr ""
 "при существовании файла системные сообщения при входе в систему не выводятся"
 
-#: login.1.xml:371(para)
+#: login.1.xml:377(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -7359,12 +7537,12 @@
 #| "prompted to delete entries that are improperly formatted or which have "
 #| "other uncorrectable errors."
 msgid ""
-"The <command>grpck</command> command verifies the integrity of the system "
-"authentication information. All entries in <filename>/etc/group</"
+"The <command>grpck</command> command verifies the integrity of the groups "
+"information. It checks that all entries in <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\">and <filename>/etc/gshadow</"
-"filename></phrase> are checked to see that the entry has the proper format "
-"and valid data in each field. The user is prompted to delete entries that "
-"are improperly formatted or which have other uncorrectable errors."
+"filename></phrase> have the proper format and contain valid data. The user "
+"is prompted to delete entries that are improperly formatted or which have "
+"other uncorrectable errors."
 msgstr ""
 "Программа <command>grpck</command> проверяет корректность аутентификационной "
 "информации в системе. Проверяется формат всех записей файлов <filename>/etc/"
@@ -7375,24 +7553,68 @@
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: grpck.8.xml:87(para)
-msgid "a unique group name"
+#, fuzzy
+#| msgid "a unique group name"
+msgid "a unique and valid group name"
 msgstr "уникальность имени группы"
 
+#: grpck.8.xml:90(para)
+#, fuzzy
+#| msgid ""
+#| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
+#| "shadow</filename> by UID."
+msgid ""
+"a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/"
+"group</filename> only)</phrase>"
+msgstr ""
+"Отсортировать все записи в файлах <filename>/etc/passwd</filename> и "
+"<filename>/etc/shadow</filename> по числовому идентификатору пользователя."
+
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: grpck.8.xml:90(para)
-msgid "a valid list of members and administrators"
+#: grpck.8.xml:97(para)
+#, fuzzy
+#| msgid "a valid list of members and administrators"
+msgid ""
+"a valid list of members <phrase condition=\"gshadow\"> and administrators</"
+"phrase>"
 msgstr "корректный список членов и администраторов"
 
+#: grpck.8.xml:103(para)
+#, fuzzy
+#| msgid ""
+#| "These four programs all operate on the normal and shadow password and "
+#| "group files: <filename>/etc/passwd</filename>, <filename>/etc/group</"
+#| "filename>, <filename>/etc/shadow</filename>, and <filename>/etc/gshadow</"
+#| "filename>."
+msgid ""
+"a corresponding entry in the <filename>/etc/gshadow</filename> file "
+"(respectively <filename>/etc/group</filename> for the <filename>gshadow</"
+"filename> checks)"
+msgstr ""
+"Эти четыре программы работают с файлами обычных или теневых паролей "
+"пользователей и групп: <filename>/etc/passwd</filename>, <filename>/etc/"
+"group</filename>, <filename>/etc/shadow</filename> и <filename>/etc/gshadow</"
+"filename>."
+
 # type: Content of: <refentry><refsect1><para>
-#: grpck.8.xml:94(para)
+#: grpck.8.xml:111(para)
+#, fuzzy
+#| msgid ""
+#| "The checks for correct number of fields and unique group name are fatal. "
+#| "If the entry has the wrong number of fields, the user will be prompted to "
+#| "delete the entire line. If the user does not answer affirmatively, all "
+#| "further checks are bypassed. An entry with a duplicated group name is "
+#| "prompted for deletion, but the remaining checks will still be made. All "
+#| "other errors are warnings and the user is encouraged to run the "
+#| "<command>groupmod</command> command to correct the error."
 msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
-"the entry has the wrong number of fields, the user will be prompted to "
-"delete the entire line. If the user does not answer affirmatively, all "
-"further checks are bypassed. An entry with a duplicated group name is "
-"prompted for deletion, but the remaining checks will still be made. All "
-"other errors are warnings and the user is encouraged to run the "
-"<command>groupmod</command> command to correct the error."
+"an entry has the wrong number of fields, the user will be prompted to delete "
+"the entire line. If the user does not answer affirmatively, all further "
+"checks are bypassed. An entry with a duplicated group name is prompted for "
+"deletion, but the remaining checks will still be made. All other errors are "
+"warnings and the user is encouraged to run the <command>groupmod</command> "
+"command to correct the error."
 msgstr ""
 "Ошибки в количестве полей и уникальности имён групп невосстановимы. Если "
 "запись содержит неверное число полей, пользователя попросят подтвердить "
@@ -7403,11 +7625,19 @@
 "предлагается запустить команду <command>groupmod</command> чтобы исправить "
 "ошибку."
 
-#: grpck.8.xml:105(para)
+#: grpck.8.xml:122(para)
+#, fuzzy
+#| msgid ""
+#| "The commands which operate on the <filename>/etc/group</filename> file "
+#| "are not able to alter corrupted or duplicated entries. <command>grpck</"
+#| "command> should be used in those circumstances to remove the offending "
+#| "entry."
 msgid ""
-"The commands which operate on the <filename>/etc/group</filename> file are "
-"not able to alter corrupted or duplicated entries. <command>grpck</command> "
-"should be used in those circumstances to remove the offending entry."
+"The commands which operate on the <filename>/etc/group</filename><phrase "
+"condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
+"<filename>/etc/gshadow</filename> files</phrase> are not able to alter "
+"corrupted or duplicated entries. <command>grpck</command> should be used in "
+"those circumstances to remove the offending entries."
 msgstr ""
 "Команды, которые работают с файлом <filename>/etc/group</filename> не "
 "способны изменить повреждённые или дублирующиеся записи. Как раз в этом "
@@ -7415,20 +7645,20 @@
 "испорченной записи."
 
 # type: Content of: <refentry><refsect1><para>
-#: grpck.8.xml:115(para)
+#: grpck.8.xml:134(para)
 #, fuzzy
 #| msgid "The options which apply to the <command>pwck</command> command are:"
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr "Параметры команды <command>pwck</command>:"
 
-#: grpck.8.xml:122(para)
+#: grpck.8.xml:141(para)
 msgid ""
 "Execute the <command>grpck</command> command in read-only mode. This causes "
 "all questions regarding changes to be answered <emphasis>no</emphasis> "
 "without user intervention."
 msgstr ""
 
-#: grpck.8.xml:132(para)
+#: grpck.8.xml:151(para)
 #, fuzzy
 #| msgid ""
 #| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
@@ -7440,7 +7670,7 @@
 "Отсортировать все записи в файлах <filename>/etc/passwd</filename> и "
 "<filename>/etc/shadow</filename> по числовому идентификатору пользователя."
 
-#: grpck.8.xml:141(para)
+#: grpck.8.xml:160(para)
 #, fuzzy
 #| msgid ""
 #| "By default, <command>pwck</command> operates on the files <filename>/etc/"
@@ -7460,7 +7690,36 @@
 "указать другие файлы с помощью параметров <emphasis remap=\"I\">passwd</"
 "emphasis> и <emphasis remap=\"I\">shadow</emphasis>"
 
-#: grpck.8.xml:191(para)
+# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: grpck.8.xml:228(para)
+msgid "one or more bad group entries"
+msgstr "есть одна или более неправильных записей групп"
+
+# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: grpck.8.xml:234(para)
+msgid "can't open group files"
+msgstr "не удалось открыть файл групп"
+
+# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: grpck.8.xml:240(para)
+msgid "can't lock group files"
+msgstr "не удалось заблокировать файл групп"
+
+# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: grpck.8.xml:246(para)
+msgid "can't update group files"
+msgstr "не удалось изменить файл групп"
+
+# type: Content of: <refentry><refsect1><para>
+#: grpck.8.xml:210(para)
+msgid ""
+"The <command>grpck</command> command exits with the following values: "
+"<placeholder-1/>"
+msgstr ""
+"Команда <command>grpck</command> завершая работу, возвращает следующие "
+"значения: <placeholder-1/>"
+
+#: grpck.8.xml:255(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -7475,13 +7734,14 @@
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>groupmod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
-"condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-"manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition="
+"\"gshadow\"><citerefentry><refentrytitle>gshadow</"
+"refentrytitle><manvolnum>5</manvolnum>, </citerefentry>, </"
+"phrase><citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>pwck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -7493,35 +7753,6 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: grpck.8.xml:233(para)
-msgid "one or more bad group entries"
-msgstr "есть одна или более неправильных записей групп"
-
-# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: grpck.8.xml:239(para)
-msgid "can't open group files"
-msgstr "не удалось открыть файл групп"
-
-# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: grpck.8.xml:245(para)
-msgid "can't lock group files"
-msgstr "не удалось заблокировать файл групп"
-
-# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: grpck.8.xml:251(para)
-msgid "can't update group files"
-msgstr "не удалось изменить файл групп"
-
-# type: Content of: <refentry><refsect1><para>
-#: grpck.8.xml:215(para)
-msgid ""
-"The <command>grpck</command> command exits with the following values: "
-"<placeholder-1/>"
-msgstr ""
-"Команда <command>grpck</command> завершая работу, возвращает следующие "
-"значения: <placeholder-1/>"
-
 # type: Content of: <refentry><refsect1><para><emphasis>
 #: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
 #: groups.1.xml:45(command)
@@ -8216,27 +8447,25 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:50(phrase)
+# type: Content of: <refentry><refnamediv><refpurpose>
+#: gpasswd.1.xml:49(phrase)
 #, fuzzy
-msgid "and <placeholder-1/> files"
-msgstr "-a <placeholder-1/>"
+#| msgid "administer the <placeholder-1/> file"
+msgid "administer <placeholder-1/>"
+msgstr "управляет файлом <placeholder-1/>"
 
 #: gpasswd.1.xml:52(phrase)
-msgid "file"
-msgstr ""
-
-#: gpasswd.1.xml:48(refpurpose)
 #, fuzzy
-msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
+msgid "administer <placeholder-1/> and <placeholder-2/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: gpasswd.1.xml:60(replaceable)
+#: gpasswd.1.xml:63(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "параметры"
 
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:73(para)
 #, fuzzy
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
@@ -8252,12 +8481,12 @@
 "администратора(ов) и параметр <option>-M</option> для определения списка "
 "членов, а также имеет все права администраторов и членов группы."
 
-#: gpasswd.1.xml:78(para)
+#: gpasswd.1.xml:81(para)
 #, fuzzy
 msgid ""
 "System administrators 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."
+"administrator(s) and the <option>-M</option> option to define members. They "
+"have all rights of group administrators and members."
 msgstr ""
 "Программа <command>gpasswd</command> используется для управления файлом "
 "<filename>/etc/group</filename> (а также файлом <filename>/etc/gshadow</"
@@ -8267,7 +8496,7 @@
 "администратора(ов) и параметр <option>-M</option> для определения списка "
 "членов, а также имеет все права администраторов и членов группы."
 
-#: gpasswd.1.xml:83(para)
+#: gpasswd.1.xml:86(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -8275,7 +8504,7 @@
 "of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:90(para)
+#: gpasswd.1.xml:93(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still use "
@@ -8289,12 +8518,12 @@
 "не члены группы должны ввести пароль."
 
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: gpasswd.1.xml:98(title)
+#: gpasswd.1.xml:101(title)
 msgid "Notes about group passwords"
 msgstr "Замечания о паролях групп"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: gpasswd.1.xml:99(para)
+#: gpasswd.1.xml:102(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 "
@@ -8304,7 +8533,7 @@
 "более одного человека. Однако, группы являются полезным инструментом "
 "совместной работы различных пользователей."
 
-#: gpasswd.1.xml:110(para)
+#: gpasswd.1.xml:113(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
@@ -8314,17 +8543,17 @@
 "используются только если <command>login</command> запускается "
 "суперпользователем."
 
-#: gpasswd.1.xml:114(para)
+#: gpasswd.1.xml:117(para)
 msgid "The options cannot be combined."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: gpasswd.1.xml:117(para)
+#: gpasswd.1.xml:120(para)
 #, fuzzy
 msgid "The options which apply to the <command>gpasswd</command> command are:"
 msgstr "Параметры команды <command>passwd</command>:"
 
-#: gpasswd.1.xml:122(term)
+#: gpasswd.1.xml:125(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
@@ -8333,7 +8562,7 @@
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:126(para)
+#: gpasswd.1.xml:129(para)
 #, fuzzy
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
@@ -8342,7 +8571,7 @@
 "Имя группы будет изменено с <emphasis remap=\"I\">ГРУППА</emphasis> на "
 "<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
 
-#: gpasswd.1.xml:135(term)
+#: gpasswd.1.xml:138(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -8352,7 +8581,7 @@
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>ДНЕЙ</replaceable>"
 
-#: gpasswd.1.xml:139(para)
+#: gpasswd.1.xml:142(para)
 #, fuzzy
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
@@ -8361,33 +8590,33 @@
 "Имя группы будет изменено с <emphasis remap=\"I\">ГРУППА</emphasis> на "
 "<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
 
-#: gpasswd.1.xml:148(term)
+#: gpasswd.1.xml:151(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--remove</option>"
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
-#: gpasswd.1.xml:152(para)
+#: gpasswd.1.xml:155(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:163(term)
+#: gpasswd.1.xml:166(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:167(para)
+#: gpasswd.1.xml:170(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:178(term)
+#: gpasswd.1.xml:181(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
@@ -8400,12 +8629,12 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: gpasswd.1.xml:182(para)
+#: gpasswd.1.xml:185(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr "список администраторов группы, перечисленных через запятую"
 
-#: gpasswd.1.xml:190(term)
+#: gpasswd.1.xml:193(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
@@ -8417,12 +8646,12 @@
 "<option>-b</option>, <option>--before</option><replaceable>ДНЕЙ</replaceable>"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: gpasswd.1.xml:194(para)
+#: gpasswd.1.xml:197(para)
 #, fuzzy
 msgid "Set the list of group members."
 msgstr "список членов группы, перечисленных через запятую"
 
-#: gpasswd.1.xml:204(para)
+#: gpasswd.1.xml:207(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -8431,7 +8660,7 @@
 "server."
 msgstr ""
 
-#: gpasswd.1.xml:249(para)
+#: gpasswd.1.xml:252(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -8970,10 +9199,11 @@
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
-"condition=\"no_pam\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition="
+"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+"phrase><citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -9258,6 +9488,14 @@
 msgid "Show account aging information."
 msgstr "Показать информацию об устаревании учётной записи."
 
+#: chage.1.xml:138(term)
+msgid ""
+"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+"replaceable>"
+msgstr ""
+"<option>-m</option>, <option>--mindays</option><replaceable>МИН_ДНЕЙ</"
+"replaceable>"
+
 #: chage.1.xml:150(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
@@ -9372,6 +9610,10 @@
 msgid "translator-credits"
 msgstr "Yuri Kozlov <kozlov.y at gmail.com>, 2005, 2006"
 
+#, fuzzy
+#~ msgid "and <placeholder-1/> files"
+#~ msgstr "-a <placeholder-1/>"
+
 # type: Content of: <refentry><refsect1><para>
 #, fuzzy
 #~| msgid ""
@@ -9924,10 +10166,6 @@
 #~ "Если программа запущена без параметров, <command>useradd</command> "
 #~ "покажет текущие значения по умолчанию."
 
-# type: Content of: <refentry><refnamediv><refpurpose>
-#~ msgid "administer the <placeholder-1/> file"
-#~ msgstr "управляет файлом <placeholder-1/>"
-
 #~ msgid "-R <placeholder-1/>"
 #~ msgstr "-R <placeholder-1/>"
 

Modified: upstream/trunk/man/po/shadow-man-pages.pot
===================================================================
--- upstream/trunk/man/po/shadow-man-pages.pot	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/man/po/shadow-man-pages.pot	2009-07-24 01:13:21 UTC (rev 3042)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-05-22 13:15+0200\n"
+"POT-Creation-Date: 2009-07-24 03:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -33,7 +33,7 @@
 msgid "options"
 msgstr ""
 
-#: vipw.8.xml:66(title) usermod.8.xml:59(title) userdel.8.xml:60(title) useradd.8.xml:79(title) suauth.5.xml:50(title) su.1.xml:77(title) sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title) shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:81(title) porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title) nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title) logoutd.8.xml:50(title) login.defs.5.xml:107(title) login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title) lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title) groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title) groupdel.8.xml:57(title) groupadd.8.xml:64(title) gpasswd.1.xml:69(title) faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title) chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title) chfn.1.xml:63(title) chage.1.xml:55(title) 
+#: vipw.8.xml:66(title) usermod.8.xml:59(title) userdel.8.xml:60(title) useradd.8.xml:79(title) suauth.5.xml:50(title) su.1.xml:77(title) sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title) shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:83(title) porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title) nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title) logoutd.8.xml:50(title) login.defs.5.xml:107(title) login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title) lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title) groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title) groupdel.8.xml:57(title) groupadd.8.xml:64(title) gpasswd.1.xml:72(title) faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title) chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title) chfn.1.xml:63(title) chage.1.xml:55(title) 
 msgid "DESCRIPTION"
 msgstr ""
 
@@ -41,7 +41,7 @@
 msgid "The <command>vipw</command> and <command>vigr</command> commands edits the files <filename>/etc/passwd</filename> and <filename>/etc/group</filename>, respectively. With the <option>-s</option> flag, they will edit the shadow versions of those files, <filename>/etc/shadow</filename> and <filename>/etc/gshadow</filename>, respectively. The programs will set the appropriate locks to prevent file corruption. When looking for an editor, the programs will first try the environment variable <envar>$VISUAL</envar>, then the environment variable <envar>$EDITOR</envar>, and finally the default editor, <citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 msgstr ""
 
-#: vipw.8.xml:84(title) usermod.8.xml:67(title) userdel.8.xml:69(title) useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:133(title) passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title) lastlog.8.xml:66(title) grpck.8.xml:114(title) groupmod.8.xml:67(title) groupmems.8.xml:75(title) groupadd.8.xml:73(title) gpasswd.1.xml:109(title) faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:109(title) chgpasswd.8.xml:88(title) chage.1.xml:65(title) 
+#: vipw.8.xml:84(title) usermod.8.xml:67(title) userdel.8.xml:69(title) useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:164(title) passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title) lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title) groupmems.8.xml:75(title) groupadd.8.xml:73(title) gpasswd.1.xml:112(title) faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:109(title) chgpasswd.8.xml:88(title) chage.1.xml:65(title) 
 msgid "OPTIONS"
 msgstr ""
 
@@ -89,43 +89,43 @@
 msgid "Edit shadow or gshadow database."
 msgstr ""
 
-#: vipw.8.xml:124(title) usermod.8.xml:372(title) userdel.8.xml:140(title) useradd.8.xml:644(title) suauth.5.xml:168(title) su.1.xml:253(title) sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title) pwconv.8.xml:168(title) pwck.8.xml:196(title) porttime.5.xml:105(title) passwd.5.xml:116(title) passwd.1.xml:375(title) newusers.8.xml:357(title) newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title) login.1.xml:316(title) limits.5.xml:140(title) lastlog.8.xml:147(title) gshadow.5.xml:141(title) grpck.8.xml:166(title) groups.1.xml:75(title) groupmod.8.xml:164(title) groupmems.8.xml:168(title) groupdel.8.xml:89(title) groupadd.8.xml:200(title) gpasswd.1.xml:230(title) faillog.8.xml:202(title) faillog.5.xml:71(title) expiry.1.xml:68(title) chsh.1.xml:133(title) chpasswd.8.xml:208(title) chgpasswd.8.xml:184(title) chfn.1.xml:113(title) chage.1.xml:206(title) 
+#: vipw.8.xml:124(title) usermod.8.xml:372(title) userdel.8.xml:140(title) useradd.8.xml:644(title) suauth.5.xml:168(title) su.1.xml:338(title) sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title) pwconv.8.xml:168(title) pwck.8.xml:227(title) porttime.5.xml:105(title) passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(title) newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title) login.1.xml:316(title) limits.5.xml:140(title) lastlog.8.xml:147(title) gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title) groupmod.8.xml:164(title) groupmems.8.xml:168(title) groupdel.8.xml:89(title) groupadd.8.xml:200(title) gpasswd.1.xml:233(title) faillog.8.xml:202(title) faillog.5.xml:71(title) expiry.1.xml:68(title) chsh.1.xml:133(title) chpasswd.8.xml:208(title) chgpasswd.8.xml:184(title) chfn.1.xml:113(title) chage.1.xml:206(title) 
 msgid "FILES"
 msgstr ""
 
-#: vipw.8.xml:127(filename) usermod.8.xml:375(filename) userdel.8.xml:143(filename) useradd.8.xml:659(filename) sg.1.xml:103(filename) pwck.8.xml:199(filename) newusers.8.xml:372(filename) newgrp.1.xml:114(filename) gshadow.5.xml:144(filename) grpck.8.xml:169(filename) groups.1.xml:78(filename) groupmod.8.xml:167(filename) groupmems.8.xml:171(filename) groupdel.8.xml:92(filename) groupadd.8.xml:203(filename) gpasswd.1.xml:49(filename) gpasswd.1.xml:233(filename) chgpasswd.8.xml:187(filename) 
+#: vipw.8.xml:127(filename) usermod.8.xml:375(filename) userdel.8.xml:143(filename) useradd.8.xml:659(filename) sg.1.xml:103(filename) pwck.8.xml:230(filename) newusers.8.xml:372(filename) newgrp.1.xml:114(filename) gshadow.5.xml:144(filename) grpck.8.xml:188(filename) groups.1.xml:78(filename) groupmod.8.xml:167(filename) groupmems.8.xml:171(filename) groupdel.8.xml:92(filename) groupadd.8.xml:203(filename) gpasswd.1.xml:50(filename) gpasswd.1.xml:53(filename) gpasswd.1.xml:236(filename) chgpasswd.8.xml:187(filename) 
 msgid "/etc/group"
 msgstr ""
 
-#: vipw.8.xml:129(para) usermod.8.xml:377(para) userdel.8.xml:145(para) useradd.8.xml:661(para) sg.1.xml:105(para) pwck.8.xml:201(para) newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para) grpck.8.xml:171(para) groups.1.xml:80(para) groupmod.8.xml:169(para) groupmems.8.xml:173(para) groupdel.8.xml:94(para) groupadd.8.xml:205(para) gpasswd.1.xml:235(para) chgpasswd.8.xml:189(para) 
+#: vipw.8.xml:129(para) usermod.8.xml:377(para) userdel.8.xml:145(para) useradd.8.xml:661(para) sg.1.xml:105(para) pwck.8.xml:232(para) newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para) grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para) groupmems.8.xml:173(para) groupdel.8.xml:94(para) groupadd.8.xml:205(para) gpasswd.1.xml:238(para) chgpasswd.8.xml:189(para) 
 msgid "Group account information."
 msgstr ""
 
-#: vipw.8.xml:133(filename) usermod.8.xml:381(filename) useradd.8.xml:665(filename) sg.1.xml:109(filename) newusers.8.xml:378(filename) newgrp.1.xml:120(filename) gshadow.5.xml:150(filename) grpck.8.xml:175(filename) groupmod.8.xml:173(filename) groupmems.8.xml:177(filename) groupdel.8.xml:98(filename) groupadd.8.xml:209(filename) gpasswd.1.xml:50(filename) gpasswd.1.xml:239(filename) chgpasswd.8.xml:193(filename) 
+#: vipw.8.xml:133(filename) usermod.8.xml:381(filename) useradd.8.xml:665(filename) sg.1.xml:109(filename) newusers.8.xml:378(filename) newgrp.1.xml:120(filename) gshadow.5.xml:150(filename) grpck.8.xml:194(filename) groupmod.8.xml:173(filename) groupmems.8.xml:177(filename) groupdel.8.xml:98(filename) groupadd.8.xml:209(filename) gpasswd.1.xml:54(filename) gpasswd.1.xml:242(filename) chgpasswd.8.xml:193(filename) 
 msgid "/etc/gshadow"
 msgstr ""
 
-#: vipw.8.xml:135(para) usermod.8.xml:383(para) useradd.8.xml:667(para) sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para) gshadow.5.xml:152(para) grpck.8.xml:177(para) groupmod.8.xml:175(para) groupdel.8.xml:100(para) groupadd.8.xml:211(para) gpasswd.1.xml:241(para) chgpasswd.8.xml:195(para) 
+#: vipw.8.xml:135(para) usermod.8.xml:383(para) useradd.8.xml:667(para) sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para) gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para) groupdel.8.xml:100(para) groupadd.8.xml:211(para) gpasswd.1.xml:244(para) chgpasswd.8.xml:195(para) 
 msgid "Secure group account information."
 msgstr ""
 
-#: vipw.8.xml:139(filename) usermod.8.xml:387(filename) userdel.8.xml:155(filename) useradd.8.xml:647(filename) su.1.xml:256(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename) pwck.8.xml:205(filename) passwd.5.xml:119(filename) passwd.1.xml:378(filename) newusers.8.xml:360(filename) newgrp.1.xml:102(filename) login.1.xml:331(filename) grpck.8.xml:181(filename) expiry.1.xml:71(filename) chsh.1.xml:136(filename) chpasswd.8.xml:211(filename) chfn.1.xml:122(filename) chage.1.xml:210(filename) 
+#: vipw.8.xml:139(filename) usermod.8.xml:387(filename) userdel.8.xml:155(filename) useradd.8.xml:647(filename) su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename) pwck.8.xml:236(filename) passwd.5.xml:119(filename) passwd.1.xml:377(filename) newusers.8.xml:360(filename) newgrp.1.xml:102(filename) login.1.xml:331(filename) grpck.8.xml:200(filename) expiry.1.xml:71(filename) chsh.1.xml:136(filename) chpasswd.8.xml:211(filename) chfn.1.xml:122(filename) chage.1.xml:210(filename) 
 msgid "/etc/passwd"
 msgstr ""
 
-#: vipw.8.xml:141(para) usermod.8.xml:389(para) userdel.8.xml:157(para) useradd.8.xml:649(para) su.1.xml:258(para) sg.1.xml:93(para) shadow.5.xml:235(para) pwck.8.xml:207(para) passwd.5.xml:121(para) passwd.1.xml:380(para) newusers.8.xml:362(para) newgrp.1.xml:104(para) login.1.xml:333(para) grpck.8.xml:183(para) expiry.1.xml:73(para) chsh.1.xml:138(para) chpasswd.8.xml:213(para) chfn.1.xml:124(para) chage.1.xml:213(para) 
+#: vipw.8.xml:141(para) usermod.8.xml:389(para) userdel.8.xml:157(para) useradd.8.xml:649(para) su.1.xml:343(para) sg.1.xml:93(para) shadow.5.xml:235(para) pwck.8.xml:238(para) passwd.5.xml:121(para) passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para) login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para) chsh.1.xml:138(para) chpasswd.8.xml:213(para) chfn.1.xml:124(para) chage.1.xml:213(para) 
 msgid "User account information."
 msgstr ""
 
-#: vipw.8.xml:145(filename) usermod.8.xml:393(filename) userdel.8.xml:161(filename) useradd.8.xml:653(filename) su.1.xml:262(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename) shadow.3.xml:204(filename) pwck.8.xml:211(filename) passwd.5.xml:125(filename) passwd.1.xml:384(filename) newusers.8.xml:366(filename) newgrp.1.xml:108(filename) login.1.xml:337(filename) expiry.1.xml:77(filename) chpasswd.8.xml:217(filename) chage.1.xml:218(filename) 
+#: vipw.8.xml:145(filename) usermod.8.xml:393(filename) userdel.8.xml:161(filename) useradd.8.xml:653(filename) su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename) shadow.3.xml:204(filename) pwck.8.xml:242(filename) passwd.5.xml:125(filename) passwd.1.xml:383(filename) newusers.8.xml:366(filename) newgrp.1.xml:108(filename) login.1.xml:337(filename) expiry.1.xml:77(filename) chpasswd.8.xml:217(filename) chage.1.xml:218(filename) 
 msgid "/etc/shadow"
 msgstr ""
 
-#: vipw.8.xml:147(para) usermod.8.xml:395(para) userdel.8.xml:163(para) useradd.8.xml:655(para) su.1.xml:264(para) sg.1.xml:99(para) shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:213(para) passwd.1.xml:386(para) newusers.8.xml:368(para) newgrp.1.xml:110(para) login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:219(para) chage.1.xml:221(para) 
+#: vipw.8.xml:147(para) usermod.8.xml:395(para) userdel.8.xml:163(para) useradd.8.xml:655(para) su.1.xml:349(para) sg.1.xml:99(para) shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:244(para) passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para) login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:219(para) chage.1.xml:221(para) 
 msgid "Secure user account information."
 msgstr ""
 
-#: vipw.8.xml:154(title) usermod.8.xml:402(title) userdel.8.xml:248(title) useradd.8.xml:761(title) suauth.5.xml:197(title) su.1.xml:271(title) sg.1.xml:118(title) shadow.5.xml:248(title) shadow.3.xml:213(title) pwconv.8.xml:180(title) pwck.8.xml:220(title) porttime.5.xml:117(title) passwd.5.xml:134(title) passwd.1.xml:456(title) nologin.8.xml:64(title) newusers.8.xml:399(title) newgrp.1.xml:129(title) login.defs.5.xml:471(title) login.access.5.xml:108(title) login.1.xml:370(title) limits.5.xml:150(title) gshadow.5.xml:159(title) grpck.8.xml:190(title) groups.1.xml:87(title) groupmod.8.xml:233(title) groupmems.8.xml:186(title) groupdel.8.xml:146(title) groupadd.8.xml:291(title) gpasswd.1.xml:248(title) faillog.8.xml:214(title) faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title) chpasswd.8.xml:238(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title) chage.1.xml:261(title) 
+#: vipw.8.xml:154(title) usermod.8.xml:402(title) userdel.8.xml:248(title) useradd.8.xml:761(title) suauth.5.xml:197(title) su.1.xml:362(title) sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title) pwconv.8.xml:180(title) pwck.8.xml:302(title) porttime.5.xml:117(title) passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title) newusers.8.xml:399(title) newgrp.1.xml:129(title) login.defs.5.xml:471(title) login.access.5.xml:108(title) login.1.xml:376(title) limits.5.xml:150(title) gshadow.5.xml:159(title) grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title) groupmems.8.xml:186(title) groupdel.8.xml:146(title) groupadd.8.xml:291(title) gpasswd.1.xml:251(title) faillog.8.xml:214(title) faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title) chpasswd.8.xml:238(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title) chage.1.xml:261(title) 
 msgid "SEE ALSO"
 msgstr ""
 
@@ -329,7 +329,7 @@
 msgid "The SELinux user for the user's login. The default is to leave this field the blank, which causes the system to select the default SELinux user."
 msgstr ""
 
-#: usermod.8.xml:340(title) userdel.8.xml:221(title) useradd.8.xml:597(title) su.1.xml:217(title) shadow.3.xml:193(title) passwd.1.xml:339(title) newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title) groupdel.8.xml:65(title) groupadd.8.xml:224(title) gpasswd.1.xml:203(title) faillog.8.xml:191(title) chpasswd.8.xml:182(title) chgpasswd.8.xml:157(title) 
+#: usermod.8.xml:340(title) userdel.8.xml:221(title) useradd.8.xml:597(title) su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title) newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title) groupdel.8.xml:65(title) groupadd.8.xml:224(title) gpasswd.1.xml:206(title) faillog.8.xml:191(title) chpasswd.8.xml:182(title) chgpasswd.8.xml:157(title) 
 msgid "CAVEATS"
 msgstr ""
 
@@ -345,11 +345,11 @@
 msgid "You must make any changes involving NIS on the NIS server."
 msgstr ""
 
-#: usermod.8.xml:359(title) userdel.8.xml:125(title) useradd.8.xml:621(title) su.1.xml:225(title) sg.1.xml:76(title) pwconv.8.xml:146(title) pwck.8.xml:182(title) passwd.1.xml:357(title) newusers.8.xml:324(title) newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:154(title) groupmod.8.xml:152(title) groupmems.8.xml:156(title) groupdel.8.xml:77(title) groupadd.8.xml:186(title) gpasswd.1.xml:215(title) chsh.1.xml:120(title) chpasswd.8.xml:194(title) chgpasswd.8.xml:169(title) chfn.1.xml:99(title) 
+#: usermod.8.xml:359(title) userdel.8.xml:125(title) useradd.8.xml:621(title) su.1.xml:310(title) sg.1.xml:76(title) pwconv.8.xml:146(title) pwck.8.xml:213(title) passwd.1.xml:356(title) newusers.8.xml:324(title) newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:173(title) groupmod.8.xml:152(title) groupmems.8.xml:156(title) groupdel.8.xml:77(title) groupadd.8.xml:186(title) gpasswd.1.xml:218(title) chsh.1.xml:120(title) chpasswd.8.xml:194(title) chgpasswd.8.xml:169(title) chfn.1.xml:99(title) 
 msgid "CONFIGURATION"
 msgstr ""
 
-#: usermod.8.xml:360(para) userdel.8.xml:126(para) useradd.8.xml:622(para) su.1.xml:226(para) sg.1.xml:77(para) pwck.8.xml:183(para) passwd.1.xml:358(para) newusers.8.xml:325(para) newgrp.1.xml:88(para) login.1.xml:273(para) grpck.8.xml:155(para) groupmod.8.xml:153(para) groupmems.8.xml:157(para) groupdel.8.xml:78(para) groupadd.8.xml:187(para) gpasswd.1.xml:216(para) chsh.1.xml:121(para) chpasswd.8.xml:195(para) chgpasswd.8.xml:170(para) chfn.1.xml:100(para) 
+#: usermod.8.xml:360(para) userdel.8.xml:126(para) useradd.8.xml:622(para) su.1.xml:311(para) sg.1.xml:77(para) pwck.8.xml:214(para) passwd.1.xml:357(para) newusers.8.xml:325(para) newgrp.1.xml:88(para) login.1.xml:273(para) grpck.8.xml:174(para) groupmod.8.xml:153(para) groupmems.8.xml:157(para) groupdel.8.xml:78(para) groupadd.8.xml:187(para) gpasswd.1.xml:219(para) chsh.1.xml:121(para) chpasswd.8.xml:195(para) chgpasswd.8.xml:170(para) chfn.1.xml:100(para) 
 msgid "The following configuration variables in <filename>/etc/login.defs</filename> change the behavior of this tool:"
 msgstr ""
 
@@ -481,27 +481,27 @@
 msgid "If set to <replaceable>yes</replaceable>, <command>userdel</command> will remove the user's group if it contains no more members, and <command>useradd</command> will create by default a group with the name of the user."
 msgstr ""
 
-#: userdel.8.xml:149(filename) useradd.8.xml:683(filename) pwconv.8.xml:171(filename) passwd.1.xml:390(filename) newusers.8.xml:384(filename) login.access.5.xml:99(filename) groupadd.8.xml:215(filename) chsh.1.xml:148(filename) chpasswd.8.xml:223(filename) chgpasswd.8.xml:199(filename) chfn.1.xml:116(filename) 
+#: userdel.8.xml:149(filename) useradd.8.xml:683(filename) su.1.xml:353(filename) pwconv.8.xml:171(filename) passwd.1.xml:389(filename) newusers.8.xml:384(filename) login.access.5.xml:99(filename) login.1.xml:367(filename) groupadd.8.xml:215(filename) chsh.1.xml:148(filename) chpasswd.8.xml:223(filename) chgpasswd.8.xml:199(filename) chfn.1.xml:116(filename) 
 msgid "/etc/login.defs"
 msgstr ""
 
-#: userdel.8.xml:151(para) useradd.8.xml:685(para) pwconv.8.xml:173(para) passwd.1.xml:392(para) newusers.8.xml:386(para) login.access.5.xml:101(para) groupadd.8.xml:217(para) chsh.1.xml:150(para) chpasswd.8.xml:225(para) chgpasswd.8.xml:201(para) chfn.1.xml:118(para) 
+#: userdel.8.xml:151(para) useradd.8.xml:685(para) su.1.xml:355(para) pwconv.8.xml:173(para) passwd.1.xml:391(para) newusers.8.xml:386(para) login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:217(para) chsh.1.xml:150(para) chpasswd.8.xml:225(para) chgpasswd.8.xml:201(para) chfn.1.xml:118(para) 
 msgid "Shadow password suite configuration."
 msgstr ""
 
-#: userdel.8.xml:170(title) useradd.8.xml:692(title) pwck.8.xml:241(title) passwd.1.xml:405(title) grpck.8.xml:214(title) groupmod.8.xml:182(title) groupdel.8.xml:107(title) groupadd.8.xml:246(title) chage.1.xml:228(title) 
+#: userdel.8.xml:170(title) useradd.8.xml:692(title) pwck.8.xml:251(title) passwd.1.xml:404(title) grpck.8.xml:209(title) groupmod.8.xml:182(title) groupdel.8.xml:107(title) groupadd.8.xml:246(title) chage.1.xml:228(title) 
 msgid "EXIT VALUES"
 msgstr ""
 
-#: userdel.8.xml:175(replaceable) useradd.8.xml:697(replaceable) pwck.8.xml:246(replaceable) passwd.1.xml:410(replaceable) grpck.8.xml:219(replaceable) groupmod.8.xml:187(replaceable) groupdel.8.xml:112(replaceable) groupadd.8.xml:251(replaceable) chage.1.xml:233(replaceable) 
+#: userdel.8.xml:175(replaceable) useradd.8.xml:697(replaceable) pwck.8.xml:256(replaceable) passwd.1.xml:409(replaceable) grpck.8.xml:214(replaceable) groupmod.8.xml:187(replaceable) groupdel.8.xml:112(replaceable) groupadd.8.xml:251(replaceable) chage.1.xml:233(replaceable) 
 msgid "0"
 msgstr ""
 
-#: userdel.8.xml:177(para) useradd.8.xml:699(para) pwck.8.xml:248(para) passwd.1.xml:412(para) grpck.8.xml:221(para) groupmod.8.xml:189(para) groupdel.8.xml:114(para) groupadd.8.xml:253(para) chage.1.xml:235(para) 
+#: userdel.8.xml:177(para) useradd.8.xml:699(para) pwck.8.xml:258(para) passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para) groupdel.8.xml:114(para) groupadd.8.xml:253(para) chage.1.xml:235(para) 
 msgid "success"
 msgstr ""
 
-#: userdel.8.xml:181(replaceable) useradd.8.xml:703(replaceable) su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:252(replaceable) passwd.1.xml:45(manvolnum) passwd.1.xml:416(replaceable) newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum) grpck.8.xml:225(replaceable) groups.1.xml:35(manvolnum) gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum) chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:35(manvolnum) chage.1.xml:239(replaceable) 
+#: userdel.8.xml:181(replaceable) useradd.8.xml:703(replaceable) su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:262(replaceable) passwd.1.xml:45(manvolnum) passwd.1.xml:415(replaceable) newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum) grpck.8.xml:220(replaceable) groups.1.xml:35(manvolnum) gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum) chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:35(manvolnum) chage.1.xml:239(replaceable) 
 msgid "1"
 msgstr ""
 
@@ -509,15 +509,15 @@
 msgid "can't update password file"
 msgstr ""
 
-#: userdel.8.xml:187(replaceable) useradd.8.xml:709(replaceable) pwck.8.xml:258(replaceable) passwd.1.xml:422(replaceable) grpck.8.xml:231(replaceable) groupmod.8.xml:193(replaceable) groupdel.8.xml:118(replaceable) groupadd.8.xml:257(replaceable) chage.1.xml:245(replaceable) 
+#: userdel.8.xml:187(replaceable) useradd.8.xml:709(replaceable) pwck.8.xml:268(replaceable) passwd.1.xml:421(replaceable) grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable) groupdel.8.xml:118(replaceable) groupadd.8.xml:257(replaceable) chage.1.xml:245(replaceable) 
 msgid "2"
 msgstr ""
 
-#: userdel.8.xml:189(para) useradd.8.xml:711(para) pwck.8.xml:254(para) grpck.8.xml:227(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para) groupadd.8.xml:259(para) chage.1.xml:247(para) 
+#: userdel.8.xml:189(para) useradd.8.xml:711(para) pwck.8.xml:264(para) grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para) groupadd.8.xml:259(para) chage.1.xml:247(para) 
 msgid "invalid command syntax"
 msgstr ""
 
-#: userdel.8.xml:193(replaceable) useradd.8.xml:727(replaceable) pwck.8.xml:282(replaceable) passwd.1.xml:446(replaceable) groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable) 
+#: userdel.8.xml:193(replaceable) useradd.8.xml:727(replaceable) pwck.8.xml:292(replaceable) passwd.1.xml:445(replaceable) groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable) 
 msgid "6"
 msgstr ""
 
@@ -953,15 +953,15 @@
 msgid "Directory containing default files."
 msgstr ""
 
-#: useradd.8.xml:715(replaceable) shadow.3.xml:35(manvolnum) pwck.8.xml:264(replaceable) passwd.1.xml:428(replaceable) grpck.8.xml:237(replaceable) groupmod.8.xml:199(replaceable) groupadd.8.xml:263(replaceable) 
+#: useradd.8.xml:715(replaceable) shadow.3.xml:35(manvolnum) pwck.8.xml:274(replaceable) passwd.1.xml:427(replaceable) grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable) groupadd.8.xml:263(replaceable) 
 msgid "3"
 msgstr ""
 
-#: useradd.8.xml:717(para) passwd.1.xml:448(para) groupmod.8.xml:201(para) groupadd.8.xml:265(para) 
+#: useradd.8.xml:717(para) passwd.1.xml:447(para) groupmod.8.xml:201(para) groupadd.8.xml:265(para) 
 msgid "invalid argument to option"
 msgstr ""
 
-#: useradd.8.xml:721(replaceable) pwck.8.xml:270(replaceable) passwd.1.xml:434(replaceable) grpck.8.xml:243(replaceable) groupmod.8.xml:205(replaceable) groupadd.8.xml:269(replaceable) 
+#: useradd.8.xml:721(replaceable) pwck.8.xml:280(replaceable) passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable) groupmod.8.xml:205(replaceable) groupadd.8.xml:269(replaceable) 
 msgid "4"
 msgstr ""
 
@@ -1005,7 +1005,7 @@
 msgid "suauth"
 msgstr ""
 
-#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum) pwck.8.xml:276(replaceable) porttime.5.xml:35(manvolnum) passwd.5.xml:35(manvolnum) passwd.1.xml:440(replaceable) login.defs.5.xml:98(manvolnum) login.access.5.xml:36(manvolnum) limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum) grpck.8.xml:249(replaceable) faillog.5.xml:35(manvolnum) 
+#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum) pwck.8.xml:286(replaceable) porttime.5.xml:35(manvolnum) passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable) login.defs.5.xml:98(manvolnum) login.access.5.xml:36(manvolnum) limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum) grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum) 
 msgid "5"
 msgstr ""
 
@@ -1147,7 +1147,7 @@
 msgstr ""
 
 #: su.1.xml:106(para) 
-msgid "The current environment is passed to the new shell. The value of <envar>$PATH</envar> is reset to <filename>/bin:/usr/bin</filename> for normal users, or <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the superuser. This may be changed with the <emphasis>ENV_PATH</emphasis> and <emphasis>ENV_SUPATH</emphasis> definitions in <filename>/etc/login.defs</filename>."
+msgid "The current environment is passed to the new shell. The value of <envar>$PATH</envar> is reset to <filename>/bin:/usr/bin</filename> for normal users, or <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the superuser. This may be changed with the <option>ENV_PATH</option> and <option>ENV_SUPATH</option> definitions in <filename>/etc/login.defs</filename>."
 msgstr ""
 
 #: su.1.xml:115(para) login.1.xml:166(para) 
@@ -1182,19 +1182,19 @@
 msgid "The shell that will be invoked."
 msgstr ""
 
-#: su.1.xml:167(para) 
+#: su.1.xml:170(para) 
 msgid "The shell specified with --shell."
 msgstr ""
 
-#: su.1.xml:170(para) 
+#: su.1.xml:173(para) 
 msgid "If <option>--preserve-environment</option> is used, the shell specified by the <envar>$SHELL</envar> environment variable."
 msgstr ""
 
-#: su.1.xml:177(para) 
+#: su.1.xml:180(para) 
 msgid "The shell indicated in the <filename>/etc/passwd</filename> entry for the target user."
 msgstr ""
 
-#: su.1.xml:183(para) 
+#: su.1.xml:186(para) 
 msgid "<filename>/bin/sh</filename> if a shell could not be found by any above method."
 msgstr ""
 
@@ -1202,23 +1202,67 @@
 msgid "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:190(para) 
+#: su.1.xml:191(para) 
 msgid "If the target user has a restricted shell (i.e. the shell field of this user's entry in <filename>/etc/passwd</filename> is not listed in <filename>/etc/shell</filename>), then the <option>--shell</option> option or the <envar>$SHELL</envar> environment variable won't be taken into account, unless <command>su</command> is called by root."
 msgstr ""
 
-#: su.1.xml:201(term) 
+#: su.1.xml:202(term) 
 msgid "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</option>"
 msgstr ""
 
-#: su.1.xml:206(para) 
-msgid "Preserve the current environment."
+#: su.1.xml:211(envar) 
+msgid "$PATH"
 msgstr ""
 
+#: su.1.xml:213(para) 
+msgid "reset according to the <filename>/etc/login.defs</filename> options <option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
+msgstr ""
+
+#: su.1.xml:222(envar) 
+msgid "$IFS"
+msgstr ""
+
+#: su.1.xml:224(para) 
+msgid "reset to <quote>&lt;space&gt;&lt;tab&gt;&lt;newline&gt;</quote>, if it was set."
+msgstr ""
+
 #: su.1.xml:207(para) 
+msgid "Preserve the current environment, except for: <placeholder-1/>"
+msgstr ""
+
+#: su.1.xml:233(para) 
 msgid "If the target user has a restricted shell, this option has no effect (unless <command>su</command> is called by root)."
 msgstr ""
 
-#: su.1.xml:218(para) 
+#: su.1.xml:242(para) 
+msgid "The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, <envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> environment variables are reset."
+msgstr ""
+
+#: su.1.xml:251(para) 
+msgid "If <option>--login</option> is not used, the environment is copied, except for the variables above."
+msgstr ""
+
+#: su.1.xml:258(para) 
+msgid "If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> environment variables are copied if they were set."
+msgstr ""
+
+#: su.1.xml:268(para) 
+msgid "If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</envar>, and <envar>$MAIL</envar> environment variables are set according to the <filename>/etc/login.defs</filename> options <option>ENV_TZ</option>, <option>ENV_HZ</option>, <option>MAIL_DIR</option>, and <option>MAIL_FILE</option> (see below)."
+msgstr ""
+
+#: su.1.xml:281(para) 
+msgid "If <option>--login</option> is used, other environment variables might be set by the <option>ENVIRON_FILE</option> file (see below)."
+msgstr ""
+
+#: su.1.xml:289(para) 
+msgid "Other environment might be set by PAM modules."
+msgstr ""
+
+#: su.1.xml:237(para) 
+msgid "Note that the default behavior for the environment is the following: <placeholder-1/>"
+msgstr ""
+
+#: su.1.xml:303(para) 
 msgid "This version of <command>su</command> has many compilation options, only some of which may be in use at any particular site."
 msgstr ""
 
@@ -1279,6 +1323,10 @@
 msgid "If this file exists and is readable, login environment will be read from it. Every line should be in the form name=value."
 msgstr ""
 
+#: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para) 
+msgid "Lines starting with a # are treated as comment lines and ignored."
+msgstr ""
+
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term) 
 msgid "<option>ENV_PATH</option> (string)"
 msgstr ""
@@ -1372,8 +1420,8 @@
 msgid "Enable \"syslog\" logging of <command>su</command> activity - in addition to sulog file logging."
 msgstr ""
 
-#: su.1.xml:272(para) 
-msgid "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</manvolnum></citerefentry>"
+#: su.1.xml:363(para) 
+msgid "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 msgstr ""
 
 #: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command) 
@@ -1409,10 +1457,10 @@
 msgstr ""
 
 #: sg.1.xml:119(para) 
-msgid "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>"
+msgid "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry><phrase condition=\"gshadow\">, <citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></citerefentry></phrase>."
 msgstr ""
 
-#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname) shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname) pwck.8.xml:60(replaceable) pwck.8.xml:74(replaceable) grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable) 
+#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname) shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname) pwck.8.xml:60(replaceable) pwck.8.xml:75(replaceable) grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable) 
 msgid "shadow"
 msgstr ""
 
@@ -1564,7 +1612,19 @@
 msgid "This field is reserved for future use."
 msgstr ""
 
-#: shadow.5.xml:249(para) 
+#: shadow.5.xml:245(filename) 
+msgid "/etc/shadow-"
+msgstr ""
+
+#: shadow.5.xml:247(para) 
+msgid "Backup file for /etc/shadow."
+msgstr ""
+
+#: shadow.5.xml:248(para) passwd.5.xml:134(para) 
+msgid "Note that this file is used by the tools of the shadow toolsuite, but not by all user and password management tools."
+msgstr ""
+
+#: shadow.5.xml:259(para) 
 msgid "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
@@ -1797,11 +1857,11 @@
 msgid "verify integrity of password files"
 msgstr ""
 
-#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:140(option) 
+#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:171(option) 
 msgid "-q"
 msgstr ""
 
-#: pwck.8.xml:53(arg) pwck.8.xml:161(option) grpck.8.xml:58(arg) grpck.8.xml:130(option) 
+#: pwck.8.xml:53(arg) pwck.8.xml:192(option) grpck.8.xml:58(arg) grpck.8.xml:149(option) 
 msgid "-s"
 msgstr ""
 
@@ -1809,98 +1869,126 @@
 msgid "passwd"
 msgstr ""
 
-#: pwck.8.xml:68(arg) pwck.8.xml:151(option) login.1.xml:222(option) grpck.8.xml:49(arg) grpck.8.xml:120(option) 
+#: pwck.8.xml:68(arg) pwck.8.xml:182(option) login.1.xml:222(option) grpck.8.xml:49(arg) grpck.8.xml:139(option) 
 msgid "-r"
 msgstr ""
 
-#: pwck.8.xml:82(para) 
-msgid "The <command>pwck</command> command verifies the integrity of the system authentication information. All entries in the <filename>/etc/passwd</filename> and <filename>/etc/shadow</filename> are checked to see that the entry has the proper format and valid data in each field. The user is prompted to delete entries that are improperly formatted or which have other uncorrectable errors."
+#: pwck.8.xml:84(para) 
+msgid "The <command>pwck</command> command verifies the integrity of the users and authentication information. It checks that all entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</filename> have the proper format and contain valid data. The user is prompted to delete entries that are improperly formatted or which have other uncorrectable errors."
 msgstr ""
 
-#: pwck.8.xml:91(para) grpck.8.xml:80(para) 
+#: pwck.8.xml:93(para) grpck.8.xml:80(para) 
 msgid "Checks are made to verify that each entry has:"
 msgstr ""
 
-#: pwck.8.xml:94(para) grpck.8.xml:84(para) 
+#: pwck.8.xml:96(para) grpck.8.xml:84(para) 
 msgid "the correct number of fields"
 msgstr ""
 
-#: pwck.8.xml:97(para) 
-msgid "a unique user name"
+#: pwck.8.xml:99(para) 
+msgid "a unique and valid user name"
 msgstr ""
 
-#: pwck.8.xml:100(para) 
+#: pwck.8.xml:102(para) 
 msgid "a valid user and group identifier"
 msgstr ""
 
-#: pwck.8.xml:103(para) 
+#: pwck.8.xml:105(para) 
 msgid "a valid primary group"
 msgstr ""
 
-#: pwck.8.xml:106(para) 
+#: pwck.8.xml:108(para) 
 msgid "a valid home directory"
 msgstr ""
 
-#: pwck.8.xml:109(para) 
+#: pwck.8.xml:111(para) 
 msgid "a valid login shell"
 msgstr ""
 
-#: pwck.8.xml:113(para) 
+#: pwck.8.xml:115(para) 
+msgid "<filename>shadow</filename> checks are enabled when a second file parameter is specified or when <filename>/etc/shadow</filename> exists on the system."
+msgstr ""
+
+#: pwck.8.xml:120(para) 
+msgid "These checks are the following:"
+msgstr ""
+
+#: pwck.8.xml:125(para) 
+msgid "every passwd entry has a matching shadow entry, and every shadow entry has a matching passwd entry"
+msgstr ""
+
+#: pwck.8.xml:131(para) 
+msgid "passwords are specified in the shadowed file"
+msgstr ""
+
+#: pwck.8.xml:134(para) 
+msgid "shadow entries have the correct number of fields"
+msgstr ""
+
+#: pwck.8.xml:137(para) 
+msgid "shadow entries are unique in shadow"
+msgstr ""
+
+#: pwck.8.xml:140(para) 
+msgid "the last password changes are not in the future"
+msgstr ""
+
+#: pwck.8.xml:144(para) 
 msgid "The checks for correct number of fields and unique user name are fatal. If the entry has the wrong number of fields, the user will be prompted to delete the entire line. If the user does not answer affirmatively, all further checks are bypassed. An entry with a duplicated user name is prompted for deletion, but the remaining checks will still be made. All other errors are warning and the user is encouraged to run the <command>usermod</command> command to correct the error."
 msgstr ""
 
-#: pwck.8.xml:124(para) 
+#: pwck.8.xml:155(para) 
 msgid "The commands which operate on the <filename>/etc/passwd</filename> file are not able to alter corrupted or duplicated entries. <command>pwck</command> should be used in those circumstances to remove the offending entry."
 msgstr ""
 
-#: pwck.8.xml:134(para) 
+#: pwck.8.xml:165(para) 
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr ""
 
-#: pwck.8.xml:143(para) 
+#: pwck.8.xml:174(para) 
 msgid "Report errors only. The warnings which do not require any action from the user won't be displayed."
 msgstr ""
 
-#: pwck.8.xml:154(para) 
+#: pwck.8.xml:185(para) 
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr ""
 
-#: pwck.8.xml:164(para) 
+#: pwck.8.xml:195(para) 
 msgid "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</filename> by UID."
 msgstr ""
 
-#: pwck.8.xml:172(para) 
+#: pwck.8.xml:203(para) 
 msgid "By default, <command>pwck</command> operates on the files <filename>/etc/passwd</filename> and <filename>/etc/shadow</filename>. The user may select alternate files with the <emphasis remap=\"I\">passwd</emphasis> and <emphasis remap=\"I\">shadow</emphasis> parameters."
 msgstr ""
 
-#: pwck.8.xml:221(para) 
-msgid "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
-msgstr ""
-
-#: pwck.8.xml:260(para) 
+#: pwck.8.xml:270(para) 
 msgid "one or more bad password entries"
 msgstr ""
 
-#: pwck.8.xml:266(para) 
+#: pwck.8.xml:276(para) 
 msgid "can't open password files"
 msgstr ""
 
-#: pwck.8.xml:272(para) 
+#: pwck.8.xml:282(para) 
 msgid "can't lock password files"
 msgstr ""
 
-#: pwck.8.xml:278(para) 
+#: pwck.8.xml:288(para) 
 msgid "can't update password files"
 msgstr ""
 
-#: pwck.8.xml:284(para) 
+#: pwck.8.xml:294(para) 
 msgid "can't sort password files"
 msgstr ""
 
-#: pwck.8.xml:242(para) 
+#: pwck.8.xml:252(para) 
 msgid "The <command>pwck</command> command exits with the following values: <placeholder-1/>"
 msgstr ""
 
+#: pwck.8.xml:303(para) 
+msgid "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+msgstr ""
+
 #: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname) 
 msgid "porttime"
 msgstr ""
@@ -2014,7 +2102,15 @@
 msgid "optional encrypted password file"
 msgstr ""
 
-#: passwd.5.xml:135(para) 
+#: passwd.5.xml:131(filename) 
+msgid "/etc/passwd-"
+msgstr ""
+
+#: passwd.5.xml:133(para) 
+msgid "Backup file for /etc/passwd."
+msgstr ""
+
+#: passwd.5.xml:145(para) 
 msgid "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
@@ -2138,8 +2234,8 @@
 msgid "Users with a locked password are not allowed to change their password."
 msgstr ""
 
-#: passwd.1.xml:247(term) chage.1.xml:138(term) 
-msgid "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</replaceable>"
+#: passwd.1.xml:247(term) 
+msgid "<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</replaceable>"
 msgstr ""
 
 #: passwd.1.xml:251(para) chage.1.xml:142(para) 
@@ -2167,34 +2263,34 @@
 msgstr ""
 
 #: passwd.1.xml:301(para) 
-msgid "Unlock the password of the named account. This option re-enables a password by changing the password back to its previous value (to the value before using the <option>-l</option> option), and by resetting the account expiry field."
+msgid "Unlock the password of the named account. This option re-enables a password by changing the password back to its previous value (to the value before using the <option>-l</option> option)."
 msgstr ""
 
-#: passwd.1.xml:311(term) 
+#: passwd.1.xml:310(term) 
 msgid "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</replaceable>"
 msgstr ""
 
-#: passwd.1.xml:315(para) 
+#: passwd.1.xml:314(para) 
 msgid "Set the number of days of warning before a password change is required. The <replaceable>WARN_DAYS</replaceable> option is the number of days prior to the password expiring that a user will be warned that his/her password is about to expire."
 msgstr ""
 
-#: passwd.1.xml:324(term) 
+#: passwd.1.xml:323(term) 
 msgid "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</replaceable>"
 msgstr ""
 
-#: passwd.1.xml:328(para) 
+#: passwd.1.xml:327(para) 
 msgid "Set the maximum number of days a password remains valid. After <replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
 msgstr ""
 
-#: passwd.1.xml:340(para) 
+#: passwd.1.xml:339(para) 
 msgid "Password complexity checking may vary from site to site. The user is urged to select a password as complex as he or she feels comfortable with."
 msgstr ""
 
-#: passwd.1.xml:345(para) 
+#: passwd.1.xml:344(para) 
 msgid "Users may not be able to change their password on a system if NIS is enabled and they are not logged into the NIS server."
 msgstr ""
 
-#: passwd.1.xml:350(para) 
+#: passwd.1.xml:349(para) 
 msgid "<command>passwd</command> uses PAM to authenticate users and to change their passwords."
 msgstr ""
 
@@ -2318,40 +2414,40 @@
 msgid "If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:396(filename) 
+#: passwd.1.xml:395(filename) 
 msgid "/etc/pam.d/passwd"
 msgstr ""
 
-#: passwd.1.xml:398(para) 
+#: passwd.1.xml:397(para) 
 msgid "PAM configuration for <command>passwd</command>."
 msgstr ""
 
-#: passwd.1.xml:418(para) chage.1.xml:241(para) 
+#: passwd.1.xml:417(para) chage.1.xml:241(para) 
 msgid "permission denied"
 msgstr ""
 
-#: passwd.1.xml:424(para) 
+#: passwd.1.xml:423(para) 
 msgid "invalid combination of options"
 msgstr ""
 
-#: passwd.1.xml:430(para) 
+#: passwd.1.xml:429(para) 
 msgid "unexpected failure, nothing done"
 msgstr ""
 
-#: passwd.1.xml:436(para) 
+#: passwd.1.xml:435(para) 
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr ""
 
-#: passwd.1.xml:442(para) 
+#: passwd.1.xml:441(para) 
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 
-#: passwd.1.xml:406(para) 
+#: passwd.1.xml:405(para) 
 msgid "The <command>passwd</command> command exits with the following values: <placeholder-1/>"
 msgstr ""
 
-#: passwd.1.xml:457(para) 
-msgid "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry condition=\"no_pam\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#: passwd.1.xml:456(para) 
+msgid "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition=\"no_pam\"><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, </phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
 #: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname) nologin.8.xml:45(command) 
@@ -2586,7 +2682,7 @@
 msgid "log in to a new group"
 msgstr ""
 
-#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable) grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable) groupadd.8.xml:58(replaceable) gpasswd.1.xml:63(replaceable) 
+#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable) grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable) groupadd.8.xml:58(replaceable) gpasswd.1.xml:66(replaceable) 
 msgid "group"
 msgstr ""
 
@@ -2603,7 +2699,7 @@
 msgstr ""
 
 #: newgrp.1.xml:130(para) 
-msgid "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+msgid "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry><phrase condition=\"gshadow\">, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></citerefentry></phrase>."
 msgstr ""
 
 #: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname) logoutd.8.xml:45(command) 
@@ -2898,7 +2994,7 @@
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr ""
 
-#: login.defs.5.xml:258(term) gpasswd.1.xml:42(refentrytitle) gpasswd.1.xml:47(refname) gpasswd.1.xml:58(command) 
+#: login.defs.5.xml:258(term) gpasswd.1.xml:42(refentrytitle) gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command) 
 msgid "gpasswd"
 msgstr ""
 
@@ -3166,7 +3262,7 @@
 msgid "Suppress printing of system messages."
 msgstr ""
 
-#: login.1.xml:371(para) 
+#: login.1.xml:377(para) 
 msgid "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>securetty</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>getty</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
@@ -3444,65 +3540,73 @@
 msgstr ""
 
 #: grpck.8.xml:70(para) 
-msgid "The <command>grpck</command> command verifies the integrity of the system authentication information. All entries in <filename>/etc/group</filename><phrase condition=\"gshadow\">and <filename>/etc/gshadow</filename></phrase> are checked to see that the entry has the proper format and valid data in each field. The user is prompted to delete entries that are improperly formatted or which have other uncorrectable errors."
+msgid "The <command>grpck</command> command verifies the integrity of the groups information. It checks that all entries in <filename>/etc/group</filename><phrase condition=\"gshadow\">and <filename>/etc/gshadow</filename></phrase> have the proper format and contain valid data. The user is prompted to delete entries that are improperly formatted or which have other uncorrectable errors."
 msgstr ""
 
 #: grpck.8.xml:87(para) 
-msgid "a unique group name"
+msgid "a unique and valid group name"
 msgstr ""
 
 #: grpck.8.xml:90(para) 
-msgid "a valid list of members and administrators"
+msgid "a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/group</filename> only)</phrase>"
 msgstr ""
 
-#: grpck.8.xml:94(para) 
-msgid "The checks for correct number of fields and unique group name are fatal. If the entry has the wrong number of fields, the user will be prompted to delete the entire line. If the user does not answer affirmatively, all further checks are bypassed. An entry with a duplicated group name is prompted for deletion, but the remaining checks will still be made. All other errors are warnings and the user is encouraged to run the <command>groupmod</command> command to correct the error."
+#: grpck.8.xml:97(para) 
+msgid "a valid list of members <phrase condition=\"gshadow\"> and administrators</phrase>"
 msgstr ""
 
-#: grpck.8.xml:105(para) 
-msgid "The commands which operate on the <filename>/etc/group</filename> file are not able to alter corrupted or duplicated entries. <command>grpck</command> should be used in those circumstances to remove the offending entry."
+#: grpck.8.xml:103(para) 
+msgid "a corresponding entry in the <filename>/etc/gshadow</filename> file (respectively <filename>/etc/group</filename> for the <filename>gshadow</filename> checks)"
 msgstr ""
 
-#: grpck.8.xml:115(para) 
+#: grpck.8.xml:111(para) 
+msgid "The checks for correct number of fields and unique group name are fatal. If an entry has the wrong number of fields, the user will be prompted to delete the entire line. If the user does not answer affirmatively, all further checks are bypassed. An entry with a duplicated group name is prompted for deletion, but the remaining checks will still be made. All other errors are warnings and the user is encouraged to run the <command>groupmod</command> command to correct the error."
+msgstr ""
+
+#: grpck.8.xml:122(para) 
+msgid "The commands which operate on the <filename>/etc/group</filename><phrase condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and <filename>/etc/gshadow</filename> files</phrase> are not able to alter corrupted or duplicated entries. <command>grpck</command> should be used in those circumstances to remove the offending entries."
+msgstr ""
+
+#: grpck.8.xml:134(para) 
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr ""
 
-#: grpck.8.xml:122(para) 
+#: grpck.8.xml:141(para) 
 msgid "Execute the <command>grpck</command> command in read-only mode. This causes all questions regarding changes to be answered <emphasis>no</emphasis> without user intervention."
 msgstr ""
 
-#: grpck.8.xml:132(para) 
+#: grpck.8.xml:151(para) 
 msgid "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow\">and <filename>/etc/gshadow</filename></phrase> by GID."
 msgstr ""
 
-#: grpck.8.xml:141(para) 
+#: grpck.8.xml:160(para) 
 msgid "By default, <command>grpck</command> operates on <filename>/etc/group</filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</filename></phrase>. The user may select alternate files with the <emphasis remap=\"I\">group</emphasis><phrase condition=\"no_gshadow\">parameter.</phrase><phrase condition=\"gshadow\">and <emphasis remap=\"I\">shadow</emphasis> parameters.</phrase>"
 msgstr ""
 
-#: grpck.8.xml:191(para) 
-msgid "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-msgstr ""
-
-#: grpck.8.xml:233(para) 
+#: grpck.8.xml:228(para) 
 msgid "one or more bad group entries"
 msgstr ""
 
-#: grpck.8.xml:239(para) 
+#: grpck.8.xml:234(para) 
 msgid "can't open group files"
 msgstr ""
 
-#: grpck.8.xml:245(para) 
+#: grpck.8.xml:240(para) 
 msgid "can't lock group files"
 msgstr ""
 
-#: grpck.8.xml:251(para) 
+#: grpck.8.xml:246(para) 
 msgid "can't update group files"
 msgstr ""
 
-#: grpck.8.xml:215(para) 
+#: grpck.8.xml:210(para) 
 msgid "The <command>grpck</command> command exits with the following values: <placeholder-1/>"
 msgstr ""
 
+#: grpck.8.xml:255(para) 
+msgid "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition=\"gshadow\"><citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum>, </citerefentry>, </phrase><citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+msgstr ""
+
 #: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname) groups.1.xml:45(command) 
 msgid "groups"
 msgstr ""
@@ -3796,111 +3900,107 @@
 msgid "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
-#: gpasswd.1.xml:50(phrase) 
-msgid "and <placeholder-1/> files"
+#: gpasswd.1.xml:49(phrase) 
+msgid "administer <placeholder-1/>"
 msgstr ""
 
 #: gpasswd.1.xml:52(phrase) 
-msgid "file"
+msgid "administer <placeholder-1/> and <placeholder-2/>"
 msgstr ""
 
-#: gpasswd.1.xml:48(refpurpose) 
-msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
-msgstr ""
-
-#: gpasswd.1.xml:60(replaceable) 
+#: gpasswd.1.xml:63(replaceable) 
 msgid "option"
 msgstr ""
 
-#: gpasswd.1.xml:70(para) 
+#: gpasswd.1.xml:73(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:78(para) 
-msgid "System administrators can use the <option>-A</option> option to define group administrator(s) and the <option>-M</option> option to define members and has all rights of group administrators and members."
+#: gpasswd.1.xml:81(para) 
+msgid "System administrators can use the <option>-A</option> option to define group administrator(s) and the <option>-M</option> option to define members. They have all rights of group administrators and members."
 msgstr ""
 
-#: gpasswd.1.xml:83(para) 
+#: gpasswd.1.xml:86(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:90(para) 
+#: gpasswd.1.xml:93(para) 
 msgid "If a password is set the members can still use <citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></citerefentry> without a password, and non-members must supply the password."
 msgstr ""
 
-#: gpasswd.1.xml:98(title) 
+#: gpasswd.1.xml:101(title) 
 msgid "Notes about group passwords"
 msgstr ""
 
-#: gpasswd.1.xml:99(para) 
+#: gpasswd.1.xml:102(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:110(para) 
+#: gpasswd.1.xml:113(para) 
 msgid "Except for the <option>-A</option> and <option>-M</option> options, the options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:114(para) 
+#: gpasswd.1.xml:117(para) 
 msgid "The options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:117(para) 
+#: gpasswd.1.xml:120(para) 
 msgid "The options which apply to the <command>gpasswd</command> command are:"
 msgstr ""
 
-#: gpasswd.1.xml:122(term) 
+#: gpasswd.1.xml:125(term) 
 msgid "<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
 msgstr ""
 
-#: gpasswd.1.xml:126(para) 
+#: gpasswd.1.xml:129(para) 
 msgid "Add the <replaceable>user</replaceable> to the named <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:135(term) 
+#: gpasswd.1.xml:138(term) 
 msgid "<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
 msgstr ""
 
-#: gpasswd.1.xml:139(para) 
+#: gpasswd.1.xml:142(para) 
 msgid "Remove the <replaceable>user</replaceable> from the named <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:148(term) 
+#: gpasswd.1.xml:151(term) 
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr ""
 
-#: gpasswd.1.xml:152(para) 
+#: gpasswd.1.xml:155(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:163(term) 
+#: gpasswd.1.xml:166(term) 
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr ""
 
-#: gpasswd.1.xml:167(para) 
+#: gpasswd.1.xml:170(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:178(term) 
+#: gpasswd.1.xml:181(term) 
 msgid "<option>-A</option>, <option>--administrators</option><replaceable>user</replaceable>,..."
 msgstr ""
 
-#: gpasswd.1.xml:182(para) 
+#: gpasswd.1.xml:185(para) 
 msgid "Set the list of administrative users."
 msgstr ""
 
-#: gpasswd.1.xml:190(term) 
+#: gpasswd.1.xml:193(term) 
 msgid "<option>-M</option>, <option>--members</option><replaceable>user</replaceable>,..."
 msgstr ""
 
-#: gpasswd.1.xml:194(para) 
+#: gpasswd.1.xml:197(para) 
 msgid "Set the list of group members."
 msgstr ""
 
-#: gpasswd.1.xml:204(para) 
+#: gpasswd.1.xml:207(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:249(para) 
+#: gpasswd.1.xml:252(para) 
 msgid "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></citerefentry><phrase condition=\"gshadow\">, <citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></citerefentry></phrase>."
 msgstr ""
 
@@ -4138,7 +4238,7 @@
 msgstr ""
 
 #: chpasswd.8.xml:239(para) 
-msgid "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry condition=\"no_pam\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+msgid "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition=\"no_pam\"><citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum></citerefentry>, </phrase><citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 
 #: chgpasswd.8.xml:48(refpurpose) 
@@ -4269,6 +4369,10 @@
 msgid "Show account aging information."
 msgstr ""
 
+#: chage.1.xml:138(term) 
+msgid "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</replaceable>"
+msgstr ""
+
 #: chage.1.xml:150(term) 
 msgid "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</replaceable>"
 msgstr ""

Modified: upstream/trunk/man/po/sv.po
===================================================================
--- upstream/trunk/man/po/sv.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/man/po/sv.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: man pages for shadow 4.0.18\n"
-"POT-Creation-Date: 2009-05-22 13:15+0200\n"
+"POT-Creation-Date: 2009-07-24 03:03+0200\n"
 "PO-Revision-Date: 2006-12-15 18:09+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -67,14 +67,14 @@
 #: vipw.8.xml:66(title) usermod.8.xml:59(title) userdel.8.xml:60(title)
 #: useradd.8.xml:79(title) suauth.5.xml:50(title) su.1.xml:77(title)
 #: sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title)
-#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:81(title)
+#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:83(title)
 #: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
 #: nologin.8.xml:50(title) newusers.8.xml:70(title) newgrp.1.xml:55(title)
 #: logoutd.8.xml:50(title) login.defs.5.xml:107(title)
 #: login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title)
 #: lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title)
 #: groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title)
-#: groupdel.8.xml:57(title) groupadd.8.xml:64(title) gpasswd.1.xml:69(title)
+#: groupdel.8.xml:57(title) groupadd.8.xml:64(title) gpasswd.1.xml:72(title)
 #: faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title)
 #: chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title)
 #: chfn.1.xml:63(title) chage.1.xml:55(title)
@@ -107,10 +107,10 @@
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
 #: vipw.8.xml:84(title) usermod.8.xml:67(title) userdel.8.xml:69(title)
-#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:133(title)
+#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:164(title)
 #: passwd.1.xml:152(title) newusers.8.xml:239(title) login.1.xml:188(title)
-#: lastlog.8.xml:66(title) grpck.8.xml:114(title) groupmod.8.xml:67(title)
-#: groupmems.8.xml:75(title) groupadd.8.xml:73(title) gpasswd.1.xml:109(title)
+#: lastlog.8.xml:66(title) grpck.8.xml:133(title) groupmod.8.xml:67(title)
+#: groupmems.8.xml:75(title) groupadd.8.xml:73(title) gpasswd.1.xml:112(title)
 #: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:109(title)
 #: chgpasswd.8.xml:88(title) chage.1.xml:65(title)
 msgid "OPTIONS"
@@ -173,15 +173,15 @@
 msgstr "Redigera shadow- eller gshadow-databasen."
 
 #: vipw.8.xml:124(title) usermod.8.xml:372(title) userdel.8.xml:140(title)
-#: useradd.8.xml:644(title) suauth.5.xml:168(title) su.1.xml:253(title)
+#: useradd.8.xml:644(title) suauth.5.xml:168(title) su.1.xml:338(title)
 #: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
-#: pwconv.8.xml:168(title) pwck.8.xml:196(title) porttime.5.xml:105(title)
-#: passwd.5.xml:116(title) passwd.1.xml:375(title) newusers.8.xml:357(title)
+#: pwconv.8.xml:168(title) pwck.8.xml:227(title) porttime.5.xml:105(title)
+#: passwd.5.xml:116(title) passwd.1.xml:374(title) newusers.8.xml:357(title)
 #: newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title)
 #: login.1.xml:316(title) limits.5.xml:140(title) lastlog.8.xml:147(title)
-#: gshadow.5.xml:141(title) grpck.8.xml:166(title) groups.1.xml:75(title)
+#: gshadow.5.xml:141(title) grpck.8.xml:185(title) groups.1.xml:75(title)
 #: groupmod.8.xml:164(title) groupmems.8.xml:168(title)
-#: groupdel.8.xml:89(title) groupadd.8.xml:200(title) gpasswd.1.xml:230(title)
+#: groupdel.8.xml:89(title) groupadd.8.xml:200(title) gpasswd.1.xml:233(title)
 #: faillog.8.xml:202(title) faillog.5.xml:71(title) expiry.1.xml:68(title)
 #: chsh.1.xml:133(title) chpasswd.8.xml:208(title) chgpasswd.8.xml:184(title)
 #: chfn.1.xml:113(title) chage.1.xml:206(title)
@@ -190,61 +190,62 @@
 
 #: vipw.8.xml:127(filename) usermod.8.xml:375(filename)
 #: userdel.8.xml:143(filename) useradd.8.xml:659(filename)
-#: sg.1.xml:103(filename) pwck.8.xml:199(filename)
+#: sg.1.xml:103(filename) pwck.8.xml:230(filename)
 #: newusers.8.xml:372(filename) newgrp.1.xml:114(filename)
-#: gshadow.5.xml:144(filename) grpck.8.xml:169(filename)
+#: gshadow.5.xml:144(filename) grpck.8.xml:188(filename)
 #: groups.1.xml:78(filename) groupmod.8.xml:167(filename)
 #: groupmems.8.xml:171(filename) groupdel.8.xml:92(filename)
-#: groupadd.8.xml:203(filename) gpasswd.1.xml:49(filename)
-#: gpasswd.1.xml:233(filename) chgpasswd.8.xml:187(filename)
+#: groupadd.8.xml:203(filename) gpasswd.1.xml:50(filename)
+#: gpasswd.1.xml:53(filename) gpasswd.1.xml:236(filename)
+#: chgpasswd.8.xml:187(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
 #: vipw.8.xml:129(para) usermod.8.xml:377(para) userdel.8.xml:145(para)
-#: useradd.8.xml:661(para) sg.1.xml:105(para) pwck.8.xml:201(para)
+#: useradd.8.xml:661(para) sg.1.xml:105(para) pwck.8.xml:232(para)
 #: newusers.8.xml:374(para) newgrp.1.xml:116(para) gshadow.5.xml:146(para)
-#: grpck.8.xml:171(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
+#: grpck.8.xml:190(para) groups.1.xml:80(para) groupmod.8.xml:169(para)
 #: groupmems.8.xml:173(para) groupdel.8.xml:94(para) groupadd.8.xml:205(para)
-#: gpasswd.1.xml:235(para) chgpasswd.8.xml:189(para)
+#: gpasswd.1.xml:238(para) chgpasswd.8.xml:189(para)
 msgid "Group account information."
 msgstr "Gruppkontoinformation."
 
 #: vipw.8.xml:133(filename) usermod.8.xml:381(filename)
 #: useradd.8.xml:665(filename) sg.1.xml:109(filename)
 #: newusers.8.xml:378(filename) newgrp.1.xml:120(filename)
-#: gshadow.5.xml:150(filename) grpck.8.xml:175(filename)
+#: gshadow.5.xml:150(filename) grpck.8.xml:194(filename)
 #: groupmod.8.xml:173(filename) groupmems.8.xml:177(filename)
 #: groupdel.8.xml:98(filename) groupadd.8.xml:209(filename)
-#: gpasswd.1.xml:50(filename) gpasswd.1.xml:239(filename)
+#: gpasswd.1.xml:54(filename) gpasswd.1.xml:242(filename)
 #: chgpasswd.8.xml:193(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
 #: vipw.8.xml:135(para) usermod.8.xml:383(para) useradd.8.xml:667(para)
 #: sg.1.xml:111(para) newusers.8.xml:380(para) newgrp.1.xml:122(para)
-#: gshadow.5.xml:152(para) grpck.8.xml:177(para) groupmod.8.xml:175(para)
-#: groupdel.8.xml:100(para) groupadd.8.xml:211(para) gpasswd.1.xml:241(para)
+#: gshadow.5.xml:152(para) grpck.8.xml:196(para) groupmod.8.xml:175(para)
+#: groupdel.8.xml:100(para) groupadd.8.xml:211(para) gpasswd.1.xml:244(para)
 #: chgpasswd.8.xml:195(para)
 msgid "Secure group account information."
 msgstr "Säker gruppkontoinformation."
 
 #: vipw.8.xml:139(filename) usermod.8.xml:387(filename)
 #: userdel.8.xml:155(filename) useradd.8.xml:647(filename)
-#: su.1.xml:256(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
-#: pwck.8.xml:205(filename) passwd.5.xml:119(filename)
-#: passwd.1.xml:378(filename) newusers.8.xml:360(filename)
+#: su.1.xml:341(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
+#: pwck.8.xml:236(filename) passwd.5.xml:119(filename)
+#: passwd.1.xml:377(filename) newusers.8.xml:360(filename)
 #: newgrp.1.xml:102(filename) login.1.xml:331(filename)
-#: grpck.8.xml:181(filename) expiry.1.xml:71(filename)
+#: grpck.8.xml:200(filename) expiry.1.xml:71(filename)
 #: chsh.1.xml:136(filename) chpasswd.8.xml:211(filename)
 #: chfn.1.xml:122(filename) chage.1.xml:210(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
 #: vipw.8.xml:141(para) usermod.8.xml:389(para) userdel.8.xml:157(para)
-#: useradd.8.xml:649(para) su.1.xml:258(para) sg.1.xml:93(para)
-#: shadow.5.xml:235(para) pwck.8.xml:207(para) passwd.5.xml:121(para)
-#: passwd.1.xml:380(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
-#: login.1.xml:333(para) grpck.8.xml:183(para) expiry.1.xml:73(para)
+#: useradd.8.xml:649(para) su.1.xml:343(para) sg.1.xml:93(para)
+#: shadow.5.xml:235(para) pwck.8.xml:238(para) passwd.5.xml:121(para)
+#: passwd.1.xml:379(para) newusers.8.xml:362(para) newgrp.1.xml:104(para)
+#: login.1.xml:333(para) grpck.8.xml:202(para) expiry.1.xml:73(para)
 #: chsh.1.xml:138(para) chpasswd.8.xml:213(para) chfn.1.xml:124(para)
 #: chage.1.xml:213(para)
 msgid "User account information."
@@ -252,9 +253,9 @@
 
 #: vipw.8.xml:145(filename) usermod.8.xml:393(filename)
 #: userdel.8.xml:161(filename) useradd.8.xml:653(filename)
-#: su.1.xml:262(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
-#: shadow.3.xml:204(filename) pwck.8.xml:211(filename)
-#: passwd.5.xml:125(filename) passwd.1.xml:384(filename)
+#: su.1.xml:347(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
+#: shadow.3.xml:204(filename) pwck.8.xml:242(filename)
+#: passwd.5.xml:125(filename) passwd.1.xml:383(filename)
 #: newusers.8.xml:366(filename) newgrp.1.xml:108(filename)
 #: login.1.xml:337(filename) expiry.1.xml:77(filename)
 #: chpasswd.8.xml:217(filename) chage.1.xml:218(filename)
@@ -262,25 +263,25 @@
 msgstr "/etc/shadow"
 
 #: vipw.8.xml:147(para) usermod.8.xml:395(para) userdel.8.xml:163(para)
-#: useradd.8.xml:655(para) su.1.xml:264(para) sg.1.xml:99(para)
-#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:213(para)
-#: passwd.1.xml:386(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
+#: useradd.8.xml:655(para) su.1.xml:349(para) sg.1.xml:99(para)
+#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:244(para)
+#: passwd.1.xml:385(para) newusers.8.xml:368(para) newgrp.1.xml:110(para)
 #: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:219(para)
 #: chage.1.xml:221(para)
 msgid "Secure user account information."
 msgstr "Säker användarkontoinformation."
 
 #: vipw.8.xml:154(title) usermod.8.xml:402(title) userdel.8.xml:248(title)
-#: useradd.8.xml:761(title) suauth.5.xml:197(title) su.1.xml:271(title)
-#: sg.1.xml:118(title) shadow.5.xml:248(title) shadow.3.xml:213(title)
-#: pwconv.8.xml:180(title) pwck.8.xml:220(title) porttime.5.xml:117(title)
-#: passwd.5.xml:134(title) passwd.1.xml:456(title) nologin.8.xml:64(title)
+#: useradd.8.xml:761(title) suauth.5.xml:197(title) su.1.xml:362(title)
+#: sg.1.xml:118(title) shadow.5.xml:258(title) shadow.3.xml:213(title)
+#: pwconv.8.xml:180(title) pwck.8.xml:302(title) porttime.5.xml:117(title)
+#: passwd.5.xml:144(title) passwd.1.xml:455(title) nologin.8.xml:64(title)
 #: newusers.8.xml:399(title) newgrp.1.xml:129(title)
 #: login.defs.5.xml:471(title) login.access.5.xml:108(title)
-#: login.1.xml:370(title) limits.5.xml:150(title) gshadow.5.xml:159(title)
-#: grpck.8.xml:190(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
+#: login.1.xml:376(title) limits.5.xml:150(title) gshadow.5.xml:159(title)
+#: grpck.8.xml:254(title) groups.1.xml:87(title) groupmod.8.xml:233(title)
 #: groupmems.8.xml:186(title) groupdel.8.xml:146(title)
-#: groupadd.8.xml:291(title) gpasswd.1.xml:248(title) faillog.8.xml:214(title)
+#: groupadd.8.xml:291(title) gpasswd.1.xml:251(title) faillog.8.xml:214(title)
 #: faillog.5.xml:83(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
 #: chpasswd.8.xml:238(title) chgpasswd.8.xml:208(title) chfn.1.xml:131(title)
 #: chage.1.xml:261(title)
@@ -655,9 +656,9 @@
 msgstr ""
 
 #: usermod.8.xml:340(title) userdel.8.xml:221(title) useradd.8.xml:597(title)
-#: su.1.xml:217(title) shadow.3.xml:193(title) passwd.1.xml:339(title)
+#: su.1.xml:302(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
 #: newusers.8.xml:312(title) login.1.xml:238(title) lastlog.8.xml:159(title)
-#: groupdel.8.xml:65(title) groupadd.8.xml:224(title) gpasswd.1.xml:203(title)
+#: groupdel.8.xml:65(title) groupadd.8.xml:224(title) gpasswd.1.xml:206(title)
 #: faillog.8.xml:191(title) chpasswd.8.xml:182(title)
 #: chgpasswd.8.xml:157(title)
 msgid "CAVEATS"
@@ -683,22 +684,22 @@
 msgstr ""
 
 #: usermod.8.xml:359(title) userdel.8.xml:125(title) useradd.8.xml:621(title)
-#: su.1.xml:225(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
-#: pwck.8.xml:182(title) passwd.1.xml:357(title) newusers.8.xml:324(title)
-#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:154(title)
+#: su.1.xml:310(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
+#: pwck.8.xml:213(title) passwd.1.xml:356(title) newusers.8.xml:324(title)
+#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:173(title)
 #: groupmod.8.xml:152(title) groupmems.8.xml:156(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:186(title) gpasswd.1.xml:215(title)
+#: groupdel.8.xml:77(title) groupadd.8.xml:186(title) gpasswd.1.xml:218(title)
 #: chsh.1.xml:120(title) chpasswd.8.xml:194(title) chgpasswd.8.xml:169(title)
 #: chfn.1.xml:99(title)
 msgid "CONFIGURATION"
 msgstr ""
 
 #: usermod.8.xml:360(para) userdel.8.xml:126(para) useradd.8.xml:622(para)
-#: su.1.xml:226(para) sg.1.xml:77(para) pwck.8.xml:183(para)
-#: passwd.1.xml:358(para) newusers.8.xml:325(para) newgrp.1.xml:88(para)
-#: login.1.xml:273(para) grpck.8.xml:155(para) groupmod.8.xml:153(para)
+#: su.1.xml:311(para) sg.1.xml:77(para) pwck.8.xml:214(para)
+#: passwd.1.xml:357(para) newusers.8.xml:325(para) newgrp.1.xml:88(para)
+#: login.1.xml:273(para) grpck.8.xml:174(para) groupmod.8.xml:153(para)
 #: groupmems.8.xml:157(para) groupdel.8.xml:78(para) groupadd.8.xml:187(para)
-#: gpasswd.1.xml:216(para) chsh.1.xml:121(para) chpasswd.8.xml:195(para)
+#: gpasswd.1.xml:219(para) chsh.1.xml:121(para) chpasswd.8.xml:195(para)
 #: chgpasswd.8.xml:170(para) chfn.1.xml:100(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
@@ -990,46 +991,48 @@
 msgstr ""
 
 #: userdel.8.xml:149(filename) useradd.8.xml:683(filename)
-#: pwconv.8.xml:171(filename) passwd.1.xml:390(filename)
-#: newusers.8.xml:384(filename) login.access.5.xml:99(filename)
+#: su.1.xml:353(filename) pwconv.8.xml:171(filename)
+#: passwd.1.xml:389(filename) newusers.8.xml:384(filename)
+#: login.access.5.xml:99(filename) login.1.xml:367(filename)
 #: groupadd.8.xml:215(filename) chsh.1.xml:148(filename)
 #: chpasswd.8.xml:223(filename) chgpasswd.8.xml:199(filename)
 #: chfn.1.xml:116(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:151(para) useradd.8.xml:685(para) pwconv.8.xml:173(para)
-#: passwd.1.xml:392(para) newusers.8.xml:386(para)
-#: login.access.5.xml:101(para) groupadd.8.xml:217(para) chsh.1.xml:150(para)
-#: chpasswd.8.xml:225(para) chgpasswd.8.xml:201(para) chfn.1.xml:118(para)
+#: userdel.8.xml:151(para) useradd.8.xml:685(para) su.1.xml:355(para)
+#: pwconv.8.xml:173(para) passwd.1.xml:391(para) newusers.8.xml:386(para)
+#: login.access.5.xml:101(para) login.1.xml:369(para) groupadd.8.xml:217(para)
+#: chsh.1.xml:150(para) chpasswd.8.xml:225(para) chgpasswd.8.xml:201(para)
+#: chfn.1.xml:118(para)
 msgid "Shadow password suite configuration."
 msgstr ""
 
-#: userdel.8.xml:170(title) useradd.8.xml:692(title) pwck.8.xml:241(title)
-#: passwd.1.xml:405(title) grpck.8.xml:214(title) groupmod.8.xml:182(title)
+#: userdel.8.xml:170(title) useradd.8.xml:692(title) pwck.8.xml:251(title)
+#: passwd.1.xml:404(title) grpck.8.xml:209(title) groupmod.8.xml:182(title)
 #: groupdel.8.xml:107(title) groupadd.8.xml:246(title) chage.1.xml:228(title)
 msgid "EXIT VALUES"
 msgstr "AVSLUTNINGSVÄRDEN"
 
 #: userdel.8.xml:175(replaceable) useradd.8.xml:697(replaceable)
-#: pwck.8.xml:246(replaceable) passwd.1.xml:410(replaceable)
-#: grpck.8.xml:219(replaceable) groupmod.8.xml:187(replaceable)
+#: pwck.8.xml:256(replaceable) passwd.1.xml:409(replaceable)
+#: grpck.8.xml:214(replaceable) groupmod.8.xml:187(replaceable)
 #: groupdel.8.xml:112(replaceable) groupadd.8.xml:251(replaceable)
 #: chage.1.xml:233(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:177(para) useradd.8.xml:699(para) pwck.8.xml:248(para)
-#: passwd.1.xml:412(para) grpck.8.xml:221(para) groupmod.8.xml:189(para)
+#: userdel.8.xml:177(para) useradd.8.xml:699(para) pwck.8.xml:258(para)
+#: passwd.1.xml:411(para) grpck.8.xml:216(para) groupmod.8.xml:189(para)
 #: groupdel.8.xml:114(para) groupadd.8.xml:253(para) chage.1.xml:235(para)
 msgid "success"
 msgstr "lyckad"
 
 #: userdel.8.xml:181(replaceable) useradd.8.xml:703(replaceable)
-#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:252(replaceable)
-#: passwd.1.xml:45(manvolnum) passwd.1.xml:416(replaceable)
+#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:262(replaceable)
+#: passwd.1.xml:45(manvolnum) passwd.1.xml:415(replaceable)
 #: newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum)
-#: grpck.8.xml:225(replaceable) groups.1.xml:35(manvolnum)
+#: grpck.8.xml:220(replaceable) groups.1.xml:35(manvolnum)
 #: gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum)
 #: chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:35(manvolnum)
 #: chage.1.xml:239(replaceable)
@@ -1041,21 +1044,21 @@
 msgstr "kan inte uppdatera lösenordsfilen"
 
 #: userdel.8.xml:187(replaceable) useradd.8.xml:709(replaceable)
-#: pwck.8.xml:258(replaceable) passwd.1.xml:422(replaceable)
-#: grpck.8.xml:231(replaceable) groupmod.8.xml:193(replaceable)
+#: pwck.8.xml:268(replaceable) passwd.1.xml:421(replaceable)
+#: grpck.8.xml:226(replaceable) groupmod.8.xml:193(replaceable)
 #: groupdel.8.xml:118(replaceable) groupadd.8.xml:257(replaceable)
 #: chage.1.xml:245(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:189(para) useradd.8.xml:711(para) pwck.8.xml:254(para)
-#: grpck.8.xml:227(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
+#: userdel.8.xml:189(para) useradd.8.xml:711(para) pwck.8.xml:264(para)
+#: grpck.8.xml:222(para) groupmod.8.xml:195(para) groupdel.8.xml:120(para)
 #: groupadd.8.xml:259(para) chage.1.xml:247(para)
 msgid "invalid command syntax"
 msgstr "ogiltig kommandosyntax"
 
 #: userdel.8.xml:193(replaceable) useradd.8.xml:727(replaceable)
-#: pwck.8.xml:282(replaceable) passwd.1.xml:446(replaceable)
+#: pwck.8.xml:292(replaceable) passwd.1.xml:445(replaceable)
 #: groupmod.8.xml:211(replaceable) groupdel.8.xml:124(replaceable)
 msgid "6"
 msgstr "6"
@@ -1844,19 +1847,19 @@
 msgstr "Katalog som innehåller standardfiler."
 
 #: useradd.8.xml:715(replaceable) shadow.3.xml:35(manvolnum)
-#: pwck.8.xml:264(replaceable) passwd.1.xml:428(replaceable)
-#: grpck.8.xml:237(replaceable) groupmod.8.xml:199(replaceable)
+#: pwck.8.xml:274(replaceable) passwd.1.xml:427(replaceable)
+#: grpck.8.xml:232(replaceable) groupmod.8.xml:199(replaceable)
 #: groupadd.8.xml:263(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:717(para) passwd.1.xml:448(para) groupmod.8.xml:201(para)
+#: useradd.8.xml:717(para) passwd.1.xml:447(para) groupmod.8.xml:201(para)
 #: groupadd.8.xml:265(para)
 msgid "invalid argument to option"
 msgstr "ogiltigt argument till flagga"
 
-#: useradd.8.xml:721(replaceable) pwck.8.xml:270(replaceable)
-#: passwd.1.xml:434(replaceable) grpck.8.xml:243(replaceable)
+#: useradd.8.xml:721(replaceable) pwck.8.xml:280(replaceable)
+#: passwd.1.xml:433(replaceable) grpck.8.xml:238(replaceable)
 #: groupmod.8.xml:205(replaceable) groupadd.8.xml:269(replaceable)
 msgid "4"
 msgstr "4"
@@ -1942,11 +1945,11 @@
 msgstr "suauth"
 
 #: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
-#: pwck.8.xml:276(replaceable) porttime.5.xml:35(manvolnum)
-#: passwd.5.xml:35(manvolnum) passwd.1.xml:440(replaceable)
+#: pwck.8.xml:286(replaceable) porttime.5.xml:35(manvolnum)
+#: passwd.5.xml:35(manvolnum) passwd.1.xml:439(replaceable)
 #: login.defs.5.xml:98(manvolnum) login.access.5.xml:36(manvolnum)
 #: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
-#: grpck.8.xml:249(replaceable) faillog.5.xml:35(manvolnum)
+#: grpck.8.xml:244(replaceable) faillog.5.xml:35(manvolnum)
 msgid "5"
 msgstr "5"
 
@@ -2232,8 +2235,8 @@
 "The current environment is passed to the new shell. The value of <envar>"
 "$PATH</envar> is reset to <filename>/bin:/usr/bin</filename> for normal "
 "users, or <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the "
-"superuser. This may be changed with the <emphasis>ENV_PATH</emphasis> and "
-"<emphasis>ENV_SUPATH</emphasis> definitions in <filename>/etc/login.defs</"
+"superuser. This may be changed with the <option>ENV_PATH</option> and "
+"<option>ENV_SUPATH</option> definitions in <filename>/etc/login.defs</"
 "filename>."
 msgstr ""
 
@@ -2289,11 +2292,11 @@
 msgid "The shell that will be invoked."
 msgstr "Skalet som ska startas."
 
-#: su.1.xml:167(para)
+#: su.1.xml:170(para)
 msgid "The shell specified with --shell."
 msgstr "Skalet angivet med --shell."
 
-#: su.1.xml:170(para)
+#: su.1.xml:173(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
@@ -2301,13 +2304,13 @@
 "Om <option>--preserve-environment</option> används, anges skalet med "
 "miljövariabeln <envar>$SHELL</envar>."
 
-#: su.1.xml:177(para)
+#: su.1.xml:180(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
 msgstr ""
 
-#: su.1.xml:183(para)
+#: su.1.xml:186(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
@@ -2320,7 +2323,7 @@
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:190(para)
+#: su.1.xml:191(para)
 msgid ""
 "If the target user has a restricted shell (i.e. the shell field of this "
 "user's entry in <filename>/etc/passwd</filename> is not listed in <filename>/"
@@ -2329,7 +2332,7 @@
 "unless <command>su</command> is called by root."
 msgstr ""
 
-#: su.1.xml:201(term)
+#: su.1.xml:202(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2337,11 +2340,33 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:206(para)
-msgid "Preserve the current environment."
+#: su.1.xml:211(envar)
+msgid "$PATH"
+msgstr ""
+
+#: su.1.xml:213(para)
+msgid ""
+"reset according to the <filename>/etc/login.defs</filename> options "
+"<option>ENV_PATH</option> or <option>ENV_SUPATH</option> (see below);"
+msgstr ""
+
+#: su.1.xml:222(envar)
+msgid "$IFS"
+msgstr ""
+
+#: su.1.xml:224(para)
+msgid ""
+"reset to <quote>&lt;space&gt;&lt;tab&gt;&lt;newline&gt;</quote>, if it was "
+"set."
+msgstr ""
+
+#: su.1.xml:207(para)
+#, fuzzy
+#| msgid "Preserve the current environment."
+msgid "Preserve the current environment, except for: <placeholder-1/>"
 msgstr "Behåll den aktuella miljön."
 
-#: su.1.xml:207(para)
+#: su.1.xml:233(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
@@ -2349,8 +2374,53 @@
 "Om målanvändaren har ett begränsat skal har denna flagga ingen effekt "
 "(såvida inte <command>su</command> har startats av root)."
 
-#: su.1.xml:218(para)
+#: su.1.xml:242(para)
 msgid ""
+"The <envar>$HOME</envar>, <envar>$SHELL</envar>, <envar>$USER</envar>, "
+"<envar>$LOGNAME</envar>, <envar>$PATH</envar>, and <envar>$IFS</envar> "
+"environment variables are reset."
+msgstr ""
+
+#: su.1.xml:251(para)
+msgid ""
+"If <option>--login</option> is not used, the environment is copied, except "
+"for the variables above."
+msgstr ""
+
+#: su.1.xml:258(para)
+msgid ""
+"If <option>--login</option> is used, the <envar>$TERM</envar>, <envar>"
+"$COLORTERM</envar>, <envar>$DISPLAY</envar>, and <envar>$XAUTHORITY</envar> "
+"environment variables are copied if they were set."
+msgstr ""
+
+#: su.1.xml:268(para)
+msgid ""
+"If <option>--login</option> is used, the <envar>$TZ</envar>, <envar>$HZ</"
+"envar>, and <envar>$MAIL</envar> environment variables are set according to "
+"the <filename>/etc/login.defs</filename> options <option>ENV_TZ</option>, "
+"<option>ENV_HZ</option>, <option>MAIL_DIR</option>, and <option>MAIL_FILE</"
+"option> (see below)."
+msgstr ""
+
+#: su.1.xml:281(para)
+msgid ""
+"If <option>--login</option> is used, other environment variables might be "
+"set by the <option>ENVIRON_FILE</option> file (see below)."
+msgstr ""
+
+#: su.1.xml:289(para)
+msgid "Other environment might be set by PAM modules."
+msgstr ""
+
+#: su.1.xml:237(para)
+msgid ""
+"Note that the default behavior for the environment is the following: "
+"<placeholder-1/>"
+msgstr ""
+
+#: su.1.xml:303(para)
+msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
 msgstr ""
@@ -2438,6 +2508,16 @@
 "Every line should be in the form name=value."
 msgstr ""
 
+#: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
+#, fuzzy
+#| msgid ""
+#| "The file is formatted like this, with lines starting with a # being "
+#| "treated as comment lines and ignored;"
+msgid "Lines starting with a # are treated as comment lines and ignored."
+msgstr ""
+"Filen är i följande format, med de rader som inleds med # behandlas som "
+"kommentarsrader och ignoreras;"
+
 #: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_PATH</option> (string)"
@@ -2579,14 +2659,22 @@
 "sulog file logging."
 msgstr ""
 
-#: su.1.xml:272(para)
+#: su.1.xml:363(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>login.defs</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>sh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>sg</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -2660,8 +2748,9 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>"
+"citerefentry><phrase condition=\"gshadow\">, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry></phrase>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -2676,7 +2765,7 @@
 
 #: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
 #: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
-#: pwck.8.xml:60(replaceable) pwck.8.xml:74(replaceable)
+#: pwck.8.xml:60(replaceable) pwck.8.xml:75(replaceable)
 #: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
 msgid "shadow"
 msgstr "shadow"
@@ -2917,8 +3006,24 @@
 msgid "This field is reserved for future use."
 msgstr "sp_flag - reserverat för framtida användning"
 
-#: shadow.5.xml:249(para)
+#: shadow.5.xml:245(filename)
 #, fuzzy
+#| msgid "/etc/shadow"
+msgid "/etc/shadow-"
+msgstr "/etc/shadow"
+
+#: shadow.5.xml:247(para)
+msgid "Backup file for /etc/shadow."
+msgstr ""
+
+#: shadow.5.xml:248(para) passwd.5.xml:134(para)
+msgid ""
+"Note that this file is used by the tools of the shadow toolsuite, but not by "
+"all user and password management tools."
+msgstr ""
+
+#: shadow.5.xml:259(para)
+#, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
 #| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -3302,12 +3407,12 @@
 msgid "verify integrity of password files"
 msgstr "validera integriteten för lösenordsfiler"
 
-#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:140(option)
+#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:171(option)
 msgid "-q"
 msgstr "-q"
 
-#: pwck.8.xml:53(arg) pwck.8.xml:161(option) grpck.8.xml:58(arg)
-#: grpck.8.xml:130(option)
+#: pwck.8.xml:53(arg) pwck.8.xml:192(option) grpck.8.xml:58(arg)
+#: grpck.8.xml:149(option)
 msgid "-s"
 msgstr "-s"
 
@@ -3318,51 +3423,88 @@
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:68(arg) pwck.8.xml:151(option) login.1.xml:222(option)
-#: grpck.8.xml:49(arg) grpck.8.xml:120(option)
+#: pwck.8.xml:68(arg) pwck.8.xml:182(option) login.1.xml:222(option)
+#: grpck.8.xml:49(arg) grpck.8.xml:139(option)
 msgid "-r"
 msgstr "-r"
 
-#: pwck.8.xml:82(para)
+#: pwck.8.xml:84(para)
 msgid ""
-"The <command>pwck</command> command verifies the integrity of the system "
-"authentication information. All entries in the <filename>/etc/passwd</"
-"filename> and <filename>/etc/shadow</filename> are checked to see that the "
-"entry has the proper format and valid data in each field. The user is "
-"prompted to delete entries that are improperly formatted or which have other "
-"uncorrectable errors."
+"The <command>pwck</command> command verifies the integrity of the users and "
+"authentication information. It checks that all entries in <filename>/etc/"
+"passwd</filename> and <filename>/etc/shadow</filename> have the proper "
+"format and contain valid data. The user is prompted to delete entries that "
+"are improperly formatted or which have other uncorrectable errors."
 msgstr ""
 
-#: pwck.8.xml:91(para) grpck.8.xml:80(para)
+#: pwck.8.xml:93(para) grpck.8.xml:80(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr "Kontroller görs för att validera att varje post har:"
 
-#: pwck.8.xml:94(para) grpck.8.xml:84(para)
+#: pwck.8.xml:96(para) grpck.8.xml:84(para)
 msgid "the correct number of fields"
 msgstr "korrekt antal fält"
 
-#: pwck.8.xml:97(para)
-msgid "a unique user name"
+#: pwck.8.xml:99(para)
+#, fuzzy
+#| msgid "a unique user name"
+msgid "a unique and valid user name"
 msgstr "ett unikt användarnamn"
 
-#: pwck.8.xml:100(para)
+#: pwck.8.xml:102(para)
 msgid "a valid user and group identifier"
 msgstr "en giltig identifierare för användare och grupp"
 
-#: pwck.8.xml:103(para)
+#: pwck.8.xml:105(para)
 msgid "a valid primary group"
 msgstr "en giltig primär grupp"
 
-#: pwck.8.xml:106(para)
+#: pwck.8.xml:108(para)
 msgid "a valid home directory"
 msgstr "en giltig hemkatalog"
 
-#: pwck.8.xml:109(para)
+#: pwck.8.xml:111(para)
 msgid "a valid login shell"
 msgstr "ett giltigt inloggningsskal"
 
-#: pwck.8.xml:113(para)
+#: pwck.8.xml:115(para)
 msgid ""
+"<filename>shadow</filename> checks are enabled when a second file parameter "
+"is specified or when <filename>/etc/shadow</filename> exists on the system."
+msgstr ""
+
+#: pwck.8.xml:120(para)
+msgid "These checks are the following:"
+msgstr ""
+
+#: pwck.8.xml:125(para)
+msgid ""
+"every passwd entry has a matching shadow entry, and every shadow entry has a "
+"matching passwd entry"
+msgstr ""
+
+#: pwck.8.xml:131(para)
+msgid "passwords are specified in the shadowed file"
+msgstr ""
+
+#: pwck.8.xml:134(para)
+#, fuzzy
+#| msgid "the correct number of fields"
+msgid "shadow entries have the correct number of fields"
+msgstr "korrekt antal fält"
+
+#: pwck.8.xml:137(para)
+msgid "shadow entries are unique in shadow"
+msgstr ""
+
+#: pwck.8.xml:140(para)
+#, fuzzy
+#| msgid "days before password may be changed"
+msgid "the last password changes are not in the future"
+msgstr "dagar innan lösenordet får ändras"
+
+#: pwck.8.xml:144(para)
+msgid ""
 "The checks for correct number of fields and unique user name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
 "delete the entire line. If the user does not answer affirmatively, all "
@@ -3372,28 +3514,28 @@
 "<command>usermod</command> command to correct the error."
 msgstr ""
 
-#: pwck.8.xml:124(para)
+#: pwck.8.xml:155(para)
 msgid ""
 "The commands which operate on the <filename>/etc/passwd</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>pwck</command> "
 "should be used in those circumstances to remove the offending entry."
 msgstr ""
 
-#: pwck.8.xml:134(para)
+#: pwck.8.xml:165(para)
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>pwck</command> är:"
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:174(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
 msgstr ""
 
-#: pwck.8.xml:154(para)
+#: pwck.8.xml:185(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr "Starta kommandot <command>pwck</command> i skrivskyddat läge."
 
-#: pwck.8.xml:164(para)
+#: pwck.8.xml:195(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
@@ -3401,7 +3543,7 @@
 "Sorterar poster i <filename>/etc/passwd</filename> och <filename>/etc/"
 "shadow</filename> efter UID."
 
-#: pwck.8.xml:172(para)
+#: pwck.8.xml:203(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename>. The user may select "
@@ -3409,8 +3551,38 @@
 "<emphasis remap=\"I\">shadow</emphasis> parameters."
 msgstr ""
 
-#: pwck.8.xml:221(para)
+#: pwck.8.xml:270(para)
+msgid "one or more bad password entries"
+msgstr "en eller flera felaktiga lösenordsposter"
+
+#: pwck.8.xml:276(para)
+msgid "can't open password files"
+msgstr "kan inte öppna lösenordsfiler"
+
+#: pwck.8.xml:282(para)
+msgid "can't lock password files"
+msgstr "kan inte låsa lösenordsfiler"
+
+#: pwck.8.xml:288(para)
+msgid "can't update password files"
+msgstr "kan inte uppdatera lösenordsfiler"
+
+#: pwck.8.xml:294(para)
 #, fuzzy
+#| msgid "can't open password files"
+msgid "can't sort password files"
+msgstr "kan inte öppna lösenordsfiler"
+
+#: pwck.8.xml:252(para)
+msgid ""
+"The <command>pwck</command> command exits with the following values: "
+"<placeholder-1/>"
+msgstr ""
+"Kommandot <command>pwck</command> avslutas med följande värden: <placeholder-"
+"1/>"
+
+#: pwck.8.xml:303(para)
+#, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 #| "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -3439,36 +3611,6 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: pwck.8.xml:260(para)
-msgid "one or more bad password entries"
-msgstr "en eller flera felaktiga lösenordsposter"
-
-#: pwck.8.xml:266(para)
-msgid "can't open password files"
-msgstr "kan inte öppna lösenordsfiler"
-
-#: pwck.8.xml:272(para)
-msgid "can't lock password files"
-msgstr "kan inte låsa lösenordsfiler"
-
-#: pwck.8.xml:278(para)
-msgid "can't update password files"
-msgstr "kan inte uppdatera lösenordsfiler"
-
-#: pwck.8.xml:284(para)
-#, fuzzy
-#| msgid "can't open password files"
-msgid "can't sort password files"
-msgstr "kan inte öppna lösenordsfiler"
-
-#: pwck.8.xml:242(para)
-msgid ""
-"The <command>pwck</command> command exits with the following values: "
-"<placeholder-1/>"
-msgstr ""
-"Kommandot <command>pwck</command> avslutas med följande värden: <placeholder-"
-"1/>"
-
 #: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
 msgid "porttime"
 msgstr "porttime"
@@ -3658,8 +3800,18 @@
 msgid "optional encrypted password file"
 msgstr ""
 
-#: passwd.5.xml:135(para)
+#: passwd.5.xml:131(filename)
 #, fuzzy
+#| msgid "/etc/passwd"
+msgid "/etc/passwd-"
+msgstr "/etc/passwd"
+
+#: passwd.5.xml:133(para)
+msgid "Backup file for /etc/passwd."
+msgstr ""
+
+#: passwd.5.xml:145(para)
+#, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
 #| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -3951,9 +4103,13 @@
 msgid "Users with a locked password are not allowed to change their password."
 msgstr ""
 
-#: passwd.1.xml:247(term) chage.1.xml:138(term)
+#: passwd.1.xml:247(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+#| "replaceable>"
 msgid ""
-"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+"<option>-n</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAGAR</"
@@ -4022,14 +4178,13 @@
 msgid ""
 "Unlock the password of the named account. This option re-enables a password "
 "by changing the password back to its previous value (to the value before "
-"using the <option>-l</option> option), and by resetting the account expiry "
-"field."
+"using the <option>-l</option> option)."
 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:311(term)
+#: passwd.1.xml:310(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -4037,7 +4192,7 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>VARN_DAGAR</"
 "replaceable>"
 
-#: passwd.1.xml:315(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -4048,7 +4203,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:324(term)
+#: passwd.1.xml:323(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -4056,7 +4211,7 @@
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAGAR</"
 "replaceable>"
 
-#: passwd.1.xml:328(para)
+#: passwd.1.xml:327(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -4064,7 +4219,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:340(para)
+#: passwd.1.xml:339(para)
 #, fuzzy
 #| msgid ""
 #| "Not all options may be supported. Password complexity checking may vary "
@@ -4082,13 +4237,13 @@
 "kanske inte kan ändra sina lösenord på ett system om NIS är aktiverat och de "
 "inte är inloggade mot NIS-servern."
 
-#: passwd.1.xml:345(para)
+#: passwd.1.xml:344(para)
 msgid ""
 "Users may not be able to change their password on a system if NIS is enabled "
 "and they are not logged into the NIS server."
 msgstr ""
 
-#: passwd.1.xml:350(para)
+#: passwd.1.xml:349(para)
 msgid ""
 "<command>passwd</command> uses PAM to authenticate users and to change their "
 "passwords."
@@ -4280,37 +4435,37 @@
 "option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:396(filename)
+#: passwd.1.xml:395(filename)
 #, fuzzy
 #| msgid "/etc/passwd"
 msgid "/etc/pam.d/passwd"
 msgstr "/etc/passwd"
 
-#: passwd.1.xml:398(para)
+#: passwd.1.xml:397(para)
 msgid "PAM configuration for <command>passwd</command>."
 msgstr ""
 
-#: passwd.1.xml:418(para) chage.1.xml:241(para)
+#: passwd.1.xml:417(para) chage.1.xml:241(para)
 msgid "permission denied"
 msgstr "åtkomst nekad"
 
-#: passwd.1.xml:424(para)
+#: passwd.1.xml:423(para)
 msgid "invalid combination of options"
 msgstr "ogiltig kombination av flaggor"
 
-#: passwd.1.xml:430(para)
+#: passwd.1.xml:429(para)
 msgid "unexpected failure, nothing done"
 msgstr "oväntat fel, ingenting har genomförts"
 
-#: passwd.1.xml:436(para)
+#: passwd.1.xml:435(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr "oväntat fel, filen <filename>passwd</filename> saknas"
 
-#: passwd.1.xml:442(para)
+#: passwd.1.xml:441(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr "Filen <filename>passwd</filename> är upptagen, försök igen"
 
-#: passwd.1.xml:406(para)
+#: passwd.1.xml:405(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4318,7 +4473,7 @@
 "Kommandot <command>passwd</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: passwd.1.xml:457(para)
+#: passwd.1.xml:456(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
@@ -4330,10 +4485,11 @@
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry "
-"condition=\"no_pam\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, <phrase condition="
+"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+"phrase><citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4694,7 +4850,7 @@
 
 #: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
 #: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
-#: groupadd.8.xml:58(replaceable) gpasswd.1.xml:63(replaceable)
+#: groupadd.8.xml:58(replaceable) gpasswd.1.xml:66(replaceable)
 msgid "group"
 msgstr "grupp"
 
@@ -4740,8 +4896,9 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
+"citerefentry><phrase condition=\"gshadow\">, <citerefentry condition="
+"\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry></phrase>."
 msgstr ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
@@ -5172,7 +5329,7 @@
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
 #: login.defs.5.xml:258(term) gpasswd.1.xml:42(refentrytitle)
-#: gpasswd.1.xml:47(refname) gpasswd.1.xml:58(command)
+#: gpasswd.1.xml:47(refname) gpasswd.1.xml:61(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
@@ -5616,7 +5773,7 @@
 msgid "Suppress printing of system messages."
 msgstr "Tysta ner utskrift av systemmeddelanden."
 
-#: login.1.xml:371(para)
+#: login.1.xml:377(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -6074,54 +6231,81 @@
 
 #: grpck.8.xml:70(para)
 msgid ""
-"The <command>grpck</command> command verifies the integrity of the system "
-"authentication information. All entries in <filename>/etc/group</"
+"The <command>grpck</command> command verifies the integrity of the groups "
+"information. It checks that all entries in <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\">and <filename>/etc/gshadow</"
-"filename></phrase> are checked to see that the entry has the proper format "
-"and valid data in each field. The user is prompted to delete entries that "
-"are improperly formatted or which have other uncorrectable errors."
+"filename></phrase> have the proper format and contain valid data. The user "
+"is prompted to delete entries that are improperly formatted or which have "
+"other uncorrectable errors."
 msgstr ""
 
 #: grpck.8.xml:87(para)
-msgid "a unique group name"
+#, fuzzy
+#| msgid "a unique group name"
+msgid "a unique and valid group name"
 msgstr "ett unikt gruppnamn"
 
 #: grpck.8.xml:90(para)
-msgid "a valid list of members and administrators"
+#, fuzzy
+#| msgid ""
+#| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
+#| "shadow</filename> by UID."
+msgid ""
+"a valid group identifier <phrase condition=\"gshadow\"> (<filename>/etc/"
+"group</filename> only)</phrase>"
+msgstr ""
+"Sorterar poster i <filename>/etc/passwd</filename> och <filename>/etc/"
+"shadow</filename> efter UID."
+
+#: grpck.8.xml:97(para)
+#, fuzzy
+#| msgid "a valid list of members and administrators"
+msgid ""
+"a valid list of members <phrase condition=\"gshadow\"> and administrators</"
+"phrase>"
 msgstr "en giltig lista med medlemmar och administratörer"
 
-#: grpck.8.xml:94(para)
+#: grpck.8.xml:103(para)
 msgid ""
+"a corresponding entry in the <filename>/etc/gshadow</filename> file "
+"(respectively <filename>/etc/group</filename> for the <filename>gshadow</"
+"filename> checks)"
+msgstr ""
+
+#: grpck.8.xml:111(para)
+msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
-"the entry has the wrong number of fields, the user will be prompted to "
-"delete the entire line. If the user does not answer affirmatively, all "
-"further checks are bypassed. An entry with a duplicated group name is "
-"prompted for deletion, but the remaining checks will still be made. All "
-"other errors are warnings and the user is encouraged to run the "
-"<command>groupmod</command> command to correct the error."
+"an entry has the wrong number of fields, the user will be prompted to delete "
+"the entire line. If the user does not answer affirmatively, all further "
+"checks are bypassed. An entry with a duplicated group name is prompted for "
+"deletion, but the remaining checks will still be made. All other errors are "
+"warnings and the user is encouraged to run the <command>groupmod</command> "
+"command to correct the error."
 msgstr ""
 
-#: grpck.8.xml:105(para)
+#: grpck.8.xml:122(para)
 msgid ""
-"The commands which operate on the <filename>/etc/group</filename> file are "
-"not able to alter corrupted or duplicated entries. <command>grpck</command> "
-"should be used in those circumstances to remove the offending entry."
+"The commands which operate on the <filename>/etc/group</filename><phrase "
+"condition=\"no_gshadow\">file</phrase><phrase condition=\"gshadow\">and "
+"<filename>/etc/gshadow</filename> files</phrase> are not able to alter "
+"corrupted or duplicated entries. <command>grpck</command> should be used in "
+"those circumstances to remove the offending entries."
 msgstr ""
 
-#: grpck.8.xml:115(para)
+#: grpck.8.xml:134(para)
 #, fuzzy
 #| msgid "The options which apply to the <command>pwck</command> command are:"
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>pwck</command> är:"
 
-#: grpck.8.xml:122(para)
+#: grpck.8.xml:141(para)
 msgid ""
 "Execute the <command>grpck</command> command in read-only mode. This causes "
 "all questions regarding changes to be answered <emphasis>no</emphasis> "
 "without user intervention."
 msgstr ""
 
-#: grpck.8.xml:132(para)
+#: grpck.8.xml:151(para)
 #, fuzzy
 #| msgid ""
 #| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
@@ -6133,7 +6317,7 @@
 "Sorterar poster i <filename>/etc/passwd</filename> och <filename>/etc/"
 "shadow</filename> efter UID."
 
-#: grpck.8.xml:141(para)
+#: grpck.8.xml:160(para)
 msgid ""
 "By default, <command>grpck</command> operates on <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</"
@@ -6143,46 +6327,23 @@
 "emphasis> parameters.</phrase>"
 msgstr ""
 
-#: grpck.8.xml:191(para)
-#, fuzzy
-msgid ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>groupmod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
-"condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-"manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>shadow</"
-"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>."
-
-#: grpck.8.xml:233(para)
+#: grpck.8.xml:228(para)
 msgid "one or more bad group entries"
 msgstr "en eller flera felaktiga grupposter"
 
-#: grpck.8.xml:239(para)
+#: grpck.8.xml:234(para)
 msgid "can't open group files"
 msgstr "kan inte öppna gruppfiler"
 
-#: grpck.8.xml:245(para)
+#: grpck.8.xml:240(para)
 msgid "can't lock group files"
 msgstr "kan inte låsa gruppfiler"
 
-#: grpck.8.xml:251(para)
+#: grpck.8.xml:246(para)
 msgid "can't update group files"
 msgstr "kan inte uppdatera gruppfiler"
 
-#: grpck.8.xml:215(para)
+#: grpck.8.xml:210(para)
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6190,6 +6351,30 @@
 "Kommandot <command>grpck</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
+#: grpck.8.xml:255(para)
+#, fuzzy
+msgid ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition="
+"\"gshadow\"><citerefentry><refentrytitle>gshadow</"
+"refentrytitle><manvolnum>5</manvolnum>, </citerefentry>, </"
+"phrase><citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>pwck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+"<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>."
+
 #: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
 #: groups.1.xml:45(command)
 msgid "groups"
@@ -6773,26 +6958,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:50(phrase)
+#: gpasswd.1.xml:49(phrase)
 #, fuzzy
-msgid "and <placeholder-1/> files"
-msgstr "-a <placeholder-1/>"
+#| msgid "-r <placeholder-1/>"
+msgid "administer <placeholder-1/>"
+msgstr "-r <placeholder-1/>"
 
 #: gpasswd.1.xml:52(phrase)
-msgid "file"
-msgstr ""
-
-#: gpasswd.1.xml:48(refpurpose)
 #, fuzzy
-msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
+msgid "administer <placeholder-1/> and <placeholder-2/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:60(replaceable)
+#: gpasswd.1.xml:63(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "flaggor"
 
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:73(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -6800,14 +6982,14 @@
 "\">administrators,</phrase> members and a password."
 msgstr ""
 
-#: gpasswd.1.xml:78(para)
+#: gpasswd.1.xml:81(para)
 msgid ""
 "System administrators can use the <option>-A</option> option to define group "
-"administrator(s) and the <option>-M</option> option to define members and "
-"has all rights of group administrators and members."
+"administrator(s) and the <option>-M</option> option to define members. They "
+"have all rights of group administrators and members."
 msgstr ""
 
-#: gpasswd.1.xml:83(para)
+#: gpasswd.1.xml:86(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -6815,7 +6997,7 @@
 "of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:90(para)
+#: gpasswd.1.xml:93(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still use "
@@ -6826,18 +7008,18 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> för detaljer om hur "
 "denna sträng tolkas."
 
-#: gpasswd.1.xml:98(title)
+#: gpasswd.1.xml:101(title)
 msgid "Notes about group passwords"
 msgstr "Noteringar angående grupplösenord"
 
-#: gpasswd.1.xml:99(para)
+#: gpasswd.1.xml:102(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:110(para)
+#: gpasswd.1.xml:113(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
@@ -6846,16 +7028,16 @@
 "Flaggorna <option>-r</option>, <option>-h</option> och <option>-f</option> "
 "används endast när <command>login</command> har startats av root."
 
-#: gpasswd.1.xml:114(para)
+#: gpasswd.1.xml:117(para)
 msgid "The options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:117(para)
+#: gpasswd.1.xml:120(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:122(term)
+#: gpasswd.1.xml:125(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
@@ -6864,13 +7046,13 @@
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: gpasswd.1.xml:126(para)
+#: gpasswd.1.xml:129(para)
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:135(term)
+#: gpasswd.1.xml:138(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
@@ -6880,39 +7062,39 @@
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>DAGAR</replaceable>"
 
-#: gpasswd.1.xml:139(para)
+#: gpasswd.1.xml:142(para)
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
 "<replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:148(term)
+#: gpasswd.1.xml:151(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--remove</option>"
 msgid "<option>-r</option>, <option>--remove-password</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
-#: gpasswd.1.xml:152(para)
+#: gpasswd.1.xml:155(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:163(term)
+#: gpasswd.1.xml:166(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-R</option>, <option>--restrict</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:167(para)
+#: gpasswd.1.xml:170(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:178(term)
+#: gpasswd.1.xml:181(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
@@ -6924,12 +7106,12 @@
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAGAR</"
 "replaceable>"
 
-#: gpasswd.1.xml:182(para)
+#: gpasswd.1.xml:185(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr "kommaseparerad lista med gruppadministratörer"
 
-#: gpasswd.1.xml:190(term)
+#: gpasswd.1.xml:193(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
@@ -6941,12 +7123,12 @@
 "<option>-b</option>, <option>--before</option><replaceable>DAGAR</"
 "replaceable>"
 
-#: gpasswd.1.xml:194(para)
+#: gpasswd.1.xml:197(para)
 #, fuzzy
 msgid "Set the list of group members."
 msgstr "kommaseparerad lista med gruppmedlemmar"
 
-#: gpasswd.1.xml:204(para)
+#: gpasswd.1.xml:207(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -6955,7 +7137,7 @@
 "server."
 msgstr ""
 
-#: gpasswd.1.xml:249(para)
+#: gpasswd.1.xml:252(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -7388,10 +7570,11 @@
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>newusers</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
-"condition=\"no_pam\"><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <phrase condition="
+"\"no_pam\"><citerefentry><refentrytitle>login.defs</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, </"
+"phrase><citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -7620,6 +7803,14 @@
 msgid "Show account aging information."
 msgstr "Visa kontots åldringsinformation"
 
+#: chage.1.xml:138(term)
+msgid ""
+"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+"replaceable>"
+msgstr ""
+"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAGAR</"
+"replaceable>"
+
 #: chage.1.xml:150(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
@@ -7706,6 +7897,10 @@
 msgid "translator-credits"
 msgstr "Daniel Nylander <po at danielnylander.se>, 2006."
 
+#, fuzzy
+#~ msgid "and <placeholder-1/> files"
+#~ msgstr "-a <placeholder-1/>"
+
 #~ msgid "encrypted password file"
 #~ msgstr "krypterad lösenordsfil"
 

Modified: upstream/trunk/po/bs.po
===================================================================
--- upstream/trunk/po/bs.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/bs.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2004-05-09 12:03+0100\n"
 "Last-Translator: Safir Šećerović <sapphire at linux.org.ba>\n"
 "Language-Team: Bosnian <lokal at lugbih.org>\n"
@@ -107,6 +107,10 @@
 msgstr[1] ""
 
 #, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr ""
+
+#, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr ""
 
@@ -543,25 +547,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr ""
 
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -669,22 +680,38 @@
 msgid "%s: Not a tty\n"
 msgstr ""
 
+#, c-format
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: grupa %s postoji\n"
@@ -762,19 +789,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr ""
@@ -1194,6 +1223,10 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr ""
 
+#, c-format
+msgid "%s: -s and -r are incompatible\n"
+msgstr ""
+
 #, fuzzy
 msgid "invalid password file entry"
 msgstr "Stara šifra:"
@@ -1375,40 +1408,81 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr ""
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
 
 msgid ""

Modified: upstream/trunk/po/ca.po
===================================================================
--- upstream/trunk/po/ca.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/ca.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2007-11-24 17:34+0100\n"
 "Last-Translator: Guillem Jover <guillem at debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -113,6 +113,10 @@
 "L'ultim va ser %s en %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: no es pot obtenir un UID únic\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: no es pot obtenir un GID únic\n"
 
@@ -614,63 +618,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Forma d'ús: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Forma d'ús: faillog [opcions]\n"
-"\n"
-"Opcions:\n"
-"  -a, --all                     mostra els registres de faillog de tots els\n"
-"                                usuaris\n"
-"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
-"  -l, --lock-time SEG           bloca durant SEG segons després d'una\n"
-"                                fallada d'accés\n"
-"  -m, --maximum MÀX             especifica els comptadors màxims de\n"
-"                                fallades d'accés a MÀX\n"
-"  -r, --reset                   reinicialitza els comptadors de fallades\n"
-"                                d'accés\n"
-"  -t, --time DIES               mostra registres de faillog més recents que\n"
-"                                DIES\n"
-"  -u, --user USUARI             mostra registre de faillog o manté\n"
-"                                comptadors de fallades i límits (si es fa\n"
-"                                servir amb les opcions -r, -m o -l) només\n"
-"                                per a l'usuari amb USUARI\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -783,35 +756,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: No és una tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Forma d'ús: %s [entrada]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Forma d'ús: groupadd [opcions] GRUP\n"
-"\n"
-"Opcions:\n"
-"  -f, --force                   força la sortida amb un estat d'èxit si el\n"
-"                                grup especificat ja existeix\n"
-"  -g, --gid GID                 usa GID per al nou grup\n"
-"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
-"  -K, --key CLAU=VALOR          substitueix els valors predeterminats de\n"
-"                                /etc/login.defs\n"
-"  -o, --non-unique              permet crear grups amb GID duplicats\n"
-"                                (no únics)\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -895,29 +872,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Forma d'ús: groupmod [opcions] GRUP\n"
-"\n"
-"Opcions:\n"
-"  -g, --gid GID                 força l'ús del nou GID per a GRUP\n"
-"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
-"  -n, --new-name NOU_GRUP       força l'ús del nom NOU_GRUP per a GRUP\n"
-"  -o, --non-unique              permet usar GID duplicats (no únics) per\n"
-"                                a GRUP\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "el nom de grup «%s» no és vàlid\n"
@@ -1434,6 +1403,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Forma d'ús: %s [-q] [-r] [-s] [contrasenya [ombra]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: «-s» i «-r» són incompatibles\n"
+
 msgid "invalid password file entry"
 msgstr "l'entrada del fitxer de contrasenyes no és vàlida"
 
@@ -1638,80 +1612,87 @@
 msgstr "%s: s'han especificat massa grups (màx de %d).\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Forma d'ús: %s [entrada]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Forma d'ús: useradd [opcions] USUARI\n"
-"\n"
-"Opcions:\n"
-"  -b, --base-dir DIR_BASE          directori base per al directori personal\n"
-"                                   del nou compte d'usuari\n"
-"  -c, --comment COMENTARI          estableix el camp GECOS per al nou\n"
-"                                   compte d'usuari\n"
-"  -d, --home-dir DIR_PERSONAL      directori personal per al nou compte\n"
-"  -D, --defaults                   mostra o guarda les modificacions a les\n"
-"                                   d'usuari configuracions predeterminades\n"
-"                                   de useradd\n"
-"  -e, --expiredate DATA_CADUCITAT  estableix la data de caducitat del\n"
-"                                   compte a DATA_CADUCITAT\n"
-"  -f, --inactive INACTIU           estableix la contrasenya a inactiva\n"
-"                                   després\n"
-"                                   d'INACTIU dies de caducitat\n"
-"  -g, --gid GRUP                   força l'ús del GRUP per al nou compte\n"
-"                                   creat\n"
-"  -G, --groups GRUPS               llista de grups suplementaris per al nou\n"
-"                                   compte d'usuari\n"
-"  -h, --help                       mostra aquest missatge d'ajuda i acaba\n"
-"  -k, --skel DIR_SKEL              especifica un directori skel alternatiu\n"
-"  -K, --key CLAU=VALOR             substitueix els valors predeterminats de\n"
-"                                   /etc/login.defs\n"
-"  -m, --create-home                crea el directori personal per al nou\n"
-"                                   compte d'usuari\n"
-"  -o, --non-unique                 permet crear usuaris amb UID duplicats\n"
-"                                   (no únics)\n"
-"  -p, --password CONTRASENYA       usa contrasenya xifrada per al nou\n"
-"                                   compte d'usuari\n"
-"  -s, --shell INTÈRPRET            l'intèrpret d'accés per al nou compte\n"
-"                                   d'usuari\n"
-"  -u, --uid UID                    força l'ús de UID per al nou compte\n"
-"                                   d'usuari\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2063,6 +2044,210 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: no es pot restaurar %s: %s (els seus canvis estan a %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Forma d'ús: faillog [opcions]\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ "  -a, --all                     mostra els registres de faillog de tots "
+#~ "els\n"
+#~ "                                usuaris\n"
+#~ "  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+#~ "  -l, --lock-time SEG           bloca durant SEG segons després d'una\n"
+#~ "                                fallada d'accés\n"
+#~ "  -m, --maximum MÀX             especifica els comptadors màxims de\n"
+#~ "                                fallades d'accés a MÀX\n"
+#~ "  -r, --reset                   reinicialitza els comptadors de fallades\n"
+#~ "                                d'accés\n"
+#~ "  -t, --time DIES               mostra registres de faillog més recents "
+#~ "que\n"
+#~ "                                DIES\n"
+#~ "  -u, --user USUARI             mostra registre de faillog o manté\n"
+#~ "                                comptadors de fallades i límits (si es "
+#~ "fa\n"
+#~ "                                servir amb les opcions -r, -m o -l) "
+#~ "només\n"
+#~ "                                per a l'usuari amb USUARI\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Forma d'ús: groupadd [opcions] GRUP\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ "  -f, --force                   força la sortida amb un estat d'èxit si "
+#~ "el\n"
+#~ "                                grup especificat ja existeix\n"
+#~ "  -g, --gid GID                 usa GID per al nou grup\n"
+#~ "  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+#~ "  -K, --key CLAU=VALOR          substitueix els valors predeterminats de\n"
+#~ "                                /etc/login.defs\n"
+#~ "  -o, --non-unique              permet crear grups amb GID duplicats\n"
+#~ "                                (no únics)\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Forma d'ús: groupmod [opcions] GRUP\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ "  -g, --gid GID                 força l'ús del nou GID per a GRUP\n"
+#~ "  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+#~ "  -n, --new-name NOU_GRUP       força l'ús del nom NOU_GRUP per a GRUP\n"
+#~ "  -o, --non-unique              permet usar GID duplicats (no únics) per\n"
+#~ "                                a GRUP\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Forma d'ús: useradd [opcions] USUARI\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ "  -b, --base-dir DIR_BASE          directori base per al directori "
+#~ "personal\n"
+#~ "                                   del nou compte d'usuari\n"
+#~ "  -c, --comment COMENTARI          estableix el camp GECOS per al nou\n"
+#~ "                                   compte d'usuari\n"
+#~ "  -d, --home-dir DIR_PERSONAL      directori personal per al nou compte\n"
+#~ "  -D, --defaults                   mostra o guarda les modificacions a "
+#~ "les\n"
+#~ "                                   d'usuari configuracions "
+#~ "predeterminades\n"
+#~ "                                   de useradd\n"
+#~ "  -e, --expiredate DATA_CADUCITAT  estableix la data de caducitat del\n"
+#~ "                                   compte a DATA_CADUCITAT\n"
+#~ "  -f, --inactive INACTIU           estableix la contrasenya a inactiva\n"
+#~ "                                   després\n"
+#~ "                                   d'INACTIU dies de caducitat\n"
+#~ "  -g, --gid GRUP                   força l'ús del GRUP per al nou compte\n"
+#~ "                                   creat\n"
+#~ "  -G, --groups GRUPS               llista de grups suplementaris per al "
+#~ "nou\n"
+#~ "                                   compte d'usuari\n"
+#~ "  -h, --help                       mostra aquest missatge d'ajuda i "
+#~ "acaba\n"
+#~ "  -k, --skel DIR_SKEL              especifica un directori skel "
+#~ "alternatiu\n"
+#~ "  -K, --key CLAU=VALOR             substitueix els valors predeterminats "
+#~ "de\n"
+#~ "                                   /etc/login.defs\n"
+#~ "  -m, --create-home                crea el directori personal per al nou\n"
+#~ "                                   compte d'usuari\n"
+#~ "  -o, --non-unique                 permet crear usuaris amb UID "
+#~ "duplicats\n"
+#~ "                                   (no únics)\n"
+#~ "  -p, --password CONTRASENYA       usa contrasenya xifrada per al nou\n"
+#~ "                                   compte d'usuari\n"
+#~ "  -s, --shell INTÈRPRET            l'intèrpret d'accés per al nou compte\n"
+#~ "                                   d'usuari\n"
+#~ "  -u, --uid UID                    força l'ús de UID per al nou compte\n"
+#~ "                                   d'usuari\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "S'ha establert la contrasenya a caducada."
 

Modified: upstream/trunk/po/cs.po
===================================================================
--- upstream/trunk/po/cs.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/cs.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2009-04-26 12:18+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -116,6 +116,11 @@
 "%d selhání od posledního přihlášení.\n"
 "Poslední: %s na %s.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: Nelze získat jedinečné UID (volná UID neexistují)\n"
+
 #, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: Nelze získat jedinečné GID (volná GID neexistují)\n"
@@ -612,42 +617,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Použití: expiry {-f|-c}\n"
 
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Použití: faillog [volby]\n"
-"\n"
-"Volby:\n"
-"  -a, --all                     zobrazí záznamy faillogu o všech "
-"uživatelích\n"
-"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
-"  -l, --lock-time SEK           po neúspěšném přihlášení zamkne účet na SEC\n"
-"                                sekund\n"
-"  -m, --maximum MAX             nastaví maximální počet chybných přihlášení\n"
-"                                na MAX\n"
-"  -r, --reset                   vynuluje počitadla chybných přihlášení\n"
-"  -t, --time DNŮ                zobrazí záznamy faillogu novější než DNŮ\n"
-"  -u, --user ÚČET               zobrazí záznamy faillogu nebo upraví\n"
-"                                počitadla a limity chybných přihlášení\n"
-"                                pouze pro uživatele ÚČET (s volbami -r, -m\n"
-"                                nebo -l)\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
@@ -773,35 +768,47 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Nejedná se o tty\n"
 
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Použití: %s [vstup]\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
+msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
 msgstr ""
-"Použití: groupadd [volby] SKUPINA\n"
-"\n"
-"Volby:\n"
-"  -f, --force                   vynutí úspěšný návratový kód i když\n"
-"                                zadaná skupina existuje\n"
-"  -g, --gid GID                 pro novou skupinu použije GID\n"
-"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
-"  -K, --key KLÍČ=HODNOTA        přebije výchozí nastavení /etc/login.defs\n"
-"  -o, --non-unique              povolí vytvoření skupiny s duplicitním\n"
-"                                (nejedinečným) GID\n"
-"  -p, --password HESLO          pro novou skupinu použije šifrované heslo\n"
-"  -r, --system                  vytvoří systémový účet\n"
-"\n"
 
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: „%s“ není platným jménem skupiny\n"
@@ -890,29 +897,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr "%s: volbu -g/--group může používat pouze root\n"
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Použití: groupmod [volby] SKUPINA\n"
-"\n"
-"Volby:\n"
-"  -g, --gid GID                 pro SKUPINU vynutí nové GID\n"
-"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
-"  -n, --new-name NOVÁ_SKUPINA   vnutí SKUPINĚ jméno NOVÁ_SKUPINA\n"
-"  -o, --non-unique              povolí skupině použít duplicitní\n"
-"                                (nejedinečné) GID\n"
-"  -p, --password HESLO          pro SKUPINU použije šifrované heslo\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: neplatné jméno skupiny „%s“\n"
@@ -1387,6 +1386,11 @@
 msgstr ""
 "Použití: %s [-q] [-r] [-s] [soubor s hesly [soubor se stínovými hesly]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s a -r nejsou slučitelné\n"
+
 msgid "invalid password file entry"
 msgstr "chybná položka v souboru s hesly"
 
@@ -1579,122 +1583,111 @@
 msgstr "%s: zadáno příliš mnoho skupin (max %d).\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: useradd [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-#| "                                home directory\n"
-#| "  -c, --comment COMMENT         set the GECOS field for the new user "
-#| "account\n"
-#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-#| "  -D, --defaults                print or save modified default useradd\n"
-#| "                                configuration\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
-#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
-#| "                                user account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-#| "  -l, --no-log-init             do not add the user to the lastlog and\n"
-#| "                                faillog databases\n"
-#| "  -m, --create-home             create home directory for the new user\n"
-#| "                                account\n"
-#| "  -M, --no-create-home          do not create user's home directory\n"
-#| "                                (overrides /etc/login.defs)\n"
-#| "  -N, --no-user-group           do not create a group with the same name "
-#| "as\n"
-#| "                                the user\n"
-#| "  -o, --non-unique              allow create user with duplicate\n"
-#| "                                (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
-#| "                                account\n"
-#| "  -r, --system                  create a system account\n"
-#| "  -s, --shell SHELL             the login shell for the new user account\n"
-#| "  -u, --uid UID                 force use the UID for the new user "
-#| "account\n"
-#| "  -U, --user-group              create a group with the same name as the "
-#| "user\n"
-#| "\n"
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Použití: %s [vstup]\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Použití: useradd [volby] ÚČET\n"
-"\n"
-"Volby:\n"
-"  -b, --base-dir ZÁKL_ADR       základní adresář domovského adresáře nového\n"
-"                                uživatelského účtu\n"
-"  -c, --comment KOMENTÁŘ        nastaví pole GECOS nového účtu\n"
-"  -d, --home-dir DOMOV_ADR      domovský adresář nového účtu\n"
-"  -D, --defaults                vypíše nebo nastaví výchozí nastavení\n"
-"                                programu useradd\n"
-"  -e, --expiredate EXP_DATUM    nastaví vypršení platnosti účtu na "
-"EXP_DATUM\n"
-"  -f, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od vypršení\n"
-"  -g, --gid SKUPINA             vynutí použití této skupiny pro nový účet\n"
-"  -G, --groups SKUPINY          seznam dodatečných skupin, do kterých\n"
-"                                má nový účet patřit\n"
-"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
-"  -k, --skel VZOR_ADR           zadá alternativní vzorový adresář\n"
-"  -K, --key KLÍČ=HODNOTA        přebije výchozí nastavení /etc/login.defs\n"
-"  -l, --no-log-init             nepřidá uživatele do databází lastlog\n"
-"                                a faillog\n"
-"  -m, --create-home             vytvoří domovský adresář pro nový\n"
-"                                uživatelský účet\n"
-"  -M, --no-create-home          nevytvoří domovský adresář uživatele\n"
-"                                (přebíjí nastavení /etc/login.defs)\n"
-"  -N, --no-user-group           nevytvoří skupinu se stejným jménem jako\n"
-"                                uživatel\n"
-"  -o, --non-unique              povolí vytvoření uživatele s duplicitním\n"
-"                                (nejedinečným) UID\n"
-"  -p, --password HESLO          použije pro nový účet zadané zašifrované\n"
-"                                heslo\n"
-"  -r, --system                  vytvoří systémový účet\n"
-"  -s, --shell SHELL             přihlašovací shell nového účtu\n"
-"  -u, --uid UID                 vynutí použití tohoto UID pro nový účet\n"
-"  -U, --user-group              vytvoří skupinu se stejným jménem jako\n"
-"                                uživatel\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2068,6 +2061,229 @@
 msgstr "%s: %s nelze obnovit: %s (změny jsou v %s)\n"
 
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použití: faillog [volby]\n"
+#~ "\n"
+#~ "Volby:\n"
+#~ "  -a, --all                     zobrazí záznamy faillogu o všech "
+#~ "uživatelích\n"
+#~ "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+#~ "  -l, --lock-time SEK           po neúspěšném přihlášení zamkne účet na "
+#~ "SEC\n"
+#~ "                                sekund\n"
+#~ "  -m, --maximum MAX             nastaví maximální počet chybných "
+#~ "přihlášení\n"
+#~ "                                na MAX\n"
+#~ "  -r, --reset                   vynuluje počitadla chybných přihlášení\n"
+#~ "  -t, --time DNŮ                zobrazí záznamy faillogu novější než DNŮ\n"
+#~ "  -u, --user ÚČET               zobrazí záznamy faillogu nebo upraví\n"
+#~ "                                počitadla a limity chybných přihlášení\n"
+#~ "                                pouze pro uživatele ÚČET (s volbami -r, -"
+#~ "m\n"
+#~ "                                nebo -l)\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použití: groupadd [volby] SKUPINA\n"
+#~ "\n"
+#~ "Volby:\n"
+#~ "  -f, --force                   vynutí úspěšný návratový kód i když\n"
+#~ "                                zadaná skupina existuje\n"
+#~ "  -g, --gid GID                 pro novou skupinu použije GID\n"
+#~ "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+#~ "  -K, --key KLÍČ=HODNOTA        přebije výchozí nastavení /etc/login."
+#~ "defs\n"
+#~ "  -o, --non-unique              povolí vytvoření skupiny s duplicitním\n"
+#~ "                                (nejedinečným) GID\n"
+#~ "  -p, --password HESLO          pro novou skupinu použije šifrované "
+#~ "heslo\n"
+#~ "  -r, --system                  vytvoří systémový účet\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použití: groupmod [volby] SKUPINA\n"
+#~ "\n"
+#~ "Volby:\n"
+#~ "  -g, --gid GID                 pro SKUPINU vynutí nové GID\n"
+#~ "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+#~ "  -n, --new-name NOVÁ_SKUPINA   vnutí SKUPINĚ jméno NOVÁ_SKUPINA\n"
+#~ "  -o, --non-unique              povolí skupině použít duplicitní\n"
+#~ "                                (nejedinečné) GID\n"
+#~ "  -p, --password HESLO          pro SKUPINU použije šifrované heslo\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Usage: useradd [options] LOGIN\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~| "                                home directory\n"
+#~| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~| "account\n"
+#~| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~| "  -D, --defaults                print or save modified default useradd\n"
+#~| "                                configuration\n"
+#~| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -g, --gid GROUP               force use GROUP for the new user "
+#~| "account\n"
+#~| "  -G, --groups GROUPS           list of supplementary groups for the "
+#~| "new\n"
+#~| "                                user account\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~| "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~| "                                faillog databases\n"
+#~| "  -m, --create-home             create home directory for the new user\n"
+#~| "                                account\n"
+#~| "  -M, --no-create-home          do not create user's home directory\n"
+#~| "                                (overrides /etc/login.defs)\n"
+#~| "  -N, --no-user-group           do not create a group with the same name "
+#~| "as\n"
+#~| "                                the user\n"
+#~| "  -o, --non-unique              allow create user with duplicate\n"
+#~| "                                (non-unique) UID\n"
+#~| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~| "                                account\n"
+#~| "  -r, --system                  create a system account\n"
+#~| "  -s, --shell SHELL             the login shell for the new user "
+#~| "account\n"
+#~| "  -u, --uid UID                 force use the UID for the new user "
+#~| "account\n"
+#~| "  -U, --user-group              create a group with the same name as the "
+#~| "user\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Použití: useradd [volby] ÚČET\n"
+#~ "\n"
+#~ "Volby:\n"
+#~ "  -b, --base-dir ZÁKL_ADR       základní adresář domovského adresáře "
+#~ "nového\n"
+#~ "                                uživatelského účtu\n"
+#~ "  -c, --comment KOMENTÁŘ        nastaví pole GECOS nového účtu\n"
+#~ "  -d, --home-dir DOMOV_ADR      domovský adresář nového účtu\n"
+#~ "  -D, --defaults                vypíše nebo nastaví výchozí nastavení\n"
+#~ "                                programu useradd\n"
+#~ "  -e, --expiredate EXP_DATUM    nastaví vypršení platnosti účtu na "
+#~ "EXP_DATUM\n"
+#~ "  -f, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od "
+#~ "vypršení\n"
+#~ "  -g, --gid SKUPINA             vynutí použití této skupiny pro nový "
+#~ "účet\n"
+#~ "  -G, --groups SKUPINY          seznam dodatečných skupin, do kterých\n"
+#~ "                                má nový účet patřit\n"
+#~ "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+#~ "  -k, --skel VZOR_ADR           zadá alternativní vzorový adresář\n"
+#~ "  -K, --key KLÍČ=HODNOTA        přebije výchozí nastavení /etc/login."
+#~ "defs\n"
+#~ "  -l, --no-log-init             nepřidá uživatele do databází lastlog\n"
+#~ "                                a faillog\n"
+#~ "  -m, --create-home             vytvoří domovský adresář pro nový\n"
+#~ "                                uživatelský účet\n"
+#~ "  -M, --no-create-home          nevytvoří domovský adresář uživatele\n"
+#~ "                                (přebíjí nastavení /etc/login.defs)\n"
+#~ "  -N, --no-user-group           nevytvoří skupinu se stejným jménem jako\n"
+#~ "                                uživatel\n"
+#~ "  -o, --non-unique              povolí vytvoření uživatele s duplicitním\n"
+#~ "                                (nejedinečným) UID\n"
+#~ "  -p, --password HESLO          použije pro nový účet zadané zašifrované\n"
+#~ "                                heslo\n"
+#~ "  -r, --system                  vytvoří systémový účet\n"
+#~ "  -s, --shell SHELL             přihlašovací shell nového účtu\n"
+#~ "  -u, --uid UID                 vynutí použití tohoto UID pro nový účet\n"
+#~ "  -U, --user-group              vytvoří skupinu se stejným jménem jako\n"
+#~ "                                uživatel\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/da.po
===================================================================
--- upstream/trunk/po/da.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/da.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2007-11-24 18:50+0100\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish\n"
@@ -115,6 +115,10 @@
 "Sidst var %s, %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: kan ikke få unik UID\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: kan ikke få unik GID\n"
 
@@ -617,61 +621,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Brug: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Brug: faillog [tilvalg]\n"
-"\n"
-"Tilvalg:\n"
-"  -a, --all                     vis fejllog-optegnelser for alle brugere\n"
-"  -h, --help                    vis denne hjælpetekst og afslut\n"
-"  -l, --lock-time SEK           lås konto i SEK sekunder efter mislykket\n"
-"                                logind\n"
-"  -m, -- maximum MAKS           sæt det maksimale antal mislykkede logind\n"
-"                                til MAKS\n"
-"  -r, --reset                   nulstil optællingen af mislykkede logind\n"
-"  -r, --time DAGE               vis fejllog-optegnelser, der er nyere end\n"
-"                                DAGE\n"
-"  -u, --user LOGIND             vis fejllog-optegnelser eller vedligehold\n"
-"                                kun fejltællere og grænser (hvis den bruges\n"
-"                                sammen med tilvalgene -r, -m eller -l) for\n"
-"                                brugeren med LOGIND\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -784,35 +759,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Ikke en tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Brug: %s [inddata]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Brug: groupadd [tilvalg] GRUPPE\n"
-"\n"
-"Tilvalg:\n"
-"  -f, --force                   gennemtving success-afslutningsstatus hvis\n"
-"                                den angivne gruppe eksisterer i forvejen\n"
-"  -g, --gid GID                 benyt GID til den nye gruppe\n"
-"  -h, --help                    vis denne hjælpebesked og afslut\n"
-"  -K, --key NØGLE=VÆRDI         tilsidesætter standardværdier i\n"
-"                                /etc/login.defs\n"
-"  -o, --non-unique              tillad gruppe med dupleret\n"
-"                                (ikke-unikt) GID\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -896,29 +875,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Brug: groupmod [tilvalg] GRUPPE\n"
-"\n"
-"Tilvalg:\n"
-"  -g, --gid GID                 gennemtving GID til den nye gruppe\n"
-"  -h, --help                    vis denne hjælpebesked og afslut\n"
-"  -n, --new-name NY_GRUPPE      gennemtving NY_GRUPPE-navn efter GRUPPE\n"
-"  -o, --non-unique              tillad gruppe med dupleret (ikke-unikt) GID\n"
-"                                efter GRUPPE\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "ugyldigt gruppenavn '%s'\n"
@@ -1428,6 +1399,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Brug: %s [-q] [-r] [-s] [adgangskode [skygge]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s og -r er ikke kompatible\n"
+
 msgid "invalid password file entry"
 msgstr "ugyldig linje i adgangskodefil"
 
@@ -1631,73 +1607,87 @@
 msgstr "%s: der er angivet for mange grupper (højst %d).\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Brug: %s [inddata]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Brug: useradd [tilvalg] LOGIND\n"
-"\n"
-"Tilvalg:\n"
-"  -b, --base-dir GRUNDMAPPE     Grundmappe for den nye brugerkontos\n"
-"                                hjemmebibliotek\n"
-"  -c, --comment KOMMENTAR       sæt den nye brugerkontos GECOS-felt\n"
-"  -d, --home-dir HJEMMEMAPPE    den nye brugerkontos hjemmemappe\n"
-"  -D, --defaults                vis skal gem ændret standard\n"
-"                                useradd-opsætning\n"
-"  -e, --expiredate UDLØBSDATO   sæt kontoens udløbsdatur til UDLØBSDATO\n"
-"  -f, --inactive INAKTIV        sæt inaktiv adgangskode efter udløb til\n"
-"                                INAKTIV\n"
-"  -g, --gid GRUPPE              gennemtving brugen af GRUPPE til den nye\n"
-"                                brugerkonto\n"
-"  -G, --groups GRUPPER          vis den nye brugerkontos supplerende "
-"grupper\n"
-"  -h, --help                    vis denne hjælp og afslut\n"
-"  -k, --skel SKELETMAPPE        angiv en alternativ skeletmappe\n"
-"  -K, --key NØGLE=VÆRDI         tilsidesætter standardindstillingerne\n"
-"                                i /etc/login.defs\n"
-"  -m, --create-home             opret hjemmemappe til den nye brugerkonto\n"
-"  -o, --non-unique              tillad oprettelse af ens (ikke-unikke) UID\n"
-"  -p, --password ADGANGSKODE    brug krypteret adgangskode til den nye\n"
-"                                brugerkonto\n"
-"  -s, --shell SKAL              den nye brugerkontos logind-skal\n"
-"  -u, --uid UID                 gennemtving brugen af bruger-ID'en UID til\n"
-"                                den nye brugerkonto\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2041,6 +2031,198 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: kunne ikke genskabe %s: %s (dine ændringer er i %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Brug: faillog [tilvalg]\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ "  -a, --all                     vis fejllog-optegnelser for alle brugere\n"
+#~ "  -h, --help                    vis denne hjælpetekst og afslut\n"
+#~ "  -l, --lock-time SEK           lås konto i SEK sekunder efter mislykket\n"
+#~ "                                logind\n"
+#~ "  -m, -- maximum MAKS           sæt det maksimale antal mislykkede "
+#~ "logind\n"
+#~ "                                til MAKS\n"
+#~ "  -r, --reset                   nulstil optællingen af mislykkede logind\n"
+#~ "  -r, --time DAGE               vis fejllog-optegnelser, der er nyere "
+#~ "end\n"
+#~ "                                DAGE\n"
+#~ "  -u, --user LOGIND             vis fejllog-optegnelser eller "
+#~ "vedligehold\n"
+#~ "                                kun fejltællere og grænser (hvis den "
+#~ "bruges\n"
+#~ "                                sammen med tilvalgene -r, -m eller -l) "
+#~ "for\n"
+#~ "                                brugeren med LOGIND\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Brug: groupadd [tilvalg] GRUPPE\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ "  -f, --force                   gennemtving success-afslutningsstatus "
+#~ "hvis\n"
+#~ "                                den angivne gruppe eksisterer i forvejen\n"
+#~ "  -g, --gid GID                 benyt GID til den nye gruppe\n"
+#~ "  -h, --help                    vis denne hjælpebesked og afslut\n"
+#~ "  -K, --key NØGLE=VÆRDI         tilsidesætter standardværdier i\n"
+#~ "                                /etc/login.defs\n"
+#~ "  -o, --non-unique              tillad gruppe med dupleret\n"
+#~ "                                (ikke-unikt) GID\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Brug: groupmod [tilvalg] GRUPPE\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ "  -g, --gid GID                 gennemtving GID til den nye gruppe\n"
+#~ "  -h, --help                    vis denne hjælpebesked og afslut\n"
+#~ "  -n, --new-name NY_GRUPPE      gennemtving NY_GRUPPE-navn efter GRUPPE\n"
+#~ "  -o, --non-unique              tillad gruppe med dupleret (ikke-unikt) "
+#~ "GID\n"
+#~ "                                efter GRUPPE\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Brug: useradd [tilvalg] LOGIND\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ "  -b, --base-dir GRUNDMAPPE     Grundmappe for den nye brugerkontos\n"
+#~ "                                hjemmebibliotek\n"
+#~ "  -c, --comment KOMMENTAR       sæt den nye brugerkontos GECOS-felt\n"
+#~ "  -d, --home-dir HJEMMEMAPPE    den nye brugerkontos hjemmemappe\n"
+#~ "  -D, --defaults                vis skal gem ændret standard\n"
+#~ "                                useradd-opsætning\n"
+#~ "  -e, --expiredate UDLØBSDATO   sæt kontoens udløbsdatur til UDLØBSDATO\n"
+#~ "  -f, --inactive INAKTIV        sæt inaktiv adgangskode efter udløb til\n"
+#~ "                                INAKTIV\n"
+#~ "  -g, --gid GRUPPE              gennemtving brugen af GRUPPE til den nye\n"
+#~ "                                brugerkonto\n"
+#~ "  -G, --groups GRUPPER          vis den nye brugerkontos supplerende "
+#~ "grupper\n"
+#~ "  -h, --help                    vis denne hjælp og afslut\n"
+#~ "  -k, --skel SKELETMAPPE        angiv en alternativ skeletmappe\n"
+#~ "  -K, --key NØGLE=VÆRDI         tilsidesætter standardindstillingerne\n"
+#~ "                                i /etc/login.defs\n"
+#~ "  -m, --create-home             opret hjemmemappe til den nye "
+#~ "brugerkonto\n"
+#~ "  -o, --non-unique              tillad oprettelse af ens (ikke-unikke) "
+#~ "UID\n"
+#~ "  -p, --password ADGANGSKODE    brug krypteret adgangskode til den nye\n"
+#~ "                                brugerkonto\n"
+#~ "  -s, --shell SKAL              den nye brugerkontos logind-skal\n"
+#~ "  -u, --uid UID                 gennemtving brugen af bruger-ID'en UID "
+#~ "til\n"
+#~ "                                den nye brugerkonto\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "Adgangskode er sat til at udløbe."
 

Modified: upstream/trunk/po/de.po
===================================================================
--- upstream/trunk/po/de.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/de.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2009-05-08 13:23+0100\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -117,6 +117,11 @@
 "%d Fehlversuche seit letzter Anmeldung.\n"
 "Der letzte war am %s auf %s.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: Can't get unique system UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: Keine einmalige System-UID bekommen (keine UIDs mehr verfügbar).\n"
+
 #, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: Keine einmalige GID bekommen (keine GIDs mehr verfügbar).\n"
@@ -600,45 +605,38 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Aufruf: expiry {-f|-c}\n"
 
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+"  -Z, --selinux-user            neue SELinux-Benutzer-Zuordnung für den\n"
+"                                Benutzerzugang\n"
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Aufruf: faillog [Optionen]\n"
-"\n"
-"Optionen:\n"
-"  -a, --all                     Aufzeichnungen fehlgeschlagener Anmeldungen\n"
-"                                für alle Benutzer anzeigen\n"
-"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
-"  -l, --lock-time SEK           Den Benutzerzugang nach fehlgeschlagener\n"
-"                                Anmeldung für SEK Sekunden sperren\n"
-"  -m, --maximum MAX             Maximal mögliche Anzahl fehlgeschlagener\n"
-"                                Anmeldungen auf MAX setzen\n"
-"  -r, --reset                   Zähler fehlgeschlagener Anmeldungen\n"
-"                                zurücksetzen\n"
-"  -t, --time TAGE               Aufzeichnungen fehlgeschlagener Anmeldungen\n"
-"                                anzeigen, die jünger sind als TAGE Tage\n"
-"  -u, --user BENUTZERZUGANG     Aufzeichnungen fehlgeschlagener Anmeldungen\n"
-"                                anzeigen bzw. Verwalten von Zählern und Be-\n"
-"                                schränkungen (falls mit Optionen -r, -m oder "
-"-l\n"
-"                                aufgerufen) für den BENUTZERZUGANG\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
@@ -766,37 +764,62 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Kein tty\n"
 
+#, c-format
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
+"                                Verschlüsselungs-Algorithmus\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+"  -Z, --selinux-user            neue SELinux-Benutzer-Zuordnung für den\n"
+"                                Benutzerzugang\n"
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Aufruf: groupadd [Optionen] GRUPPE\n"
-"\n"
-"Optionen:\n"
-"  -f, --force                   Ohne Fehler beenden, falls die GRUPPE\n"
-"                                bereits existiert\n"
-"  -g, --gid GID                 Benutze GID für die neue GRUPPE\n"
-"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
-"  -K, --key SCHLÜSSEL=WERT      Die Vorgabewerte in /etc/login.defs\n"
-"                                überschreiben\n"
-"  -o, --non-unique              Das Erstellen einer GRUPPE mit einer nicht\n"
-"                                einmaligen (doppelten) GID erlauben\n"
-"  -p, --password PASSWORT       Verwende verschlüsseltes Passwort für die\n"
-"                                neue GRUPPE\n"
-"  -r, --system                  Erstelle eine Systemgruppe\n"
-"\n"
+"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
+"                                Verschlüsselungs-Algorithmus\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+"  -Z, --selinux-user            neue SELinux-Benutzer-Zuordnung für den\n"
+"                                Benutzerzugang\n"
+
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: »%s« ist kein gültiger Gruppenname.\n"
@@ -887,32 +910,27 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr "%s: Nur root kann die Option -g/--group nutzen.\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+"  -Z, --selinux-user            neue SELinux-Benutzer-Zuordnung für den\n"
+"                                Benutzerzugang\n"
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Aufruf: groupmod [Optionen] GRUPPE\n"
-"\n"
-"Optionen:\n"
-"  -g, --gid GID                 Neue GID für die GRUPPE erzwingen\n"
-"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
-"  -n, --new-name NEUE_GRUPPE    Neuen Namen NEUE_GRUPPE für die GRUPPE "
-"erzwingen\n"
-"  -o, --non-unique              Verwendung einer doppelten (nicht "
-"einmaligen)\n"
-"                                GID für die GRUPPE erlauben\n"
-"  -p, --password PASSWORT       Verwende verschlüsseltes Passwort als \n"
-"                                neues Passwort\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: Ungültiger Gruppenname »%s«\n"
@@ -1406,6 +1424,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Aufruf: %s [-q] [-r] [-s] [passwort [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s und -r sind nicht kompatibel.\n"
+
 msgid "invalid password file entry"
 msgstr "Ungültiger Eintrag in Passwortdatei"
 
@@ -1602,86 +1625,136 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
+"                                Verschlüsselungs-Algorithmus\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
+"                                Verschlüsselungs-Algorithmus\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
+"                                Verschlüsselungs-Algorithmus\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
+"                                Verschlüsselungs-Algorithmus\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+"  -Z, --selinux-user            neue SELinux-Benutzer-Zuordnung für den\n"
+"                                Benutzerzugang\n"
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
+"                                Verschlüsselungs-Algorithmus\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
+"                                Verschlüsselungs-Algorithmus\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+"  -Z, --selinux-user            neue SELinux-Benutzer-Zuordnung für den\n"
+"                                Benutzerzugang\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+"  -Z, --selinux-user            neue SELinux-Benutzer-Zuordnung für den\n"
+"                                Benutzerzugang\n"
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Aufruf: useradd [Optionen] BENUTZERZUGANG\n"
-"\n"
-"Optionen:\n"
-"  -b, --base-dir BASIS_VERZ     Basisverzeichnis für das\n"
-"                                Home-Verzeichnis des neuen Benutzers\n"
-"  -c, --comment KOMMENTAR       Kommentar für das GECOS-Feld des neuen\n"
-"                                Benutzers\n"
-"  -d, --home-dir HOME_VERZ      Home-Verzeichnis des neuen Benutzers\n"
-"  -D, --defaults                Anzeigen oder Speichern der modifizierten\n"
-"                                Standardkonfiguration für useradd\n"
-"  -e, --expiredate ABL_DATUM    Das Ablaufdatum des Benutzerzugangs auf\n"
-"                                ABL_DATUM setzen\n"
-"  -f, --inactive INAKTIV        Passwort nach Ablauf von INAKTIV "
-"deaktivieren\n"
-"  -g, --gid GRUPPE              Gruppenname GRUPPE für neuen Benutzer "
-"erzwingen\n"
-"  -G, --groups GRUPPEN          Liste der zusätzlichen Gruppen für den\n"
-"                                neuen Benutzer\n"
-"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
-"  -k, --skel SKEL_VERZ          Ein alternatives skel-Verzeichnis\n"
-"                                (Vorlagenverzeichnis) angeben\n"
-"  -K, --key SCHLÜSSEL=WERT      Die Vorgaben in /etc/login.defs "
-"überschreiben\n"
-"  -l, --no-log-init             Den Benutzer nicht zu den lastlog- und "
-"faillog-\n"
-"                                Datenbanken hinzufügen\n"
-"  -m, --create-home             Home-Verzeichnis des neuen Benutzers "
-"erstellen\n"
-"  -M, --no-create-home          Kein Home-Verzeichnis für den Benutzer "
-"erstellen\n"
-"                                (überschreibt /etc/login.defs)\n"
-"  -N, --no-user-group           Keine Gruppe mit dem gleichen Namen wie dem "
-"des\n"
-"                                Benutzers erstellen\n"
-"  -o, --non-unique              Benutzer mit doppelter (nicht einmaliger)\n"
-"                                UID erlauben\n"
-"  -p, --password PASSWORT       Benutze ein verschlüsseltes Passwort für\n"
-"                                den neuen Benutzerzugang\n"
-"  -r, --system                  Erstelle einen Systemzugang\n"
-"  -s, --shell SHELL             Die Login-Shell des neuen Benutzerzugangs\n"
-"  -u, --uid UID                 Benutzung dieser UID erzwingen\n"
-"  -U, --user-group              Erstelle eine Gruppe mit dem gleichen Namen "
-"wie\n"
-"                                dem des Benutzers\n"
-"%s\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2042,6 +2115,201 @@
 "(Ihre Änderungen befinden sich in %s)\n"
 
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Aufruf: faillog [Optionen]\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ "  -a, --all                     Aufzeichnungen fehlgeschlagener "
+#~ "Anmeldungen\n"
+#~ "                                für alle Benutzer anzeigen\n"
+#~ "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+#~ "  -l, --lock-time SEK           Den Benutzerzugang nach fehlgeschlagener\n"
+#~ "                                Anmeldung für SEK Sekunden sperren\n"
+#~ "  -m, --maximum MAX             Maximal mögliche Anzahl fehlgeschlagener\n"
+#~ "                                Anmeldungen auf MAX setzen\n"
+#~ "  -r, --reset                   Zähler fehlgeschlagener Anmeldungen\n"
+#~ "                                zurücksetzen\n"
+#~ "  -t, --time TAGE               Aufzeichnungen fehlgeschlagener "
+#~ "Anmeldungen\n"
+#~ "                                anzeigen, die jünger sind als TAGE Tage\n"
+#~ "  -u, --user BENUTZERZUGANG     Aufzeichnungen fehlgeschlagener "
+#~ "Anmeldungen\n"
+#~ "                                anzeigen bzw. Verwalten von Zählern und "
+#~ "Be-\n"
+#~ "                                schränkungen (falls mit Optionen -r, -m "
+#~ "oder -l\n"
+#~ "                                aufgerufen) für den BENUTZERZUGANG\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Aufruf: groupadd [Optionen] GRUPPE\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ "  -f, --force                   Ohne Fehler beenden, falls die GRUPPE\n"
+#~ "                                bereits existiert\n"
+#~ "  -g, --gid GID                 Benutze GID für die neue GRUPPE\n"
+#~ "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+#~ "  -K, --key SCHLÜSSEL=WERT      Die Vorgabewerte in /etc/login.defs\n"
+#~ "                                überschreiben\n"
+#~ "  -o, --non-unique              Das Erstellen einer GRUPPE mit einer "
+#~ "nicht\n"
+#~ "                                einmaligen (doppelten) GID erlauben\n"
+#~ "  -p, --password PASSWORT       Verwende verschlüsseltes Passwort für "
+#~ "die\n"
+#~ "                                neue GRUPPE\n"
+#~ "  -r, --system                  Erstelle eine Systemgruppe\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Aufruf: groupmod [Optionen] GRUPPE\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ "  -g, --gid GID                 Neue GID für die GRUPPE erzwingen\n"
+#~ "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+#~ "  -n, --new-name NEUE_GRUPPE    Neuen Namen NEUE_GRUPPE für die GRUPPE "
+#~ "erzwingen\n"
+#~ "  -o, --non-unique              Verwendung einer doppelten (nicht "
+#~ "einmaligen)\n"
+#~ "                                GID für die GRUPPE erlauben\n"
+#~ "  -p, --password PASSWORT       Verwende verschlüsseltes Passwort als \n"
+#~ "                                neues Passwort\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Aufruf: useradd [Optionen] BENUTZERZUGANG\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ "  -b, --base-dir BASIS_VERZ     Basisverzeichnis für das\n"
+#~ "                                Home-Verzeichnis des neuen Benutzers\n"
+#~ "  -c, --comment KOMMENTAR       Kommentar für das GECOS-Feld des neuen\n"
+#~ "                                Benutzers\n"
+#~ "  -d, --home-dir HOME_VERZ      Home-Verzeichnis des neuen Benutzers\n"
+#~ "  -D, --defaults                Anzeigen oder Speichern der "
+#~ "modifizierten\n"
+#~ "                                Standardkonfiguration für useradd\n"
+#~ "  -e, --expiredate ABL_DATUM    Das Ablaufdatum des Benutzerzugangs auf\n"
+#~ "                                ABL_DATUM setzen\n"
+#~ "  -f, --inactive INAKTIV        Passwort nach Ablauf von INAKTIV "
+#~ "deaktivieren\n"
+#~ "  -g, --gid GRUPPE              Gruppenname GRUPPE für neuen Benutzer "
+#~ "erzwingen\n"
+#~ "  -G, --groups GRUPPEN          Liste der zusätzlichen Gruppen für den\n"
+#~ "                                neuen Benutzer\n"
+#~ "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+#~ "  -k, --skel SKEL_VERZ          Ein alternatives skel-Verzeichnis\n"
+#~ "                                (Vorlagenverzeichnis) angeben\n"
+#~ "  -K, --key SCHLÜSSEL=WERT      Die Vorgaben in /etc/login.defs "
+#~ "überschreiben\n"
+#~ "  -l, --no-log-init             Den Benutzer nicht zu den lastlog- und "
+#~ "faillog-\n"
+#~ "                                Datenbanken hinzufügen\n"
+#~ "  -m, --create-home             Home-Verzeichnis des neuen Benutzers "
+#~ "erstellen\n"
+#~ "  -M, --no-create-home          Kein Home-Verzeichnis für den Benutzer "
+#~ "erstellen\n"
+#~ "                                (überschreibt /etc/login.defs)\n"
+#~ "  -N, --no-user-group           Keine Gruppe mit dem gleichen Namen wie "
+#~ "dem des\n"
+#~ "                                Benutzers erstellen\n"
+#~ "  -o, --non-unique              Benutzer mit doppelter (nicht "
+#~ "einmaliger)\n"
+#~ "                                UID erlauben\n"
+#~ "  -p, --password PASSWORT       Benutze ein verschlüsseltes Passwort für\n"
+#~ "                                den neuen Benutzerzugang\n"
+#~ "  -r, --system                  Erstelle einen Systemzugang\n"
+#~ "  -s, --shell SHELL             Die Login-Shell des neuen "
+#~ "Benutzerzugangs\n"
+#~ "  -u, --uid UID                 Benutzung dieser UID erzwingen\n"
+#~ "  -U, --user-group              Erstelle eine Gruppe mit dem gleichen "
+#~ "Namen wie\n"
+#~ "                                dem des Benutzers\n"
+#~ "%s\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/dz.po
===================================================================
--- upstream/trunk/po/dz.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/dz.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2006-06-01 15:28+0530\n"
 "Last-Translator: Jurmey Rabgay <jur_gay at yahoo.com>\n"
 "Language-Team: dzongkha <pgeyleg at dit.gov.bt>\n"
@@ -118,6 +118,10 @@
 "མཇུག་མམ་ %s འདི་ %s གུ་ཨིན་པས།\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: ཐུན་མོང་ ཡུ་ཨའི་ཌི་འཐོབ་མི་ཚུགས།\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: ཐུན་མོང་མ་ཡིན་པའི་ ཇི་ཨའི་ཌི་འཐོབ་མི་ཚུགས།\n"
 
@@ -599,41 +603,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "ལག་ལེན་: དུས་ཡོལ་{-f|-c}\n"
 
-#, fuzzy
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"ལག་ལེན་པ་:faillog [གདམ་ཁ་ཚུ་]\n"
-"\n"
-"གདམ་ཁ་ཚུ་:\n"
-"  -a, --all\t\t\t ལག་ལེན་ཆ་མཉམ་གྱི་དོན་ལུ་ faillog དྲན་ཐོ་ཚུ་བཀྲམ་སྟོན་འབད།\n"
-"  -h, --help\t\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་ བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
-"  -l, --lock-time SEC\t\t ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་བའི་ཤུལ་ལུ་ SECདཀར་ཆག་ཚུ་ལུ་ ལྡེ་མིག་རྩིས་"
-"ཐོ།\n"
-"  -m, --maximum MAX\t\t MAX ལུ་ འཐུས་ཤོར་བྱུང་ཡོད་པའི་ནང་བསྐྱོད་གདོང་ལན་ གཞི་སྒྲིག་འབད།\n"
-"  -r, --reset\t\t\t ནང་བསྐྱོད་འཐུས་ཤོར་ཚུ་གི་གདོང་ལན་ སླར་གཞི་སྒྲིག་འབད།\n"
-"  -t, --time DAYS\t\t   DAYSལས་ལྷག་པའི་འཕྲལ་གྱི་ཕེཡེ་ལོག་དྲན་ཐོ་ཚུ་ བཀྲམ་སྟོན་འབད།\n"
-"  -u, --user LOGIN\t\t ཕེ་ཡེ་ལོག་དྲན་ཐོ་བཀྲམ་སྟོན་འབད་ ཡངན་ འཐུས་ཤོར་གདོང་ལན་\n"
-"\t\t\t\tཚུ་ རྒྱུན་སྐྱོང་འབདཝ་ཨིནམ་དང་ ལག་ལེན་པའི་དོན་ལུ་ ནང་བསྐྱོད་ཀྱི་ཐོག་ལས་ \n"
-"\t\t\t\tརྐྱངམ་ཅིག་ བཅད་མཚམས་( -r, -m ཡང་ན་ -l optionsདང་བཅས་ལག་ལེན་འཐབ་ཡོད་པ་ཅིན་)"
-"བཟོཝ་ཨིན།\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -746,35 +741,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: ཊི་ཊི་ཝའི་མེན།\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"ལག་ལེན་:groupadd [གདམ་ཁ་ཚུ་]སྡེ་ཚན།\n"
-"\n"
-"གདམ་ཁ་ཚུ་:\n"
-"  -f, --force\t\t གསལ་བཀོད་འབད་ཡོད་པའི་ \n"
-"\t\t\t\t སྡེ་ཚན་འདི་ཧེ་མ་ལས་ཡོད་པ་ཅིན་ མཐར་འཁྱོལ་གནས་ཚད་ཀྱི་ཐོག་ལས་ བང་ཅན་སྦེ་ཕྱིར་འཐོན་"
-"འབད།\n"
-"  -g, --gid GID\t\t སྡེ་ཚན་གསརཔ་གི་དོན་ལུ་ ཇི་ཨིའ་ཌི་ལག་ལེན་འཐབ།\n"
-"  -h, --help\t\t\t   གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
-"  -k, --key KEY=VALUE\t\t /etc/login.defs སྔོན་སྒྲིག་ཚུ་ ཟུར་བཞག་འབདཝ་ཨིན།\n"
-"  -o, --non-unique\t\t ངོ་བཤུས་ \n"
-" \t\t\t\t(ཐུན་མོང་པ་)ཇི་ཨའི་ཌི་དང་བཅས་ སྡེ་ཚན་གསར་བསྐྲུན་འབད་བཅུག\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -857,32 +856,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"ལག་ལེན་:groupadd [གདམ་ཁ་ཚུ་]སྡེ་ཚན།\n"
-"\n"
-"གདམ་ཁ་ཚུ་:\n"
-"  -f, --force\t\t གསལ་བཀོད་འབད་ཡོད་པའི་ \n"
-"\t\t\t\t སྡེ་ཚན་འདི་ཧེ་མ་ལས་ཡོད་པ་ཅིན་ མཐར་འཁྱོལ་གནས་ཚད་ཀྱི་ཐོག་ལས་ བང་ཅན་སྦེ་ཕྱིར་འཐོན་"
-"འབད།\n"
-"  -g, --gid GID\t\t སྡེ་ཚན་གསརཔ་གི་དོན་ལུ་ ཇི་ཨིའ་ཌི་ལག་ལེན་འཐབ།\n"
-"  -h, --help\t\t\t   གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
-"  -k, --key KEY=VALUE\t\t /etc/login.defs སྔོན་སྒྲིག་ཚུ་ ཟུར་བཞག་འབདཝ་ཨིན།\n"
-"  -o, --non-unique\t\t ངོ་བཤུས་ \n"
-" \t\t\t\t(ཐུན་མོང་པ་)ཇི་ཨའི་ཌི་དང་བཅས་ སྡེ་ཚན་གསར་བསྐྲུན་འབད་བཅུག\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "ནུས་མེད་སྡེཚན་གྱི་མིང་ '%s'\n"
@@ -1362,6 +1350,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "ལག་ལེན་:%s [-q] [-r] [-s] [passwd [གྱིབ་མ་]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s དང་ -r གཉིས་མཐུན་འགྱུར་ཅན་མེན།\n"
+
 msgid "invalid password file entry"
 msgstr "ནུས་མེད་ཀྱི་ཆོག་ཡིག་ཡིག་སྣོད་ཐོ་བཀོད།"
 
@@ -1565,76 +1558,87 @@
 msgstr "%s: སྡེ་ཚན་མང་རབས་ཅིག་གསལ་བཀོད་འབད་ཡོདཔ་(མང་མཐའ་ %d)།\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"ལག་ལེན་: useradd [གདམ་ཁ་ཚུ་] ནང་བསྐྱོད་\n"
-"\n"
-"གདམ་ཁ་ཚུ་:\n"
-"  -b, --base-dir BASE_DIR\t ལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་ \n"
-"\t\t\t\t ཁྱིམ་གྱི་སྣོད་ཐོའི་དོན་ལུ་ གཞི་རྟེན་སྣོད་ཐོ།\n"
-"  -c, --comment COMMENT\t\t ལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ ཇི་ཨི་སི་ཨོ་ཨེསི་ས་སྒོ་ གཞི་སྒྲིག་"
-"འབད།\n"
-"  -d, --home-dir HOME_DIR\t ལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ ཁྱིམ་གྱི་སྣོད་ཐོ།\n"
-"  -D, --defaults\t\t ལེགས་བཅོས་འབད་ཡོད་པའི་སྔོན་སྒྲིག་ useradd\n"
-"\t\t\t\t རིམ་སྒྲིག་འདི་ དཔར་བསྐྲུན་འབད་ཡང་ན་ སྲུངས། \n"
-"  -e, --expiredate EXPIRE_DATE\t   EXPIRE_DATEལུ་ རྩིས་ཐོའི་དུས་ཡོལ་ཚེས་གྲངས་ གཞི་སྒྲིག་"
-"འབད།\n"
-"  -f, --inactive INACTIVE\t དུས་ཡོལ་ \n"
-"\t\t\t\t གི་ཤུལ་མར་ INACTIVEལུ་ ཆོག་ཡིག་ནུས་མེད་སྦེ་གཞི་སྒྲིག་འབད།\n"
-"  -g, --gid GROUP\t\t ལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ བང་བཅོང་ཐོག་ལས་ སྡེ་ཚན་ལག་ལེན་"
-"འཐབ།\n"
-"  -G, --groups GROUPS\t\t \n"
-"  \t\t\t\tལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ ལྷན་ཐབས་སྡེབ་ཚན་གྱི་ཐོ་ཡིག\n"
-"  -h, --help\t\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
-"  -k, --skel SKEL_DIR \t\t ཐབས་གཞན་སི་ཀེལ་སྣོད་ཐོ་ཅིག་ གསལ་བཀོད་འབད།\n"
-"  -K, --key KEY=VALUE\t\t   /etc/login.defs སྔོན་སྒྲིག་ ཟུར་བཞག་འབདཝ་ཨིན།\n"
-"  -m, --create-home\t\t ལག་ལེན་པ་ \n"
-" \t\t\t\tརྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ ཁྱིམ་གྱི་སྣོད་ཐོ་གསར་བསྐྲུན་འབད།\n"
-"  -o, --non-unique\t\t   \t\t\t\t(ཐུན་མོང་) ཡུ་ཨའི་ཌི་ རྫུན་མ་\n"
-"གི་ཐོག་ལས་ ལག་ལེན་པ་གསར་བསྐྲུན་འབད་བཅུག\n"
-"  -p, --password PASSWORD\t  ལག་ལེན་པ་གསརཔ་\n"
-"  \t\t\t\tརྩིས་ཐོའི་དོན་ལུ་ གསང་བཟོས་ཆོག་ཡིགལག་ལེན་འཐབ།\n"
-"  -s, --shell SHELL\t\t  ལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ ནང་བསྐྱོད་ཀྱི་ཤལ།\n"
-"  -u, --uid UID\t\t\t  ལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ ཡུ་ཨའི་ཌི་འདི་ བང་ཅན་སྦེ་ལག་ལེན་"
-"འཐབ།\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -1978,6 +1982,173 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %sསོར་ཆུད་འབད་མ་ཚུགས་: %s (ཁྱོད་ཀྱི་བསྒྱུར་བཅོས་ཚུ་ %sནང་ཨིན་)།\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ལག་ལེན་པ་:faillog [གདམ་ཁ་ཚུ་]\n"
+#~ "\n"
+#~ "གདམ་ཁ་ཚུ་:\n"
+#~ "  -a, --all\t\t\t ལག་ལེན་ཆ་མཉམ་གྱི་དོན་ལུ་ faillog དྲན་ཐོ་ཚུ་བཀྲམ་སྟོན་འབད།\n"
+#~ "  -h, --help\t\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་ བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
+#~ "  -l, --lock-time SEC\t\t ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་བའི་ཤུལ་ལུ་ SECདཀར་ཆག་ཚུ་ལུ་ ལྡེ་མིག་"
+#~ "རྩིས་ཐོ།\n"
+#~ "  -m, --maximum MAX\t\t MAX ལུ་ འཐུས་ཤོར་བྱུང་ཡོད་པའི་ནང་བསྐྱོད་གདོང་ལན་ གཞི་སྒྲིག་འབད།\n"
+#~ "  -r, --reset\t\t\t ནང་བསྐྱོད་འཐུས་ཤོར་ཚུ་གི་གདོང་ལན་ སླར་གཞི་སྒྲིག་འབད།\n"
+#~ "  -t, --time DAYS\t\t   DAYSལས་ལྷག་པའི་འཕྲལ་གྱི་ཕེཡེ་ལོག་དྲན་ཐོ་ཚུ་ བཀྲམ་སྟོན་འབད།\n"
+#~ "  -u, --user LOGIN\t\t ཕེ་ཡེ་ལོག་དྲན་ཐོ་བཀྲམ་སྟོན་འབད་ ཡངན་ འཐུས་ཤོར་གདོང་ལན་\n"
+#~ "\t\t\t\tཚུ་ རྒྱུན་སྐྱོང་འབདཝ་ཨིནམ་དང་ ལག་ལེན་པའི་དོན་ལུ་ ནང་བསྐྱོད་ཀྱི་ཐོག་ལས་ \n"
+#~ "\t\t\t\tརྐྱངམ་ཅིག་ བཅད་མཚམས་( -r, -m ཡང་ན་ -l optionsདང་བཅས་ལག་ལེན་འཐབ་ཡོད་པ་"
+#~ "ཅིན་)བཟོཝ་ཨིན།\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ལག་ལེན་:groupadd [གདམ་ཁ་ཚུ་]སྡེ་ཚན།\n"
+#~ "\n"
+#~ "གདམ་ཁ་ཚུ་:\n"
+#~ "  -f, --force\t\t གསལ་བཀོད་འབད་ཡོད་པའི་ \n"
+#~ "\t\t\t\t སྡེ་ཚན་འདི་ཧེ་མ་ལས་ཡོད་པ་ཅིན་ མཐར་འཁྱོལ་གནས་ཚད་ཀྱི་ཐོག་ལས་ བང་ཅན་སྦེ་ཕྱིར་འཐོན་"
+#~ "འབད།\n"
+#~ "  -g, --gid GID\t\t སྡེ་ཚན་གསརཔ་གི་དོན་ལུ་ ཇི་ཨིའ་ཌི་ལག་ལེན་འཐབ།\n"
+#~ "  -h, --help\t\t\t   གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
+#~ "  -k, --key KEY=VALUE\t\t /etc/login.defs སྔོན་སྒྲིག་ཚུ་ ཟུར་བཞག་འབདཝ་ཨིན།\n"
+#~ "  -o, --non-unique\t\t ངོ་བཤུས་ \n"
+#~ " \t\t\t\t(ཐུན་མོང་པ་)ཇི་ཨའི་ཌི་དང་བཅས་ སྡེ་ཚན་གསར་བསྐྲུན་འབད་བཅུག\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ལག་ལེན་:groupadd [གདམ་ཁ་ཚུ་]སྡེ་ཚན།\n"
+#~ "\n"
+#~ "གདམ་ཁ་ཚུ་:\n"
+#~ "  -f, --force\t\t གསལ་བཀོད་འབད་ཡོད་པའི་ \n"
+#~ "\t\t\t\t སྡེ་ཚན་འདི་ཧེ་མ་ལས་ཡོད་པ་ཅིན་ མཐར་འཁྱོལ་གནས་ཚད་ཀྱི་ཐོག་ལས་ བང་ཅན་སྦེ་ཕྱིར་འཐོན་"
+#~ "འབད།\n"
+#~ "  -g, --gid GID\t\t སྡེ་ཚན་གསརཔ་གི་དོན་ལུ་ ཇི་ཨིའ་ཌི་ལག་ལེན་འཐབ།\n"
+#~ "  -h, --help\t\t\t   གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
+#~ "  -k, --key KEY=VALUE\t\t /etc/login.defs སྔོན་སྒྲིག་ཚུ་ ཟུར་བཞག་འབདཝ་ཨིན།\n"
+#~ "  -o, --non-unique\t\t ངོ་བཤུས་ \n"
+#~ " \t\t\t\t(ཐུན་མོང་པ་)ཇི་ཨའི་ཌི་དང་བཅས་ སྡེ་ཚན་གསར་བསྐྲུན་འབད་བཅུག\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "ལག་ལེན་: useradd [གདམ་ཁ་ཚུ་] ནང་བསྐྱོད་\n"
+#~ "\n"
+#~ "གདམ་ཁ་ཚུ་:\n"
+#~ "  -b, --base-dir BASE_DIR\t ལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་ \n"
+#~ "\t\t\t\t ཁྱིམ་གྱི་སྣོད་ཐོའི་དོན་ལུ་ གཞི་རྟེན་སྣོད་ཐོ།\n"
+#~ "  -c, --comment COMMENT\t\t ལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ ཇི་ཨི་སི་ཨོ་ཨེསི་ས་སྒོ་ གཞི་"
+#~ "སྒྲིག་འབད།\n"
+#~ "  -d, --home-dir HOME_DIR\t ལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ ཁྱིམ་གྱི་སྣོད་ཐོ།\n"
+#~ "  -D, --defaults\t\t ལེགས་བཅོས་འབད་ཡོད་པའི་སྔོན་སྒྲིག་ useradd\n"
+#~ "\t\t\t\t རིམ་སྒྲིག་འདི་ དཔར་བསྐྲུན་འབད་ཡང་ན་ སྲུངས། \n"
+#~ "  -e, --expiredate EXPIRE_DATE\t   EXPIRE_DATEལུ་ རྩིས་ཐོའི་དུས་ཡོལ་ཚེས་གྲངས་ གཞི་"
+#~ "སྒྲིག་འབད།\n"
+#~ "  -f, --inactive INACTIVE\t དུས་ཡོལ་ \n"
+#~ "\t\t\t\t གི་ཤུལ་མར་ INACTIVEལུ་ ཆོག་ཡིག་ནུས་མེད་སྦེ་གཞི་སྒྲིག་འབད།\n"
+#~ "  -g, --gid GROUP\t\t ལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ བང་བཅོང་ཐོག་ལས་ སྡེ་ཚན་ལག་ལེན་"
+#~ "འཐབ།\n"
+#~ "  -G, --groups GROUPS\t\t \n"
+#~ "  \t\t\t\tལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ ལྷན་ཐབས་སྡེབ་ཚན་གྱི་ཐོ་ཡིག\n"
+#~ "  -h, --help\t\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
+#~ "  -k, --skel SKEL_DIR \t\t ཐབས་གཞན་སི་ཀེལ་སྣོད་ཐོ་ཅིག་ གསལ་བཀོད་འབད།\n"
+#~ "  -K, --key KEY=VALUE\t\t   /etc/login.defs སྔོན་སྒྲིག་ ཟུར་བཞག་འབདཝ་ཨིན།\n"
+#~ "  -m, --create-home\t\t ལག་ལེན་པ་ \n"
+#~ " \t\t\t\tརྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ ཁྱིམ་གྱི་སྣོད་ཐོ་གསར་བསྐྲུན་འབད།\n"
+#~ "  -o, --non-unique\t\t   \t\t\t\t(ཐུན་མོང་) ཡུ་ཨའི་ཌི་ རྫུན་མ་\n"
+#~ "གི་ཐོག་ལས་ ལག་ལེན་པ་གསར་བསྐྲུན་འབད་བཅུག\n"
+#~ "  -p, --password PASSWORD\t  ལག་ལེན་པ་གསརཔ་\n"
+#~ "  \t\t\t\tརྩིས་ཐོའི་དོན་ལུ་ གསང་བཟོས་ཆོག་ཡིགལག་ལེན་འཐབ།\n"
+#~ "  -s, --shell SHELL\t\t  ལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ ནང་བསྐྱོད་ཀྱི་ཤལ།\n"
+#~ "  -u, --uid UID\t\t\t  ལག་ལེན་པའི་རྩིས་ཐོ་གསརཔ་གི་དོན་ལུ་ ཡུ་ཨའི་ཌི་འདི་ བང་ཅན་སྦེ་ལག་"
+#~ "ལེན་འཐབ།\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "ཆོག་ཡིག་དུས་ཡོལ་ནིའི་དོན་ལས་་གཞི་སྒྲིག་འབད་ཡོདཔ།"
 

Modified: upstream/trunk/po/el.po
===================================================================
--- upstream/trunk/po/el.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/el.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: shadow_po_el\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2007-11-24 21:44+0100\n"
 "Last-Translator: Konstantinos Margaritis <markos at debian.org>\n"
 "Language-Team: Greek <debian-l10n-greek at lists.debian.org>\n"
@@ -117,6 +117,10 @@
 " Η τελευταία ήταν στις %s στο %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: αδυναμία λήψης μοναδικού UID\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: αδυναμία λήψης μοναδικού GID\n"
 
@@ -614,65 +618,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Χρήση: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     προβολή καταγραφής faillog για όλους τους\n"
-"                                χρήστες\n"
-"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
-"                                έξοδος\n"
-"  -l, --lock-time SEC           μετά από αποτυχημένη είσοδο κλείδωμα\n"
-"                                λογαριασμού για SEC δευτερόλεπτα\n"
-"  -m, --maximum MAX             ρύθμιση μέγιστου αριθμού καταμέτρησης\n"
-"                                αποτυχημένων προσπαθειών εισόδου σε MAX\n"
-"  -r, --reset                   αρχικοποίηση της καταμέτρησης αποτυχημένων\n"
-"                                προσπαθειών εισόδου\n"
-"  -t, --time DAYS               προβολή εγγραφών faillog πιο πρόσφατων από "
-"DAYS\n"
-"  -u, --user LOGIN              προβάλλει τις εγγραφές faillog ή\n"
-"                                διαχειρίζεται τα όρια καταμέτρησης\n"
-"                                αποτυχημένων εισόδων (αν χρησιμοποιηθεί\n"
-"                                με τις επιλογές -r, -m ή -l) μόνο\n"
-"                                για το χρήστη με LOGIN\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -785,35 +756,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Δεν είναι tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Χρήση: %s [είσοδος]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Χρήση: groupadd [options] group\n"
-"\n"
-"Επιλογές:\n"
-"  -f, --force                   εξαναγκασμός εξόδου με κατάσταση επιτυχίας\n"
-"                                αν η καθορισμένη ομάδα υπάρχει ήδη\n"
-"  -g, --gid GID                 χρήση GID για τη νέα ομάδα\n"
-"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
-"                                έξοδος\n"
-"  -K, --key KEY=VALUE           παράκαμψη προεπιλογών /etc/login.defs\n"
-"  -o, --non-unique              επιτρέπει τη δημιουργία ομάδας με διπλότυπο\n"
-"                                (μη-μοναδικό) GID\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -895,32 +870,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Χρήση: groupadd [options] group\n"
-"\n"
-"Επιλογές:\n"
-"  -f, --force                   εξαναγκασμός εξόδου με κατάσταση επιτυχίας\n"
-"                                αν η καθορισμένη ομάδα υπάρχει ήδη\n"
-"  -g, --gid GID                 χρήση GID για τη νέα ομάδα\n"
-"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
-"                                έξοδος\n"
-"  -K, --key KEY=VALUE           παράκαμψη προεπιλογών /etc/login.defs\n"
-"  -o, --non-unique              επιτρέπει τη δημιουργία ομάδας με διπλότυπο\n"
-"                                (μη-μοναδικό) GID\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "Μη έγκυρο όνομα ομάδας `%s'\n"
@@ -1412,6 +1376,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Χρήση: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s και -r είναι ασύμβατα\n"
+
 msgid "invalid password file entry"
 msgstr "Μη έγκυρη καταχώρηση στο αρχείο συνθηματικών"
 
@@ -1617,79 +1586,87 @@
 msgstr "%s: Προσδιορίστηκαν υπερβολικές ομάδες (μεγ. %d).\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Χρήση: %s [είσοδος]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Χρήση: useradd [options] LOGIN\n"
-"\n"
-"Επιλογές:\n"
-"  -b, --base-dir BASE_DIR       ο βασικός κατάλογος για τον αρχικό κατάλογο\n"
-"                                λογαριασμού νέου χρήστη\n"
-"  -c, --comment COMMENT         ρύθμιση του πεδίου GECOS για το λογαριασμό\n"
-"                                νέου χρήστη\n"
-"  -d, --home-dir HOME_DIR       ο αρχικός κατάλογος για το λογαριασμό νέου\n"
-"                                χρήστη\n"
-"  -D, --defaults                εκτύπωση ή αποθήκευση τροποποιημένης\n"
-"                                προεπιλεγμένης ρύθμισης tπροσθήκης χρήστη\n"
-"  -e, --expiredate EXPIRE_DATE  ρύθμιση ημερομηνίας λήξης λογαριασμού σε\n"
-"                                EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       ρύθμιση ανενεργού συνθηματικού μετά τη λήξη\n"
-"                                σε ΑΝΕΝΕΡΓΟ\n"
-"  -g, --gid GROUP               εξαναγκασμός χρήσης GROUP για το νέο\n"
-"                                λογαριασμό χρήστη\n"
-"  -G, --groups GROUPS           προβολή λίστας συμπληρωματικών ομάδων για\n"
-"                                το νέο λογαριασμό χρήστη\n"
-"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
-"                                έξοδος\n"
-"  -k, --skel SKEL_DIR           καθορισμός ενός εναλλακτικού κατάλογου skel\n"
-"  -K, --key KEY=VALUE           παράκαμψη προεπιλογών /etc/login.defs\n"
-"  -m, --create-home             δημιουργία αρχικού καταλόγου για το νέο\n"
-"                                λογαριασμό χρήστη\n"
-"  -o, --non-unique              επιτρέπει τη δημιουργία χρήστη με διπλότυπο\n"
-"                                (μη μοναδικό) UID\n"
-"  -p, --password PASSWORD       χρήση κρυπτογραφημένου κωδικού για το νέο\n"
-"                                λογαριασμό χρήστη\n"
-"  -s, --shell SHELL             το κέλυφος σύνδεσης για το νέο λογαριασμό\n"
-"                                χρήστη\n"
-"  -u, --uid UID                 εξαναγκασμός χρήσης του UID για το νέο\n"
-"                                λογαριασμό χρήστη\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2031,6 +2008,217 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: αδυναμία επαναφοράς %s: %s (οι αλλαγές είναι στο %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     προβολή καταγραφής faillog για όλους "
+#~ "τους\n"
+#~ "                                χρήστες\n"
+#~ "  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+#~ "                                έξοδος\n"
+#~ "  -l, --lock-time SEC           μετά από αποτυχημένη είσοδο κλείδωμα\n"
+#~ "                                λογαριασμού για SEC δευτερόλεπτα\n"
+#~ "  -m, --maximum MAX             ρύθμιση μέγιστου αριθμού καταμέτρησης\n"
+#~ "                                αποτυχημένων προσπαθειών εισόδου σε MAX\n"
+#~ "  -r, --reset                   αρχικοποίηση της καταμέτρησης "
+#~ "αποτυχημένων\n"
+#~ "                                προσπαθειών εισόδου\n"
+#~ "  -t, --time DAYS               προβολή εγγραφών faillog πιο πρόσφατων "
+#~ "από DAYS\n"
+#~ "  -u, --user LOGIN              προβάλλει τις εγγραφές faillog ή\n"
+#~ "                                διαχειρίζεται τα όρια καταμέτρησης\n"
+#~ "                                αποτυχημένων εισόδων (αν χρησιμοποιηθεί\n"
+#~ "                                με τις επιλογές -r, -m ή -l) μόνο\n"
+#~ "                                για το χρήστη με LOGIN\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Χρήση: groupadd [options] group\n"
+#~ "\n"
+#~ "Επιλογές:\n"
+#~ "  -f, --force                   εξαναγκασμός εξόδου με κατάσταση "
+#~ "επιτυχίας\n"
+#~ "                                αν η καθορισμένη ομάδα υπάρχει ήδη\n"
+#~ "  -g, --gid GID                 χρήση GID για τη νέα ομάδα\n"
+#~ "  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+#~ "                                έξοδος\n"
+#~ "  -K, --key KEY=VALUE           παράκαμψη προεπιλογών /etc/login.defs\n"
+#~ "  -o, --non-unique              επιτρέπει τη δημιουργία ομάδας με "
+#~ "διπλότυπο\n"
+#~ "                                (μη-μοναδικό) GID\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Χρήση: groupadd [options] group\n"
+#~ "\n"
+#~ "Επιλογές:\n"
+#~ "  -f, --force                   εξαναγκασμός εξόδου με κατάσταση "
+#~ "επιτυχίας\n"
+#~ "                                αν η καθορισμένη ομάδα υπάρχει ήδη\n"
+#~ "  -g, --gid GID                 χρήση GID για τη νέα ομάδα\n"
+#~ "  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+#~ "                                έξοδος\n"
+#~ "  -K, --key KEY=VALUE           παράκαμψη προεπιλογών /etc/login.defs\n"
+#~ "  -o, --non-unique              επιτρέπει τη δημιουργία ομάδας με "
+#~ "διπλότυπο\n"
+#~ "                                (μη-μοναδικό) GID\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Χρήση: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Επιλογές:\n"
+#~ "  -b, --base-dir BASE_DIR       ο βασικός κατάλογος για τον αρχικό "
+#~ "κατάλογο\n"
+#~ "                                λογαριασμού νέου χρήστη\n"
+#~ "  -c, --comment COMMENT         ρύθμιση του πεδίου GECOS για το "
+#~ "λογαριασμό\n"
+#~ "                                νέου χρήστη\n"
+#~ "  -d, --home-dir HOME_DIR       ο αρχικός κατάλογος για το λογαριασμό "
+#~ "νέου\n"
+#~ "                                χρήστη\n"
+#~ "  -D, --defaults                εκτύπωση ή αποθήκευση τροποποιημένης\n"
+#~ "                                προεπιλεγμένης ρύθμισης tπροσθήκης "
+#~ "χρήστη\n"
+#~ "  -e, --expiredate EXPIRE_DATE  ρύθμιση ημερομηνίας λήξης λογαριασμού σε\n"
+#~ "                                EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       ρύθμιση ανενεργού συνθηματικού μετά τη "
+#~ "λήξη\n"
+#~ "                                σε ΑΝΕΝΕΡΓΟ\n"
+#~ "  -g, --gid GROUP               εξαναγκασμός χρήσης GROUP για το νέο\n"
+#~ "                                λογαριασμό χρήστη\n"
+#~ "  -G, --groups GROUPS           προβολή λίστας συμπληρωματικών ομάδων "
+#~ "για\n"
+#~ "                                το νέο λογαριασμό χρήστη\n"
+#~ "  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+#~ "                                έξοδος\n"
+#~ "  -k, --skel SKEL_DIR           καθορισμός ενός εναλλακτικού κατάλογου "
+#~ "skel\n"
+#~ "  -K, --key KEY=VALUE           παράκαμψη προεπιλογών /etc/login.defs\n"
+#~ "  -m, --create-home             δημιουργία αρχικού καταλόγου για το νέο\n"
+#~ "                                λογαριασμό χρήστη\n"
+#~ "  -o, --non-unique              επιτρέπει τη δημιουργία χρήστη με "
+#~ "διπλότυπο\n"
+#~ "                                (μη μοναδικό) UID\n"
+#~ "  -p, --password PASSWORD       χρήση κρυπτογραφημένου κωδικού για το "
+#~ "νέο\n"
+#~ "                                λογαριασμό χρήστη\n"
+#~ "  -s, --shell SHELL             το κέλυφος σύνδεσης για το νέο "
+#~ "λογαριασμό\n"
+#~ "                                χρήστη\n"
+#~ "  -u, --uid UID                 εξαναγκασμός χρήσης του UID για το νέο\n"
+#~ "                                λογαριασμό χρήστη\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "Το συνθηματικό έχει ρυθμιστεί να λήξει."
 

Modified: upstream/trunk/po/es.po
===================================================================
--- upstream/trunk/po/es.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/es.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.16\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2007-11-25 21:23+0100\n"
 "Last-Translator: Rubén Porras Campo <nahoo at inicia.es>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -114,6 +114,10 @@
 "La última fue %s en %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: no se puede obtener un UID único\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: no se puede obtener un GID único\n"
 
@@ -618,62 +622,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Modo de uso: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Modo de uso: faillog [opciones]\n"
-"\n"
-"Opciones:\n"
-"  -a, --all                     muestra los registros de faillog para\n"
-"                                todos los usuarios\n"
-"  -h, --help                    muestra este mensaje de ayuda y termina\n"
-"  -l, --lock-time SEC           después de un fallo de acceso bloquea\n"
-"                                la cuenta SEC segundos\n"
-"  -m, --maximum MAX             establece el número máximo de accesos\n"
-"                                fallidos a MAX\n"
-"  -r, --reset                   reinicia los contadores de accesos fallidos\n"
-"  -t, --time ND                 muestra los registros de faillog para los\n"
-"                                últimos ND días\n"
-"  -u, --user USUARIO            muestra el registro de faillog o mantiene\n"
-"                                los contadores de fallos y los límites\n"
-"                                (si se usan las opciones -r, -m o -l)\n"
-"                                para el usuario USUARIO\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -786,35 +760,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: No es una tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Modo de uso: %s [entrada]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Modo de uso: groupadd [opciones] grupo\n"
-"\n"
-"Opciones:\n"
-"  -f, --force                   fuerza una salida con un estado de éxito\n"
-"                                si el grupo especificado existe\n"
-"  -g, --gid GID                 usa GID para el nuevo grupo\n"
-"  -h, --help                    muestra esta ayuda y termina\n"
-"  -K, --key NOMBRE=VALOR        prevalece sobre el valor predeterminado de\n"
-"                                /etc/login.defs\n"
-"  -o, --non-unique              permite crear grupos con un GID duplicado\n"
-"                                (que no es único)\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -897,32 +875,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Modo de uso: groupadd [opciones] grupo\n"
-"\n"
-"Opciones:\n"
-"  -f, --force                   fuerza una salida con un estado de éxito\n"
-"                                si el grupo especificado existe\n"
-"  -g, --gid GID                 usa GID para el nuevo grupo\n"
-"  -h, --help                    muestra esta ayuda y termina\n"
-"  -K, --key NOMBRE=VALOR        prevalece sobre el valor predeterminado de\n"
-"                                /etc/login.defs\n"
-"  -o, --non-unique              permite crear grupos con un GID duplicado\n"
-"                                (que no es único)\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "nombre de grupo «%s» inválido\n"
@@ -1408,6 +1375,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Modo de uso: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s y -r son incompatibles\n"
+
 msgid "invalid password file entry"
 msgstr "entrada del fichero de contraseñas inválida"
 
@@ -1617,78 +1589,87 @@
 msgstr "%s: demasiados grupos especificados (máx de %d).\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Modo de uso: %s [entrada]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Modo de uso: useradd [opciones] USUARIO\n"
-"\n"
-"Opciones:\n"
-"  -b, --base-dir DIR_BASE       directorio base para el nuevo directorio\n"
-"                                personal\n"
-"  -c, --comment COMENTARIO      comentarios para el nuevo usuario (campo "
-"GECOS)\n"
-"  -d, --home-dir DIR_PERSONAL   directorio personal para el nuevo usuario\n"
-"  -D, --defaults                muestra o salva la configuración\n"
-"                                predeterminada modificada para useradd\n"
-"  -e, --expiredate FECHA_EXPIR  establece la fecha de caducidad de la\n"
-"                                cuenta a FECHA_EXPIR\n"
-"  -f, --inactive INACTIVO       establece el tiempo de inactividad después\n"
-"                                de que caduque la cuenta a INACTIVO\n"
-"  -g, --gid GRUPO               forzar el uso de GRUPO para la nueva cuenta\n"
-"                                de usuario\n"
-"  -G, --groups GRUPOS           lista de grupos suplementarios para la "
-"nueva\n"
-"                                cuenta de usuario\n"
-"  -h, --help                    muestra esta ayuda y termina\n"
-"  -k, --skel DIR_SKEL           especifica un directorio skel alternativo\n"
-"  -K, --key LLAVE=VALOR         modifica los valores predeterminados de\n"
-"                                /etc/login.defs\n"
-"  -m, --create-home             crea el directorio personal para la nueva\n"
-"                                cuenta de usuario\n"
-"  -o, --non-unique              permitir crear usuarios con UIDs duplicadas\n"
-"  -p, --password CONTRASEÑA     usar la contraseña cifrada CONTRASEÑA para\n"
-"                                la nueva cuenta\n"
-"  -s, --shell SHELL             la shell de entrada para la nueva cuenta\n"
-"                                de usuario\n"
-"  -u, --uid UID                 forzar el uso del UID para la nueva cuenta\n"
-"                                de usuario\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2038,6 +2019,212 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: no se puede restaurar %s: %s (sus cambios están en %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Modo de uso: faillog [opciones]\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "  -a, --all                     muestra los registros de faillog para\n"
+#~ "                                todos los usuarios\n"
+#~ "  -h, --help                    muestra este mensaje de ayuda y termina\n"
+#~ "  -l, --lock-time SEC           después de un fallo de acceso bloquea\n"
+#~ "                                la cuenta SEC segundos\n"
+#~ "  -m, --maximum MAX             establece el número máximo de accesos\n"
+#~ "                                fallidos a MAX\n"
+#~ "  -r, --reset                   reinicia los contadores de accesos "
+#~ "fallidos\n"
+#~ "  -t, --time ND                 muestra los registros de faillog para "
+#~ "los\n"
+#~ "                                últimos ND días\n"
+#~ "  -u, --user USUARIO            muestra el registro de faillog o "
+#~ "mantiene\n"
+#~ "                                los contadores de fallos y los límites\n"
+#~ "                                (si se usan las opciones -r, -m o -l)\n"
+#~ "                                para el usuario USUARIO\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Modo de uso: groupadd [opciones] grupo\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "  -f, --force                   fuerza una salida con un estado de éxito\n"
+#~ "                                si el grupo especificado existe\n"
+#~ "  -g, --gid GID                 usa GID para el nuevo grupo\n"
+#~ "  -h, --help                    muestra esta ayuda y termina\n"
+#~ "  -K, --key NOMBRE=VALOR        prevalece sobre el valor predeterminado "
+#~ "de\n"
+#~ "                                /etc/login.defs\n"
+#~ "  -o, --non-unique              permite crear grupos con un GID "
+#~ "duplicado\n"
+#~ "                                (que no es único)\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Modo de uso: groupadd [opciones] grupo\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "  -f, --force                   fuerza una salida con un estado de éxito\n"
+#~ "                                si el grupo especificado existe\n"
+#~ "  -g, --gid GID                 usa GID para el nuevo grupo\n"
+#~ "  -h, --help                    muestra esta ayuda y termina\n"
+#~ "  -K, --key NOMBRE=VALOR        prevalece sobre el valor predeterminado "
+#~ "de\n"
+#~ "                                /etc/login.defs\n"
+#~ "  -o, --non-unique              permite crear grupos con un GID "
+#~ "duplicado\n"
+#~ "                                (que no es único)\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Modo de uso: useradd [opciones] USUARIO\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "  -b, --base-dir DIR_BASE       directorio base para el nuevo directorio\n"
+#~ "                                personal\n"
+#~ "  -c, --comment COMENTARIO      comentarios para el nuevo usuario (campo "
+#~ "GECOS)\n"
+#~ "  -d, --home-dir DIR_PERSONAL   directorio personal para el nuevo "
+#~ "usuario\n"
+#~ "  -D, --defaults                muestra o salva la configuración\n"
+#~ "                                predeterminada modificada para useradd\n"
+#~ "  -e, --expiredate FECHA_EXPIR  establece la fecha de caducidad de la\n"
+#~ "                                cuenta a FECHA_EXPIR\n"
+#~ "  -f, --inactive INACTIVO       establece el tiempo de inactividad "
+#~ "después\n"
+#~ "                                de que caduque la cuenta a INACTIVO\n"
+#~ "  -g, --gid GRUPO               forzar el uso de GRUPO para la nueva "
+#~ "cuenta\n"
+#~ "                                de usuario\n"
+#~ "  -G, --groups GRUPOS           lista de grupos suplementarios para la "
+#~ "nueva\n"
+#~ "                                cuenta de usuario\n"
+#~ "  -h, --help                    muestra esta ayuda y termina\n"
+#~ "  -k, --skel DIR_SKEL           especifica un directorio skel "
+#~ "alternativo\n"
+#~ "  -K, --key LLAVE=VALOR         modifica los valores predeterminados de\n"
+#~ "                                /etc/login.defs\n"
+#~ "  -m, --create-home             crea el directorio personal para la "
+#~ "nueva\n"
+#~ "                                cuenta de usuario\n"
+#~ "  -o, --non-unique              permitir crear usuarios con UIDs "
+#~ "duplicadas\n"
+#~ "  -p, --password CONTRASEÑA     usar la contraseña cifrada CONTRASEÑA "
+#~ "para\n"
+#~ "                                la nueva cuenta\n"
+#~ "  -s, --shell SHELL             la shell de entrada para la nueva cuenta\n"
+#~ "                                de usuario\n"
+#~ "  -u, --uid UID                 forzar el uso del UID para la nueva "
+#~ "cuenta\n"
+#~ "                                de usuario\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "Contraseña caducada."
 

Modified: upstream/trunk/po/eu.po
===================================================================
--- upstream/trunk/po/eu.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/eu.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -7,19 +7,20 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2009-07-03 11:06+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-eu at lists.debian.org>\n"
-"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.2.1\n"
 
 #, c-format
-msgid "Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
 msgstr ""
 "'%s' izeneko sarrera anitz %s-en. Mesedez konpondu pwck edo grpck "
 "erabiliaz.\n"
@@ -115,13 +116,20 @@
 "%d hutsegite azken saio hasieratik.\n"
 "Azkena %s izan zen %s(e)n.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: Can't get unique system UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr ""
+"%s: Ezin da sistema UID bakarra lortu (ez dago UID erabilgarri gehiago)\n"
+
 #, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: Ezin da GID bakarra lortu (ez dago GID erabilgarri gehiago)\n"
 
 #, c-format
 msgid "%s: Can't get unique system UID (no more available UIDs)\n"
-msgstr "%s: Ezin da sistema UID bakarra lortu (ez dago UID erabilgarri gehiago)\n"
+msgstr ""
+"%s: Ezin da sistema UID bakarra lortu (ez dago UID erabilgarri gehiago)\n"
 
 #, c-format
 msgid "%s: Can't get unique UID (no more available UIDs)\n"
@@ -535,7 +543,8 @@
 msgstr "  -e, --encrypted               emandako pasahitzak zifraturik daude\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
-msgstr "  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+msgstr ""
+"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
 
 msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
@@ -589,44 +598,40 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Erabilera: expiry {-f|-c}\n"
 
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Erabilera: faillog [aukerak]\n"
-"\n"
-"Aukerak:\n"
-"  -a, --all                     erabiltzaile guztien faillog-en\n"
-"                                erregistroak bistaratzen ditu\n"
-"  -h, --help                    laguntzako mezu hau bistarazi eta irten\n"
-"  -l, --lock-time SEG           saio-hasieran hutsegin ondoren kontua zenbat\n"
-"                                segundutan blokeatuta egongo den\n"
-"  -m, --maximum GEH             saio-hasierako GEHiengo hutsegite kopurua\n"
-"                                ezartzeko\n"
-"  -r, --reset                   saio-hasierako hutsegiteen kontatzailea\n"
-"                                berrezartzeko\n"
-"  -t, --time EGUNAK             EGUNAK baino berriagoak diren faillog-en\n"
-"                                erregistroak bistaratzeko\n"
-"  -u, --user SAIOA              faillog-en erregistroak bistaratzeko edo\n"
-"                                hutsegiteen kontatzailea eta ERABILTZAILEA\n"
-"                                izeneko erabiltzailearen(-r, -m edo -l\n"
-"                                aukerekin erabiltzen bada) mantentzeko\n"
-"\n"
+"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr "huts-erregistroa: Huts %lu UID-arentat sarrera eskuratzean\n"
@@ -747,36 +752,61 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: ez da tty\n"
 
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
-"                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Erabilera: groupadd [aukerak] TALDEA\n"
+"Erabilera: %s [aukerak]\n"
 "\n"
 "Aukerak:\n"
-"  -f, --force                   Indartu arrakastatsuki amaitzea nahiz\n"
-"                                ezarritako taldea aurretik egon\n"
-"  -g, --gid GID                 GID erabili talde berrirako\n"
-"  -h, --help                    laguntza hau bistarazi eta irten\n"
-"  -K, --key KEY=BALIO           /etc/login.defs lehenespenak gainidatzi\n"
-"  -o, --non-unique              onartu bikoizutiko (ez bakarra) GID-a duen\n"
-"                                taldea sortzea\n"
-"  -p, --password PASSWORD       enkriptatutako pasahitza erabili talde "
-"berrirako\n"
-"  -r, --system                  sistema kontu bat sortu\n"
-"\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
+"                                algoritmoa erabiliaz\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
+"                                (non-unique) GID\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
+"                                SHA erronda kopurua\n"
+
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -r, --system                  create a system account\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: '%s' ez da baliozko talde-izena\n"
@@ -847,12 +877,15 @@
 "Erabilera: groupmems [aukerak] [ekintza]\n"
 "\n"
 "Aukerak:\n"
-"  -g, --group groupname         aldatu talde-izena erabiltzailearen taldea ordez\n"
+"  -g, --group groupname         aldatu talde-izena erabiltzailearen taldea "
+"ordez\n"
 "                                (root bakarrik)\n"
 "\n"
 "Ekintzak:\n"
-"  -a, --add erabiltzailea            gehitu erabiltzaile-izena taldearen partaideetara\n"
-"  -d, --delete erabiltzailea         kendu erabiltzaile-izena taldearen partaideetatik\n"
+"  -a, --add erabiltzailea            gehitu erabiltzaile-izena taldearen "
+"partaideetara\n"
+"  -d, --delete erabiltzailea         kendu erabiltzaile-izena taldearen "
+"partaideetatik\n"
 "  -p, --purge                   garbitu talde baten partaide guztiak\n"
 "  -l, --list                    taldearen partaideak zerrendatu\n"
 "\n"
@@ -865,31 +898,23 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr "%s: root-ek bakarrik erabili dezake -g/--group aukera\n"
 
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Erabilera: groupmod [aukerak] TALDEA\n"
-"\n"
-"Aukerak::\n"
-"  -g, --gid GID                 taldearentzat GID berria erabiltzea indartu\n"
-"  -h, --help                    laguntza hau bistarazi eta irten\n"
-"  -K, --new-name TALDE_BERRIA   Taldearentzat TALDE_BERRI izena\n"
-"                                erabiltzea indartu\n"
-"  -o, --non-unique              onartu TALDEAK bikoizutiko (ez bakarra) GID-"
-"a erabiltzea\n"
-"  -p, --password PASSWORD       enkriptatutako pasahitza erabili pasahitz "
-"berrirako\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: '%s' talde izen baliogabea\n"
@@ -949,7 +974,8 @@
 msgstr "'%s' taldea %s(e)n gehitu? "
 
 #, c-format
-msgid "group %s has an entry in %s, but its password field in %s is not set to 'x'\n"
+msgid ""
+"group %s has an entry in %s, but its password field in %s is not set to 'x'\n"
 msgstr ""
 "%s taldeak %s-n sarrera bat du, baina %s-ko pasahitza eremua ez dago 'x' "
 "bezala ezarririk\n"
@@ -1132,7 +1158,8 @@
 msgstr "TIOCSCTTY huts %s-en"
 
 msgid "Warning: login re-enabled after temporary lockout."
-msgstr "Abisua: saio-hasiera berriro gaitu egingo da aldi bateko blokeoaren ondoren."
+msgstr ""
+"Abisua: saio-hasiera berriro gaitu egingo da aldi bateko blokeoaren ondoren."
 
 #, c-format
 msgid "Last login: %s on %s"
@@ -1367,6 +1394,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Erabilera: %s [-q] [-r] [-s] [pasahitza [itzalpekoa]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s eta -r ezin dira batera erabili\n"
+
 msgid "invalid password file entry"
 msgstr "Baliogabeko pasahitzen fitxategiko sarrera"
 
@@ -1402,7 +1434,8 @@
 msgstr "'%s' erabiltzailea %s(e)n gehitu? "
 
 #, c-format
-msgid "user %s has an entry in %s, but its password field in %s is not set to 'x'\n"
+msgid ""
+"user %s has an entry in %s, but its password field in %s is not set to 'x'\n"
 msgstr ""
 "%s erabiltzaileak sarrera bat du %s-en baina %s-ko pasahitza ereemua ez dago "
 "'x' gisa ezarririk\n"
@@ -1557,94 +1590,143 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: talde gehiegi zehaztu dira (geh. %d).\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr ""
+"Erabilera: %s [aukerak]\n"
+"\n"
+"Aukerak:\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
+"                                SHA erronda kopurua\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
+"                                SHA erronda kopurua\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
+"                                SHA erronda kopurua\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
+"                                SHA erronda kopurua\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
+"                                SHA erronda kopurua\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
+"                                algoritmoa erabiliaz\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr "  -r, --system                  sortu sistema kontuak\n"
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Erabilera: useradd [aukerak] IZENA\n"
-"\n"
-"Aukerak:\n"
-"  -b, --base-dir BASE_DIR       Erabiltzaile kontu berriaren etxe\n"
-"                                direktorioaren oinarri direktorioa\n"
-"  -c, --comment IRUZKINA        erabiltzaile kontu berriaren GECOS ezarri\n"
-"  -d, --home-dir HOME_DIR       erabiltzaile kontu berriaren etxe\n"
-"                                direktorioa\n"
-"  -D, --defaults                bistarazi edo gorde aldaturiko\n"
-"                                lehenetsiriko useradd konfigurazioa\n"
-"  -e, --expiredate IRAUNG_DATA  kontu iraungitze data ezarri\n"
-"  -f, --inactive EZAKTIBO       ezarri pasahitza ez-aktibo gisa EZAKTIBO "
-"iarungitzearen\n"
-"                                ondoren\n"
-"  -g, --gid TALDE               erabiltzaile kontu berriarekin TALDE\n"
-"                                erabiltzea behartu\n"
-"  -G, --groups TALDEAK          erabiltzaile kontu berriaren talde\n"
-"                                gehiarriak bistarazi\n"
-"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
-"  -k, --skel SKEL_DIR           beste skel direktorio bat ezarri\n"
-"  -K, --key KEY=BALIO           lehenetsiriko /etc/login.defs gainidatzi\n"
-"  -l, --no-log-init             ez gehitu erabiltzailea lastlog eta faillog\n"
-"                                datu-baseetara\n"
-"  -m, --create-home             erabiltzaile kontu berriarentzar etxe\n"
-"                                direktorioa sortu\n"
-"  -M, --no-create-home          ez sortu erabiltzailearen etxe-direktorioa\n"
-"                                (/etc/login.defs gainidazten du)\n"
-"  -N, --no-user-group           ez sortu erabiltzailearen izen berdineko\n"
-"                                talde bat\n"
-"  -o, --non-unique              onartu erabiltzailea sortzea bikoizturiko\n"
-"                                (ez-bakarra) UIDa erabiliaz\n"
-"  -p, --password PASAHITZA       enkriptatutako pasahitza erabili "
-"erabiltzaile\n"
-"                                berri kontuarentzat\n"
-"  -r, --system                  sistema kontu bat sortu\n"
-"  -s, --shell SHELL             Erabiltzaile kontu berriaren sarrera shell-a\n"
-"  -u, --uid UID                 behartu UID erabiltzea erabiltzaile kontu "
-"berriarentzat\n"
-"  -U, --user-group              sortu erabiltzailearen izen berdineko talde "
-"bat\n"
-"%s\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
 "mapping\n"
 msgstr ""
-"  -Z, --selinux-user SEERAB     erabili SEUSER zehatz bat SELinux erabiltzaile "
-"mapatzearentzat\n"
+"  -Z, --selinux-user SEERAB     erabili SEUSER zehatz bat SELinux "
+"erabiltzaile mapatzearentzat\n"
 
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
@@ -1703,7 +1785,8 @@
 msgid "Creating mailbox file"
 msgstr "Postakutxa fitxategia sortzen"
 
-msgid "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
+msgid ""
+"Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
 "Ez da 'mail' taldea aurkitu. Erabiltzaile postakutxa fitxategia 0600 moduan\n"
 "sortzen.\n"
@@ -1716,8 +1799,10 @@
 msgstr "%s: '%s' erabiltzailea badago dagoeneko\n"
 
 #, c-format
-msgid "%s: group %s exists - if you want to add this user to that group, use -g.\n"
-msgstr "%s: %s taldea badago - erabiltzaile hau talde honetan gehitzeko -g erabili.\n"
+msgid ""
+"%s: group %s exists - if you want to add this user to that group, use -g.\n"
+msgstr ""
+"%s: %s taldea badago - erabiltzaile hau talde honetan gehitzeko -g erabili.\n"
 
 #, c-format
 msgid "%s: can't create user\n"
@@ -1861,10 +1946,10 @@
 "%s: unlocking the user's password would result in a passwordless account.\n"
 "You should set a password with usermod -p to unlock this user's password.\n"
 msgstr ""
-"%s: erabiltzaile pasahitza  desblokeatzeak pasahitz gabeko kontu baten emaitza "
-"izan dezake\n"
-"Erabiltzaile pasahitz hau desblokeatzeko usermod -p erabiliaz pasahitz bat ezarri "
-"behar duzu.\n"
+"%s: erabiltzaile pasahitza  desblokeatzeak pasahitz gabeko kontu baten "
+"emaitza izan dezake\n"
+"Erabiltzaile pasahitz hau desblokeatzeko usermod -p erabiliaz pasahitz bat "
+"ezarri behar duzu.\n"
 
 #, c-format
 msgid "%s: user '%s' already exists in %s\n"
@@ -1908,11 +1993,15 @@
 
 #, c-format
 msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
-msgstr "%s: huts %lu erabiltzailearen lastlog sarrera %lu erabiltzailera kopiatzean: %s\n"
+msgstr ""
+"%s: huts %lu erabiltzailearen lastlog sarrera %lu erabiltzailera kopiatzean: "
+"%s\n"
 
 #, c-format
 msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
-msgstr "%s: huts %lu erabiltzailearen faillog sarrera %lu erabiltzailera kopiatzean: %s\n"
+msgstr ""
+"%s: huts %lu erabiltzailearen faillog sarrera %lu erabiltzailera kopiatzean: "
+"%s\n"
 
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
@@ -1978,3 +2067,192 @@
 #, c-format
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: ezin da %s leheneratu: %s (zure aldaketak %s(e)n daude)\n"
+
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Erabilera: faillog [aukerak]\n"
+#~ "\n"
+#~ "Aukerak:\n"
+#~ "  -a, --all                     erabiltzaile guztien faillog-en\n"
+#~ "                                erregistroak bistaratzen ditu\n"
+#~ "  -h, --help                    laguntzako mezu hau bistarazi eta irten\n"
+#~ "  -l, --lock-time SEG           saio-hasieran hutsegin ondoren kontua "
+#~ "zenbat\n"
+#~ "                                segundutan blokeatuta egongo den\n"
+#~ "  -m, --maximum GEH             saio-hasierako GEHiengo hutsegite "
+#~ "kopurua\n"
+#~ "                                ezartzeko\n"
+#~ "  -r, --reset                   saio-hasierako hutsegiteen kontatzailea\n"
+#~ "                                berrezartzeko\n"
+#~ "  -t, --time EGUNAK             EGUNAK baino berriagoak diren faillog-en\n"
+#~ "                                erregistroak bistaratzeko\n"
+#~ "  -u, --user SAIOA              faillog-en erregistroak bistaratzeko edo\n"
+#~ "                                hutsegiteen kontatzailea eta "
+#~ "ERABILTZAILEA\n"
+#~ "                                izeneko erabiltzailearen(-r, -m edo -l\n"
+#~ "                                aukerekin erabiltzen bada) mantentzeko\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Erabilera: groupadd [aukerak] TALDEA\n"
+#~ "\n"
+#~ "Aukerak:\n"
+#~ "  -f, --force                   Indartu arrakastatsuki amaitzea nahiz\n"
+#~ "                                ezarritako taldea aurretik egon\n"
+#~ "  -g, --gid GID                 GID erabili talde berrirako\n"
+#~ "  -h, --help                    laguntza hau bistarazi eta irten\n"
+#~ "  -K, --key KEY=BALIO           /etc/login.defs lehenespenak gainidatzi\n"
+#~ "  -o, --non-unique              onartu bikoizutiko (ez bakarra) GID-a "
+#~ "duen\n"
+#~ "                                taldea sortzea\n"
+#~ "  -p, --password PASSWORD       enkriptatutako pasahitza erabili talde "
+#~ "berrirako\n"
+#~ "  -r, --system                  sistema kontu bat sortu\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Erabilera: groupmod [aukerak] TALDEA\n"
+#~ "\n"
+#~ "Aukerak::\n"
+#~ "  -g, --gid GID                 taldearentzat GID berria erabiltzea "
+#~ "indartu\n"
+#~ "  -h, --help                    laguntza hau bistarazi eta irten\n"
+#~ "  -K, --new-name TALDE_BERRIA   Taldearentzat TALDE_BERRI izena\n"
+#~ "                                erabiltzea indartu\n"
+#~ "  -o, --non-unique              onartu TALDEAK bikoizutiko (ez bakarra) "
+#~ "GID-a erabiltzea\n"
+#~ "  -p, --password PASSWORD       enkriptatutako pasahitza erabili pasahitz "
+#~ "berrirako\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Erabilera: useradd [aukerak] IZENA\n"
+#~ "\n"
+#~ "Aukerak:\n"
+#~ "  -b, --base-dir BASE_DIR       Erabiltzaile kontu berriaren etxe\n"
+#~ "                                direktorioaren oinarri direktorioa\n"
+#~ "  -c, --comment IRUZKINA        erabiltzaile kontu berriaren GECOS "
+#~ "ezarri\n"
+#~ "  -d, --home-dir HOME_DIR       erabiltzaile kontu berriaren etxe\n"
+#~ "                                direktorioa\n"
+#~ "  -D, --defaults                bistarazi edo gorde aldaturiko\n"
+#~ "                                lehenetsiriko useradd konfigurazioa\n"
+#~ "  -e, --expiredate IRAUNG_DATA  kontu iraungitze data ezarri\n"
+#~ "  -f, --inactive EZAKTIBO       ezarri pasahitza ez-aktibo gisa EZAKTIBO "
+#~ "iarungitzearen\n"
+#~ "                                ondoren\n"
+#~ "  -g, --gid TALDE               erabiltzaile kontu berriarekin TALDE\n"
+#~ "                                erabiltzea behartu\n"
+#~ "  -G, --groups TALDEAK          erabiltzaile kontu berriaren talde\n"
+#~ "                                gehiarriak bistarazi\n"
+#~ "  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+#~ "  -k, --skel SKEL_DIR           beste skel direktorio bat ezarri\n"
+#~ "  -K, --key KEY=BALIO           lehenetsiriko /etc/login.defs gainidatzi\n"
+#~ "  -l, --no-log-init             ez gehitu erabiltzailea lastlog eta "
+#~ "faillog\n"
+#~ "                                datu-baseetara\n"
+#~ "  -m, --create-home             erabiltzaile kontu berriarentzar etxe\n"
+#~ "                                direktorioa sortu\n"
+#~ "  -M, --no-create-home          ez sortu erabiltzailearen etxe-"
+#~ "direktorioa\n"
+#~ "                                (/etc/login.defs gainidazten du)\n"
+#~ "  -N, --no-user-group           ez sortu erabiltzailearen izen berdineko\n"
+#~ "                                talde bat\n"
+#~ "  -o, --non-unique              onartu erabiltzailea sortzea "
+#~ "bikoizturiko\n"
+#~ "                                (ez-bakarra) UIDa erabiliaz\n"
+#~ "  -p, --password PASAHITZA       enkriptatutako pasahitza erabili "
+#~ "erabiltzaile\n"
+#~ "                                berri kontuarentzat\n"
+#~ "  -r, --system                  sistema kontu bat sortu\n"
+#~ "  -s, --shell SHELL             Erabiltzaile kontu berriaren sarrera "
+#~ "shell-a\n"
+#~ "  -u, --uid UID                 behartu UID erabiltzea erabiltzaile kontu "
+#~ "berriarentzat\n"
+#~ "  -U, --user-group              sortu erabiltzailearen izen berdineko "
+#~ "talde bat\n"
+#~ "%s\n"

Modified: upstream/trunk/po/fi.po
===================================================================
--- upstream/trunk/po/fi.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/fi.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2007-11-24 22:54+0100\n"
 "Last-Translator: Tommi Vainikainen <thv+debian at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -112,6 +112,10 @@
 "Viimeisin oli %s päätteellä %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: ei saa ainutkertaista UID:tä\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: ei saa ainutkertaista GID:iä\n"
 
@@ -611,61 +615,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Käyttö: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Käyttö: faillog [valitsimet]\n"
-"\n"
-"Valitsimet:\n"
-"  -a, --all                     Näytä faillog-tietueet kaikille käyttäjille\n"
-"  -h, --help                    Näytä tämä ohje ja lopeta\n"
-"  -l, --lock-time SEK           Lukitse epäonnistuneen kirjautumisen "
-"jälkeen\n"
-"                                tunnus SEK sekunniksi\n"
-"  -m, --maximum MAX             Aseta sallittujen kirjautumisyritysten\n"
-"                                laskureiksi MAX\n"
-"  -r, --reset                   Nollaa kirjautumisyrityslaskurit\n"
-"  -t, --time PÄIVIÄ             Näytä PÄIVIÄ uudemmat faillog-tietueet\n"
-"  -u, --user TUNNUS             Näytä faillog-tietue tai muuta\n"
-"                                kirjautumisyrityslaskureita (kun\n"
-"                                käytetään -r, -m tai -l-valitsimilla)\n"
-"                                vain käyttäjälle TUNNUS\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -778,34 +753,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Ei ole pääte\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Käyttö: %s [syöte]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Käyttö: groupadd [valitsimet] RYHMÄ\n"
-"\n"
-"Valitsimet:\n"
-"  -f, --force                   poistu onnistuneella arvolla vaikka annettu\n"
-"                                ryhmä olisikin jo olemassa\n"
-"  -g, --gid RYHMÄID             käytä RYHMÄID:tä uudelle ryhmälle\n"
-"  -h, --help                    näytä tämä ohjeviesti ja poistu\n"
-"  -K, --key AVAIN=ARVO          ohita /etc/login.defs:n oletusarvot\n"
-"  -o, --non-unique              salli ryhmän luominen (ei-uniikilla)\n"
-"                                kopio-RYHMÄID:llä\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -889,28 +869,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Käyttö: groupmod [valitsimet] RYHMÄ\n"
-"\n"
-"Valitsimet:\n"
-"  -g, --gid RYHMÄID             käytä RYHMÄID:tä tälle ryhmälle\n"
-"  -h, --help                    näytä tämä ohjeviesti ja poistu\n"
-"  -n, --new-name UUSI_RYHMÄ     aseta UUSI_RYHMÄ nimeksi RYHMÄlle\n"
-"  -o, --non-unique              salli saman RYHMÄID:n käyttäminen RYHMÄlle\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "virheellinen ryhmänimi \"%s\"\n"
@@ -1421,6 +1394,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Käyttö: %s [-q] [-r] [-s] [passwd [varjo]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: valitsimet -s ja -r eivät sovi yhteen\n"
+
 msgid "invalid password file entry"
 msgstr "virheellinen sanasanatiedostotietue"
 
@@ -1625,77 +1603,87 @@
 msgstr "%s: liian monta ryhmää määritelty (korkeintaan %d).\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Käyttö: %s [syöte]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Käyttö: useradd [valitsimet] TUNNUS\n"
-"\n"
-"Valitsimet:\n"
-"  -b, --base-dir YLÄHAK         Ylähakemisto uuden käyttäjätunnuksen\n"
-"                                kotihakemistolle\n"
-"  -c, --comment KOMMENTTI       Aseta GECOS-kenttä uudelle "
-"käyttäjätunnukselle\n"
-"  -d, --home-dir KOTIHAK        Uuden käyttäjätunnuksen kotihakemisto\n"
-"  -D, --defaults                Tulosta tai tallenna useradd-työkalun\n"
-"                                oletusasetukset\n"
-"  -e, --expiredate VANH_PVM     Aseta tilin vanhenemispäiväykseksi VANH_PVM\n"
-"  -f, --inactive POISKÄYTÖSTÄ   Ota salasana pois käytöstä POISKÄYTÖSTÄ\n"
-"                                päivää vanhenemisen jälkeen\n"
-"  -g, --gid RYHMÄ               Valitse itse RYHMÄ uudelle "
-"käyttäjätunnukselle\n"
-"  -G, --groups RYHMÄT           Luettelo lisäryhmistä uudelle\n"
-"                                käyttäjätunnukselle\n"
-"  -h, --help                    Näytä tämä ohje ja lopeta\n"
-"  -k, --skel MALLIHAK           Määritä vaihtoehtoinen mallihakemisto\n"
-"  -K, --key AVAIN=ARVO          Kumoa /etc/login.defs-oletusarvot\n"
-"  -m, --create-home             Luo kotihakemisto uudelle "
-"käyttäjätunnukselle\n"
-"  -o, --non-unique              Salli UID:n uudelleenkäyttö (ei-uniikki "
-"UID)\n"
-"                                luotaessa käyttäjätunnus\n"
-"  -p, --password SALASANA       Käytä salakirjoitettua salasanaa uudelle\n"
-"                                käyttäjätunnukselle\n"
-"  -s, --shell KUORI             Uuden käyttäjätunnuksen "
-"sisäänkirjautumiskuori\n"
-"  -u, --uid UID                 Valitse itse UID uudelle "
-"käyttäjätunnukselle\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2046,6 +2034,194 @@
 msgstr ""
 "%s: tiedostoa %s ei voi palauttaa: %s (muutoksesi ovat tiedostossa %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Käyttö: faillog [valitsimet]\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+#~ "  -a, --all                     Näytä faillog-tietueet kaikille "
+#~ "käyttäjille\n"
+#~ "  -h, --help                    Näytä tämä ohje ja lopeta\n"
+#~ "  -l, --lock-time SEK           Lukitse epäonnistuneen kirjautumisen "
+#~ "jälkeen\n"
+#~ "                                tunnus SEK sekunniksi\n"
+#~ "  -m, --maximum MAX             Aseta sallittujen kirjautumisyritysten\n"
+#~ "                                laskureiksi MAX\n"
+#~ "  -r, --reset                   Nollaa kirjautumisyrityslaskurit\n"
+#~ "  -t, --time PÄIVIÄ             Näytä PÄIVIÄ uudemmat faillog-tietueet\n"
+#~ "  -u, --user TUNNUS             Näytä faillog-tietue tai muuta\n"
+#~ "                                kirjautumisyrityslaskureita (kun\n"
+#~ "                                käytetään -r, -m tai -l-valitsimilla)\n"
+#~ "                                vain käyttäjälle TUNNUS\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Käyttö: groupadd [valitsimet] RYHMÄ\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+#~ "  -f, --force                   poistu onnistuneella arvolla vaikka "
+#~ "annettu\n"
+#~ "                                ryhmä olisikin jo olemassa\n"
+#~ "  -g, --gid RYHMÄID             käytä RYHMÄID:tä uudelle ryhmälle\n"
+#~ "  -h, --help                    näytä tämä ohjeviesti ja poistu\n"
+#~ "  -K, --key AVAIN=ARVO          ohita /etc/login.defs:n oletusarvot\n"
+#~ "  -o, --non-unique              salli ryhmän luominen (ei-uniikilla)\n"
+#~ "                                kopio-RYHMÄID:llä\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Käyttö: groupmod [valitsimet] RYHMÄ\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+#~ "  -g, --gid RYHMÄID             käytä RYHMÄID:tä tälle ryhmälle\n"
+#~ "  -h, --help                    näytä tämä ohjeviesti ja poistu\n"
+#~ "  -n, --new-name UUSI_RYHMÄ     aseta UUSI_RYHMÄ nimeksi RYHMÄlle\n"
+#~ "  -o, --non-unique              salli saman RYHMÄID:n käyttäminen "
+#~ "RYHMÄlle\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Käyttö: useradd [valitsimet] TUNNUS\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+#~ "  -b, --base-dir YLÄHAK         Ylähakemisto uuden käyttäjätunnuksen\n"
+#~ "                                kotihakemistolle\n"
+#~ "  -c, --comment KOMMENTTI       Aseta GECOS-kenttä uudelle "
+#~ "käyttäjätunnukselle\n"
+#~ "  -d, --home-dir KOTIHAK        Uuden käyttäjätunnuksen kotihakemisto\n"
+#~ "  -D, --defaults                Tulosta tai tallenna useradd-työkalun\n"
+#~ "                                oletusasetukset\n"
+#~ "  -e, --expiredate VANH_PVM     Aseta tilin vanhenemispäiväykseksi "
+#~ "VANH_PVM\n"
+#~ "  -f, --inactive POISKÄYTÖSTÄ   Ota salasana pois käytöstä POISKÄYTÖSTÄ\n"
+#~ "                                päivää vanhenemisen jälkeen\n"
+#~ "  -g, --gid RYHMÄ               Valitse itse RYHMÄ uudelle "
+#~ "käyttäjätunnukselle\n"
+#~ "  -G, --groups RYHMÄT           Luettelo lisäryhmistä uudelle\n"
+#~ "                                käyttäjätunnukselle\n"
+#~ "  -h, --help                    Näytä tämä ohje ja lopeta\n"
+#~ "  -k, --skel MALLIHAK           Määritä vaihtoehtoinen mallihakemisto\n"
+#~ "  -K, --key AVAIN=ARVO          Kumoa /etc/login.defs-oletusarvot\n"
+#~ "  -m, --create-home             Luo kotihakemisto uudelle "
+#~ "käyttäjätunnukselle\n"
+#~ "  -o, --non-unique              Salli UID:n uudelleenkäyttö (ei-uniikki "
+#~ "UID)\n"
+#~ "                                luotaessa käyttäjätunnus\n"
+#~ "  -p, --password SALASANA       Käytä salakirjoitettua salasanaa uudelle\n"
+#~ "                                käyttäjätunnukselle\n"
+#~ "  -s, --shell KUORI             Uuden käyttäjätunnuksen "
+#~ "sisäänkirjautumiskuori\n"
+#~ "  -u, --uid UID                 Valitse itse UID uudelle "
+#~ "käyttäjätunnukselle\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "Salasana asetettu vanhenemaan."
 

Modified: upstream/trunk/po/fr.po
===================================================================
--- upstream/trunk/po/fr.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/fr.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2009-05-22 15:52+0200\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon at wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -123,6 +123,13 @@
 "%d échecs depuis la dernière connexion.\n"
 "Le dernier échec était le %s sur %s.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: Can't get unique system UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr ""
+"%s : impossible d'obtenir un identifiant d'utilisateur (UID) unique (plus "
+"d'UID disponible)\n"
+
 #, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr ""
@@ -622,46 +629,40 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Syntaxe : expiry {-f|-c}\n"
 
-#
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+"  -h, --help                    afficher ce message d'aide et quitter\n"
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr "  -r, --system                  créer des comptes système\n"
+
+#, fuzzy
+#| msgid "  -h, --help                    display this help message and exit\n"
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Syntaxe : faillog [options]\n"
-"\n"
-"Options :\n"
-"  -a, --all                     afficher les enregistrements « faillog »\n"
-"                                pour tous les utilisateurs\n"
 "  -h, --help                    afficher ce message d'aide et quitter\n"
-"  -l, --lock-time SEC           après une connexion refusée, verrouiller le\n"
-"                                compte pendant SEC secondes\n"
-"  -m, --maximum MAX             positionner les compteurs de connexions\n"
-"                                refusées à MAX\n"
-"  -r, --reset                   remettre à zéro les compteurs de connexions\n"
-"                                refusées\n"
-"  -t, --time NB_JOURS           afficher les échecs de connexions datant de\n"
-"                                moins de NB_JOURS jours\n"
-"  -u, --user LOGIN              afficher l'enregistrement « faillog » ou\n"
-"                                gérer les compteurs et les limites (si\n"
-"                                utilisé conjointement avec les options -r,\n"
-"                                -m ou -l) d'échecs uniquement pour\n"
-"                                l'utilisateur dont le compte est LOGIN\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 # , c-format
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
@@ -799,37 +800,61 @@
 msgid "%s: Not a tty\n"
 msgstr "%s : n'est pas un tty\n"
 
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
-"                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Syntaxe : groupadd [option] GROUPE\n"
+"Utilisation : %s [options]\n"
 "\n"
-"Options :\n"
-"  -f, --force                   forcer la sortie avec un code de retour de\n"
-"                                succès si le groupe indiqué existe déjà\n"
-"  -g, --gid GID                 utiliser GID pour le nouveau groupe\n"
-"  -h, --help                    afficher ce message d'aide et quitter\n"
-"  -K, --key CLÉ=VALEUR          remplacer les valeurs par défaut de\n"
-"                                /etc/login.defs\n"
-"  -o, --non-unique              permettre de créer un groupe avec un GID\n"
-"                                dupliqué (non unique)\n"
-"  -p, --password MOT_DE_PASSE   utiliser un mot de passe chiffré pour le\n"
-"                                nouveau groupe\n"
-"  -r, --system                  créer un compte système\n"
-"\n"
+"Options:\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+"  -m, --md5                     utiliser le chiffrement MD5 pour les mots\n"
+"                                de passe\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr "  -r, --system                  créer des comptes système\n"
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
+"                                (non-unique) GID\n"
+msgstr ""
+"  -s, --sha-rounds              nombre de passes SHA pour les algorithmes \n"
+"                                de chiffrement SHA*\n"
+
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -r, --system                  create a system account\n"
+msgstr "  -r, --system                  créer des comptes système\n"
+
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s : %s n'est pas un nom de groupe valable\n"
@@ -922,33 +947,23 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr "%s : seul l'administrateur peut utiliser l'option -g/--group\n"
 
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr "  -r, --system                  créer des comptes système\n"
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Syntaxe : groupmod [option] GROUPE\n"
-"\n"
-"Options :\n"
-"  -g, --gid GID                 forcer l'utilisation par le GROUPE du\n"
-"                                nouveau GID\n"
-"  -h, --help                    afficher ce message d'aide et quitter\n"
-"  -n, --new-name NOUVEAU_GROUPE forcer l'utilisation par le GROUPE du\n"
-"                                NOUVEAU_GROUPE\n"
-"  -o, --non-unique              permettre l'utilisation par le GROUPE\n"
-"                                d'un groupe avec un GID dupliqué\n"
-"                                (non unique)\n"
-"  -p, --password MOT_DE_PASSE   utiliser un mot de passe chiffré comme\n"
-"                                nouveau mot de passe\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s : nom de groupe « %s » non valable\n"
@@ -1447,6 +1462,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Syntaxe : %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s : -s et -r sont incompatibles\n"
+
 msgid "invalid password file entry"
 msgstr "entrée non valable dans le fichier des mots de passe"
 
@@ -1648,91 +1668,136 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s : trop de groupes spécifiés (max %d).\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [options]\n"
+#| "\n"
+#| "Options:\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr ""
+"Utilisation : %s [options]\n"
+"\n"
+"Options:\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+"  -s, --sha-rounds              nombre de passes SHA pour les algorithmes \n"
+"                                de chiffrement SHA*\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              nombre de passes SHA pour les algorithmes \n"
+"                                de chiffrement SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              nombre de passes SHA pour les algorithmes \n"
+"                                de chiffrement SHA*\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+"  -s, --sha-rounds              nombre de passes SHA pour les algorithmes \n"
+"                                de chiffrement SHA*\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr "  -r, --system                  créer des comptes système\n"
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+"  -s, --sha-rounds              nombre de passes SHA pour les algorithmes \n"
+"                                de chiffrement SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -m, --md5                     encrypt the clear text password using\n"
+#| "                                the MD5 algorithm\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+"  -m, --md5                     utiliser le chiffrement MD5 pour les mots\n"
+"                                de passe\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr "  -r, --system                  créer des comptes système\n"
+
+#, fuzzy
+#| msgid "  -r, --system                  create system accounts\n"
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr "  -r, --system                  créer des comptes système\n"
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Syntaxe : useradd [options] IDENTIFIANT\n"
-"\n"
-"Options :\n"
-"  -b, --base-dir REP_BASE       répertoire de base pour le répertoire\n"
-"                                personnel du compte du nouvel utilisateur\n"
-"  -c, --comment COMMENT         définir le champ « GECOS » du compte du\n"
-"                                nouvel utilisateur\n"
-"  -d, --home-dir REP_PERS       répertoire personnel pour le compte du\n"
-"                                nouvel utilisateur\n"
-"  -D, --defaults                afficher ou enregistrer la configuration\n"
-"                                par défaut modifiée de « useradd »\n"
-"  -e, --expiredate DATE_EXPIR   fixer la date de fin de validité du\n"
-"                                compte à DATE_EXPIR\n"
-"  -f, --inactive INACTIF        fixer la durée d'inactivité du mot de passe\n"
-"                                après sa fin de validité à INACTIF\n"
-"  -g, --gid GROUPE              forcer l'utilisation de GROUPE pour le\n"
-"                                compte du nouvel utilisateur\n"
-"  -G, --groups GROUPES          liste des GROUPES supplémentaires pour le\n"
-"                                compte du nouvel utilisateur\n"
-"  -h, --help                    afficher ce message d'aide et quitter\n"
-"  -k, --skel REP_SQEL           définir un autre répertoire « skel »\n"
-"  -K, --key CLÉ=VALEUR          remplacer les valeurs par défaut de\n"
-"                                /etc/login.defs\n"
-"  -l, --no-log-init             ne pas ajouter l'utilisateur aux bases de\n"
-"                                données lastlog et faillog\n"
-"  -m, --create-home             créer le répertoire personnel pour le\n"
-"                                compte du nouvel utilisateur\n"
-"  -M, --no-create-home          ne pas créer de répertoire personnel pour\n"
-"                                le compte du nouvel utilisateur (remplace\n"
-"                                /etc/login.defs)\n"
-"  -N, --no-user-group           ne pas créer de groupe de même nom que\n"
-"                                l'utilisateur\n"
-"  -o, --non-unique              autoriser la création d'un utilisateur\n"
-"                                avec un identifiant d'utilisateur (UID)\n"
-"                                dupliqué (non unique)\n"
-"  -p, --password MOT_DE_PASSE   utiliser un mot de passe chiffré pour le\n"
-"                                compte du nouvel utilisateur\n"
-"  -r, --system                  créer un nouveau compte système\n"
-"  -s, --shell INTERPRÉTEUR      interpréteur de commandes initial pour le\n"
-"                                compte du nouvel utilisateur\n"
-"  -u, --uid UID                 forcer l'utilisation de l'identifiant\n"
-"                                « UID » pour le compte du nouvel utilisateur\n"
-"  -U, --user-group              créer un groupe ayant le même nom que\n"
-"                                l'utilisateur\n"
-"%s\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2101,7 +2166,208 @@
 msgstr ""
 "%s : impossible de restaurer %s : %s (vos modifications sont dans %s)\n"
 
+#
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Syntaxe : faillog [options]\n"
+#~ "\n"
+#~ "Options :\n"
+#~ "  -a, --all                     afficher les enregistrements « faillog »\n"
+#~ "                                pour tous les utilisateurs\n"
+#~ "  -h, --help                    afficher ce message d'aide et quitter\n"
+#~ "  -l, --lock-time SEC           après une connexion refusée, verrouiller "
+#~ "le\n"
+#~ "                                compte pendant SEC secondes\n"
+#~ "  -m, --maximum MAX             positionner les compteurs de connexions\n"
+#~ "                                refusées à MAX\n"
+#~ "  -r, --reset                   remettre à zéro les compteurs de "
+#~ "connexions\n"
+#~ "                                refusées\n"
+#~ "  -t, --time NB_JOURS           afficher les échecs de connexions datant "
+#~ "de\n"
+#~ "                                moins de NB_JOURS jours\n"
+#~ "  -u, --user LOGIN              afficher l'enregistrement « faillog » ou\n"
+#~ "                                gérer les compteurs et les limites (si\n"
+#~ "                                utilisé conjointement avec les options -"
+#~ "r,\n"
+#~ "                                -m ou -l) d'échecs uniquement pour\n"
+#~ "                                l'utilisateur dont le compte est LOGIN\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Syntaxe : groupadd [option] GROUPE\n"
+#~ "\n"
+#~ "Options :\n"
+#~ "  -f, --force                   forcer la sortie avec un code de retour "
+#~ "de\n"
+#~ "                                succès si le groupe indiqué existe déjà\n"
+#~ "  -g, --gid GID                 utiliser GID pour le nouveau groupe\n"
+#~ "  -h, --help                    afficher ce message d'aide et quitter\n"
+#~ "  -K, --key CLÉ=VALEUR          remplacer les valeurs par défaut de\n"
+#~ "                                /etc/login.defs\n"
+#~ "  -o, --non-unique              permettre de créer un groupe avec un GID\n"
+#~ "                                dupliqué (non unique)\n"
+#~ "  -p, --password MOT_DE_PASSE   utiliser un mot de passe chiffré pour le\n"
+#~ "                                nouveau groupe\n"
+#~ "  -r, --system                  créer un compte système\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Syntaxe : groupmod [option] GROUPE\n"
+#~ "\n"
+#~ "Options :\n"
+#~ "  -g, --gid GID                 forcer l'utilisation par le GROUPE du\n"
+#~ "                                nouveau GID\n"
+#~ "  -h, --help                    afficher ce message d'aide et quitter\n"
+#~ "  -n, --new-name NOUVEAU_GROUPE forcer l'utilisation par le GROUPE du\n"
+#~ "                                NOUVEAU_GROUPE\n"
+#~ "  -o, --non-unique              permettre l'utilisation par le GROUPE\n"
+#~ "                                d'un groupe avec un GID dupliqué\n"
+#~ "                                (non unique)\n"
+#~ "  -p, --password MOT_DE_PASSE   utiliser un mot de passe chiffré comme\n"
+#~ "                                nouveau mot de passe\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Syntaxe : useradd [options] IDENTIFIANT\n"
+#~ "\n"
+#~ "Options :\n"
+#~ "  -b, --base-dir REP_BASE       répertoire de base pour le répertoire\n"
+#~ "                                personnel du compte du nouvel "
+#~ "utilisateur\n"
+#~ "  -c, --comment COMMENT         définir le champ « GECOS » du compte du\n"
+#~ "                                nouvel utilisateur\n"
+#~ "  -d, --home-dir REP_PERS       répertoire personnel pour le compte du\n"
+#~ "                                nouvel utilisateur\n"
+#~ "  -D, --defaults                afficher ou enregistrer la configuration\n"
+#~ "                                par défaut modifiée de « useradd »\n"
+#~ "  -e, --expiredate DATE_EXPIR   fixer la date de fin de validité du\n"
+#~ "                                compte à DATE_EXPIR\n"
+#~ "  -f, --inactive INACTIF        fixer la durée d'inactivité du mot de "
+#~ "passe\n"
+#~ "                                après sa fin de validité à INACTIF\n"
+#~ "  -g, --gid GROUPE              forcer l'utilisation de GROUPE pour le\n"
+#~ "                                compte du nouvel utilisateur\n"
+#~ "  -G, --groups GROUPES          liste des GROUPES supplémentaires pour "
+#~ "le\n"
+#~ "                                compte du nouvel utilisateur\n"
+#~ "  -h, --help                    afficher ce message d'aide et quitter\n"
+#~ "  -k, --skel REP_SQEL           définir un autre répertoire « skel »\n"
+#~ "  -K, --key CLÉ=VALEUR          remplacer les valeurs par défaut de\n"
+#~ "                                /etc/login.defs\n"
+#~ "  -l, --no-log-init             ne pas ajouter l'utilisateur aux bases "
+#~ "de\n"
+#~ "                                données lastlog et faillog\n"
+#~ "  -m, --create-home             créer le répertoire personnel pour le\n"
+#~ "                                compte du nouvel utilisateur\n"
+#~ "  -M, --no-create-home          ne pas créer de répertoire personnel "
+#~ "pour\n"
+#~ "                                le compte du nouvel utilisateur "
+#~ "(remplace\n"
+#~ "                                /etc/login.defs)\n"
+#~ "  -N, --no-user-group           ne pas créer de groupe de même nom que\n"
+#~ "                                l'utilisateur\n"
+#~ "  -o, --non-unique              autoriser la création d'un utilisateur\n"
+#~ "                                avec un identifiant d'utilisateur (UID)\n"
+#~ "                                dupliqué (non unique)\n"
+#~ "  -p, --password MOT_DE_PASSE   utiliser un mot de passe chiffré pour le\n"
+#~ "                                compte du nouvel utilisateur\n"
+#~ "  -r, --system                  créer un nouveau compte système\n"
+#~ "  -s, --shell INTERPRÉTEUR      interpréteur de commandes initial pour "
+#~ "le\n"
+#~ "                                compte du nouvel utilisateur\n"
+#~ "  -u, --uid UID                 forcer l'utilisation de l'identifiant\n"
+#~ "                                « UID » pour le compte du nouvel "
+#~ "utilisateur\n"
+#~ "  -U, --user-group              créer un groupe ayant le même nom que\n"
+#~ "                                l'utilisateur\n"
+#~ "%s\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/gl.po
===================================================================
--- upstream/trunk/po/gl.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/gl.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2006-07-18 23:27+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
@@ -114,6 +114,10 @@
 "O último foi o %s en %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: non se pode obter un UID único\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: non se pode obter un GID único\n"
 
@@ -594,42 +598,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Emprego: expiry {-f|-c}\n"
 
-#, fuzzy
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Emprego: faillog [opcións]\n"
-"\n"
-"Opcións:\n"
-"  -a, --all\t\tamosa os rexistros de entradas fallidas\tpara\n"
-"\t\t\ttódolos usuarios\n"
-"  -h, --help\t\tamosa esta mensaxe de axuda e sae\n"
-"  -l, --lock-time SEG\tdespois dunha entrada fallida bloquea a conta\n"
-"\t\t\tdurante SEG segundos\n"
-"  -m, --maximum MÁX\tfixa os contadores de máximas entradas fallidas a MÁX\n"
-"  -r, --reset\t\treinicia os contadores de entradas fallidas\n"
-"  -t, --time DÍAS\tamosa os rexistros de entradas fallidas máis\n"
-"\t\t\trecentes que DÍAS\n"
-"  -u, --user USUARIO\tamosa o rexistro de entradas fallidas ou mantén\n"
-"\t\t\tos contadores de fallos e límites (se se emprega coas\n"
-"\t\t\topcións -r, -m ou -l) só do USUARIO\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -742,32 +736,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Non é un tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Emprego: %s [entrada]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Emprego: groupadd [opcións] GRUPO\n"
-"\n"
-"Opcións:\n"
-"  -f, --force\t\tforza a saída con éxito se o grupo indicado xa existe\n"
-"  -g, --gid GID\t\temprega o GID para o novo grupo\n"
-"  -h, --help\t\tamosa esta mensaxe de axuda e sae\n"
-"  -K, --key CLAVE=VALOR\tignora os valores de /etc/login.defs\n"
-"  -o, --non-unique\tpermite crear un grupo cun GID duplicado (non único)\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -851,28 +852,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Emprego: groupmod [opcións] GRUPO\n"
-"\n"
-"Opcións:\n"
-"  -g, --gid GID\t\t\temprega o GID para o novo grupo\n"
-"  -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n"
-"  -n, --new-name NOVO_GRUPO\tcambia o nome do GRUPO por NOVO_GRUPO\n"
-"  -o, --non-unique\t\tpermite crear un grupo cun GID duplicado\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "nome de grupo \"%s\" non válido\n"
@@ -1357,6 +1351,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Emprego: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s e -r son incompatibles\n"
+
 msgid "invalid password file entry"
 msgstr "entrada do ficheiro de contrasinais non válida"
 
@@ -1560,72 +1559,87 @@
 msgstr "%s: especificáronse grupos de máis (máximo %d).\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Emprego: %s [entrada]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Emprego: useradd [opcións] USUARIO\n"
-"\n"
-"Opcións:\n"
-"  -b, --base-dir DIR_BASE\tdirectorio base para o directorio inicial\n"
-"\t\t\t\tda nova conta de usuario\n"
-"  -c, --comment COMENTARIO\tfixa o campo GECOS da nova conta de usuario\n"
-"  -d, --home-dir DIR_INICIAL\tdirectorio inicial da nova conta de usuario\n"
-"  -D, --defaults\t\tamosa ou grave a configuración modificada\n"
-"\t\t\t\tde useradd\n"
-"  -e, --expiredate DATA_CAD\tfixa a data de caducidade da conta a DATA_CAD\n"
-"  -f, --inactive INACTIVA\tfixa o tempo de inactividade do contrasinal\n"
-"\t\t\t\ttrala caducidade a INACTIVA\n"
-"  -g, --gid GRUPO\t\tusa o GRUPO para a nova conta de usuario\n"
-"  -G, --groups GRUPOS\t\tlista de grupos suplementarios para a nova\n"
-"\t\t\t\tconta de usuario\n"
-"  -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n"
-"  -k, --skel DIR_SKEL\t\tespecifica un directorio \"skel\" alternativo\n"
-"  -K, --key CLAVE=VALOR\t\tomite os valores por defecto de /etc/login.defs\n"
-"  -m, --create-home\t\tcrea o directorio inicial para a nova conta\n"
-"\t\t\t\tde usuario\n"
-"  -o, --non-unique\t\tpermite crear usuarios con UIDs duplicados\n"
-"\t\t\t\t(non únicos)\n"
-"  -p, --password CONTRASINAL\temprega o CONTRASINAL cifrado para a nova\n"
-"\t\t\t\tconta de usuario\n"
-"  -s, --shell INTÉRPRETE\to intérprete de ordes da nova conta de usuario\n"
-"  -u, --uid UID\t\t\tusa o UID para a nova conta de usuario\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -1973,6 +1987,167 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: non se pode restaurar %s: %s (os seus cambios están en %s)\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Emprego: faillog [opcións]\n"
+#~ "\n"
+#~ "Opcións:\n"
+#~ "  -a, --all\t\tamosa os rexistros de entradas fallidas\tpara\n"
+#~ "\t\t\ttódolos usuarios\n"
+#~ "  -h, --help\t\tamosa esta mensaxe de axuda e sae\n"
+#~ "  -l, --lock-time SEG\tdespois dunha entrada fallida bloquea a conta\n"
+#~ "\t\t\tdurante SEG segundos\n"
+#~ "  -m, --maximum MÁX\tfixa os contadores de máximas entradas fallidas a "
+#~ "MÁX\n"
+#~ "  -r, --reset\t\treinicia os contadores de entradas fallidas\n"
+#~ "  -t, --time DÍAS\tamosa os rexistros de entradas fallidas máis\n"
+#~ "\t\t\trecentes que DÍAS\n"
+#~ "  -u, --user USUARIO\tamosa o rexistro de entradas fallidas ou mantén\n"
+#~ "\t\t\tos contadores de fallos e límites (se se emprega coas\n"
+#~ "\t\t\topcións -r, -m ou -l) só do USUARIO\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Emprego: groupadd [opcións] GRUPO\n"
+#~ "\n"
+#~ "Opcións:\n"
+#~ "  -f, --force\t\tforza a saída con éxito se o grupo indicado xa existe\n"
+#~ "  -g, --gid GID\t\temprega o GID para o novo grupo\n"
+#~ "  -h, --help\t\tamosa esta mensaxe de axuda e sae\n"
+#~ "  -K, --key CLAVE=VALOR\tignora os valores de /etc/login.defs\n"
+#~ "  -o, --non-unique\tpermite crear un grupo cun GID duplicado (non único)\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Emprego: groupmod [opcións] GRUPO\n"
+#~ "\n"
+#~ "Opcións:\n"
+#~ "  -g, --gid GID\t\t\temprega o GID para o novo grupo\n"
+#~ "  -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n"
+#~ "  -n, --new-name NOVO_GRUPO\tcambia o nome do GRUPO por NOVO_GRUPO\n"
+#~ "  -o, --non-unique\t\tpermite crear un grupo cun GID duplicado\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Emprego: useradd [opcións] USUARIO\n"
+#~ "\n"
+#~ "Opcións:\n"
+#~ "  -b, --base-dir DIR_BASE\tdirectorio base para o directorio inicial\n"
+#~ "\t\t\t\tda nova conta de usuario\n"
+#~ "  -c, --comment COMENTARIO\tfixa o campo GECOS da nova conta de usuario\n"
+#~ "  -d, --home-dir DIR_INICIAL\tdirectorio inicial da nova conta de "
+#~ "usuario\n"
+#~ "  -D, --defaults\t\tamosa ou grave a configuración modificada\n"
+#~ "\t\t\t\tde useradd\n"
+#~ "  -e, --expiredate DATA_CAD\tfixa a data de caducidade da conta a "
+#~ "DATA_CAD\n"
+#~ "  -f, --inactive INACTIVA\tfixa o tempo de inactividade do contrasinal\n"
+#~ "\t\t\t\ttrala caducidade a INACTIVA\n"
+#~ "  -g, --gid GRUPO\t\tusa o GRUPO para a nova conta de usuario\n"
+#~ "  -G, --groups GRUPOS\t\tlista de grupos suplementarios para a nova\n"
+#~ "\t\t\t\tconta de usuario\n"
+#~ "  -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n"
+#~ "  -k, --skel DIR_SKEL\t\tespecifica un directorio \"skel\" alternativo\n"
+#~ "  -K, --key CLAVE=VALOR\t\tomite os valores por defecto de /etc/login."
+#~ "defs\n"
+#~ "  -m, --create-home\t\tcrea o directorio inicial para a nova conta\n"
+#~ "\t\t\t\tde usuario\n"
+#~ "  -o, --non-unique\t\tpermite crear usuarios con UIDs duplicados\n"
+#~ "\t\t\t\t(non únicos)\n"
+#~ "  -p, --password CONTRASINAL\temprega o CONTRASINAL cifrado para a nova\n"
+#~ "\t\t\t\tconta de usuario\n"
+#~ "  -s, --shell INTÉRPRETE\to intérprete de ordes da nova conta de usuario\n"
+#~ "  -u, --uid UID\t\t\tusa o UID para a nova conta de usuario\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "Vai caducar o contrasinal."
 

Modified: upstream/trunk/po/he.po
===================================================================
--- upstream/trunk/po/he.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/he.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2004-07-21 23:59+0300\n"
 "Last-Translator: Lior Kaplan <webmaster at guides.co.il>\n"
 "Language-Team: Hebrew <en at li.org>\n"
@@ -110,6 +110,10 @@
 msgstr[1] "%d שגיאה מאז כניסה אחרונה למערכת. האחרונה היתה %s על %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
@@ -553,25 +557,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "שימוש: expiry {-f|-c}\n"
 
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -679,22 +690,38 @@
 msgid "%s: Not a tty\n"
 msgstr ""
 
+#, c-format
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -772,19 +799,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
@@ -1210,6 +1239,10 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr ""
 
+#, c-format
+msgid "%s: -s and -r are incompatible\n"
+msgstr ""
+
 #, fuzzy
 msgid "invalid password file entry"
 msgstr "לא יכול לנעול קובץ סיסמאות; נסה שוב מאוחר יותר"
@@ -1397,40 +1430,81 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr ""
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
 
 msgid ""

Modified: upstream/trunk/po/hu.po
===================================================================
--- upstream/trunk/po/hu.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/hu.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2007-11-25 20:56+0100\n"
 "Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
 "Language-Team: Hungarian <gnome at gnome.hu>\n"
@@ -109,6 +109,10 @@
 "A legutóbbi: %s itt: %s\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: nem kérhető le egyedi felhasználói azonosító\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: nem szerezhető be egyedi csoportazonosító\n"
 
@@ -611,65 +615,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Használat: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Használat: faillog [kapcsolók]\n"
-"\n"
-"Kapcsolók:\n"
-"  -a, --all                     az összes felhasználó faillog bejegyzésének\n"
-"                                megjelenítése\n"
-"  -h, --help                    ezen súgószöveg megjelenítése és kilépés\n"
-"  -l, --lock-time MP            a sikertelen bejelentkezés után a fiók\n"
-"                                zárolása MP másodpercre\n"
-"  -m, --maximum MAX             a sikertelen bejelentkezések számlálójának\n"
-"                                beállítása a MAX értékre\n"
-"  -r, --reset                   a bejelentkezési hibák számának "
-"visszaállítása\n"
-"  -t, --time NAPOK              az adott NAPOK számánál régebbi faillog\n"
-"                                rekordok megjelenítése\n"
-"  -u, --user NÉV                faillog rekord megjelenítése, vagy csak\n"
-"                                (ha a -r, -m vagy -l kapcsolókkal használja) "
-"a\n"
-"                                NÉV bejelentkezési nevű felhasználó számára\n"
-"                                karbantartja a hibaszámlálókat és "
-"értékeket.\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -782,35 +753,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Nem tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Használat: %s [bemenet]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Használat: groupadd [kapcsolók] CSOPORT\n"
-"\n"
-"Kapcsolók:\n"
-"  -f, --force                   kilépés kényszerítése sikeres állapottal,\n"
-"                                ha a megadott csoport már létezik\n"
-"  -g, --gid GID                 a GID használata az új csoporthoz\n"
-"  -h, --help                    kiírja e súgót és kilép\n"
-"  -K, --key KULCS=ÉRTÉK         felülbírálja az /etc/login.defs\n"
-"                                alapértelmezéseit\n"
-"  -o, --non-unique              engedélyezi a csoport létrehozását többször\n"
-"                                szereplő (nem egyedi) GID értékkel\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -894,29 +869,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Használat: groupmod [kapcsolók] CSOPORT\n"
-"\n"
-"Kapcsolók:\n"
-"  -g, --gid GID                 a GID használata az új csoporthoz\n"
-"  -h, --help                    kiírja e súgót és kilép\n"
-"  -n, --new-name Új_CSOPORT     a CSOPORTot az ÚJ_CSOPORT névre bírja\n"
-"  -o, --non-unique              engedélyezi a CSOPORT létrehozását többször\n"
-"                                szereplő (nem egyedi) GID értékkel\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "érvénytelen csoportnév: `%s'\n"
@@ -1428,6 +1395,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Használat: %s [-q] [-r] [-s] [jelszó [árnyék]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s és -r inkompatibilisek\n"
+
 msgid "invalid password file entry"
 msgstr "Érvénytelen jelszófájl bejegyzés"
 
@@ -1632,78 +1604,87 @@
 msgstr "%s: túl sok csoport van megadva (max %d).\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Használat: %s [bemenet]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Használat: useradd [kapcsolók] NÉV\n"
-"\n"
-"Kapcsolók:\n"
-"  -b, --base-dir ALAP_KVT          az új felhasználói fiók saját\n"
-"                                   könyvtárának alapkönyvtára\n"
-"  -c, --comment MEGJEGYZÉS         az új felhasználói fiók GECOS mezőjének\n"
-"                                   beállítása\n"
-"  -d, --home-dir SAJÁT_KVT         az új felhasználói fiók saját könyvtára\n"
-"  -D, --defaults                   az alapértelmezett useradd beállítások\n"
-"                                   kiírása vagy mentése\n"
-"  -e, --expiredate LEJÁRATI_DÁTUM  a fiók lejárati dátumának beállítása\n"
-"  -f, --inactive INAKTÍV           a jelszó inaktívvá tétele lejárat után\n"
-"                                   az INAKTÍV értékre\n"
-"  -g, --gid CSOPORT                a CSOPORT használatának kényszerítése\n"
-"                                   az új felhasználói fiókhoz\n"
-"  -G, --groups CSOPORTOK           kiegészítő csoportok felsorolása az új\n"
-"                                   felhasználói fiókhoz\n"
-"  -h, --help                       ezen súgószöveg megjelenítése és kilépés\n"
-"  -k, --skel VÁZ_KVT               alternatív vázkönyvtár megadása\n"
-"  -K, --key KULCS=ÉRTÉK            felülbírálja az /etc/login.defs\n"
-"                                   alapértelmezéseit\n"
-"  -m, --create-home                az új felhasználói fiók saját\n"
-"                                   könyvtárának létrehozása\n"
-"  -o, --non-unique                 engedélyezi a csoport létrehozását "
-"többször\n"
-"                                   szereplő (nem egyedi) GID értékkel\n"
-"  -p, --password JELSZÓ            titkosított jelszó használata az új\n"
-"                                   felhasználói fiókhoz\n"
-"  -s, --shell PARANCSÉRTELMEZŐ     a bejelentkezési parancsértelmező az\n"
-"                                   új felhasználói fiókhoz\n"
-"  -u, --uid UID                    az UID használatának kényszerítése az új\n"
-"                                   felhasználói fiókhoz\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2061,6 +2042,210 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: nem tudom visszaállítani %s-t: %s (módosításaid itt vannak: %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Használat: faillog [kapcsolók]\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ "  -a, --all                     az összes felhasználó faillog "
+#~ "bejegyzésének\n"
+#~ "                                megjelenítése\n"
+#~ "  -h, --help                    ezen súgószöveg megjelenítése és kilépés\n"
+#~ "  -l, --lock-time MP            a sikertelen bejelentkezés után a fiók\n"
+#~ "                                zárolása MP másodpercre\n"
+#~ "  -m, --maximum MAX             a sikertelen bejelentkezések "
+#~ "számlálójának\n"
+#~ "                                beállítása a MAX értékre\n"
+#~ "  -r, --reset                   a bejelentkezési hibák számának "
+#~ "visszaállítása\n"
+#~ "  -t, --time NAPOK              az adott NAPOK számánál régebbi faillog\n"
+#~ "                                rekordok megjelenítése\n"
+#~ "  -u, --user NÉV                faillog rekord megjelenítése, vagy csak\n"
+#~ "                                (ha a -r, -m vagy -l kapcsolókkal "
+#~ "használja) a\n"
+#~ "                                NÉV bejelentkezési nevű felhasználó "
+#~ "számára\n"
+#~ "                                karbantartja a hibaszámlálókat és "
+#~ "értékeket.\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Használat: groupadd [kapcsolók] CSOPORT\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ "  -f, --force                   kilépés kényszerítése sikeres "
+#~ "állapottal,\n"
+#~ "                                ha a megadott csoport már létezik\n"
+#~ "  -g, --gid GID                 a GID használata az új csoporthoz\n"
+#~ "  -h, --help                    kiírja e súgót és kilép\n"
+#~ "  -K, --key KULCS=ÉRTÉK         felülbírálja az /etc/login.defs\n"
+#~ "                                alapértelmezéseit\n"
+#~ "  -o, --non-unique              engedélyezi a csoport létrehozását "
+#~ "többször\n"
+#~ "                                szereplő (nem egyedi) GID értékkel\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Használat: groupmod [kapcsolók] CSOPORT\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ "  -g, --gid GID                 a GID használata az új csoporthoz\n"
+#~ "  -h, --help                    kiírja e súgót és kilép\n"
+#~ "  -n, --new-name Új_CSOPORT     a CSOPORTot az ÚJ_CSOPORT névre bírja\n"
+#~ "  -o, --non-unique              engedélyezi a CSOPORT létrehozását "
+#~ "többször\n"
+#~ "                                szereplő (nem egyedi) GID értékkel\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Használat: useradd [kapcsolók] NÉV\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ "  -b, --base-dir ALAP_KVT          az új felhasználói fiók saját\n"
+#~ "                                   könyvtárának alapkönyvtára\n"
+#~ "  -c, --comment MEGJEGYZÉS         az új felhasználói fiók GECOS "
+#~ "mezőjének\n"
+#~ "                                   beállítása\n"
+#~ "  -d, --home-dir SAJÁT_KVT         az új felhasználói fiók saját "
+#~ "könyvtára\n"
+#~ "  -D, --defaults                   az alapértelmezett useradd "
+#~ "beállítások\n"
+#~ "                                   kiírása vagy mentése\n"
+#~ "  -e, --expiredate LEJÁRATI_DÁTUM  a fiók lejárati dátumának beállítása\n"
+#~ "  -f, --inactive INAKTÍV           a jelszó inaktívvá tétele lejárat "
+#~ "után\n"
+#~ "                                   az INAKTÍV értékre\n"
+#~ "  -g, --gid CSOPORT                a CSOPORT használatának kényszerítése\n"
+#~ "                                   az új felhasználói fiókhoz\n"
+#~ "  -G, --groups CSOPORTOK           kiegészítő csoportok felsorolása az "
+#~ "új\n"
+#~ "                                   felhasználói fiókhoz\n"
+#~ "  -h, --help                       ezen súgószöveg megjelenítése és "
+#~ "kilépés\n"
+#~ "  -k, --skel VÁZ_KVT               alternatív vázkönyvtár megadása\n"
+#~ "  -K, --key KULCS=ÉRTÉK            felülbírálja az /etc/login.defs\n"
+#~ "                                   alapértelmezéseit\n"
+#~ "  -m, --create-home                az új felhasználói fiók saját\n"
+#~ "                                   könyvtárának létrehozása\n"
+#~ "  -o, --non-unique                 engedélyezi a csoport létrehozását "
+#~ "többször\n"
+#~ "                                   szereplő (nem egyedi) GID értékkel\n"
+#~ "  -p, --password JELSZÓ            titkosított jelszó használata az új\n"
+#~ "                                   felhasználói fiókhoz\n"
+#~ "  -s, --shell PARANCSÉRTELMEZŐ     a bejelentkezési parancsértelmező az\n"
+#~ "                                   új felhasználói fiókhoz\n"
+#~ "  -u, --uid UID                    az UID használatának kényszerítése az "
+#~ "új\n"
+#~ "                                   felhasználói fiókhoz\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "Jelszó lejárata beállítva."
 

Modified: upstream/trunk/po/id.po
===================================================================
--- upstream/trunk/po/id.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/id.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2007-11-25 20:58+0100\n"
 "Last-Translator: Parlin Imanuel Toh <parlin_i at yahoo.com>\n"
 "Language-Team: Debian Indonesia <debid at yahoogroups.com>\n"
@@ -109,6 +109,10 @@
 "Terakhir %s pada %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: tidak bisa mendapatkan UID yang unik\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: tak mampu mendapatkan GID yang unik\n"
 
@@ -601,62 +605,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Penggunaan: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Penggunaan: faillog [pilihan-pilihan]\n"
-"\n"
-"Pilihan-pilihan:\n"
-"  -a, --all                     tampilkan record faillog records untuk\n"
-"                                semua pengguna\n"
-"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
-"  -l, --lock-time DTK           setelah kegagalan login blok akun selama\n"
-"                                DTK detik\n"
-"  -m, --maximum MAX             atur penghitung kegagalan login maksimum\n"
-"                                pada MAX\n"
-"  -r, --reset                   reset penghitung kegagalan login\n"
-"  -t, --time HARI               tampilkan record faillog yang lebih baru\n"
-"                                dari HARI\n"
-"  -u, --user NAMA               tampilkan record faillog atau atur\n"
-"                                penghitung kegagalan dan batasnya (bila\n"
-"                                digunakan dengan -r, -m atau -l) hanya\n"
-"                                untuk pengguna dengan nama NAMA\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -769,34 +743,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Bukan sebuah tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Penggunaan: %s [input]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Usage: groupadd [pilihan-pilihan] namagroup\n"
-"\n"
-"Pilihan-pilihan:\n"
-"  -f, --force                   paksa status sukses saat keluar bila grup\n"
-"                                telah ada\n"
-"  -g, --gid GID                 gunakan GID untuk grup yang baru ini\n"
-"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
-"  -K, --key KEY=VALUE           ganti nilai bawaan pada /etc/login.defs\n"
-"  -o, --non-unique              perbolehkan pembuatan grup dengan GID\n"
-"                                terduplikasi (tak-unik)\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -878,31 +857,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Usage: groupadd [pilihan-pilihan] namagroup\n"
-"\n"
-"Pilihan-pilihan:\n"
-"  -f, --force                   paksa status sukses saat keluar bila grup\n"
-"                                telah ada\n"
-"  -g, --gid GID                 gunakan GID untuk grup yang baru ini\n"
-"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
-"  -K, --key KEY=VALUE           ganti nilai bawaan pada /etc/login.defs\n"
-"  -o, --non-unique              perbolehkan pembuatan grup dengan GID\n"
-"                                terduplikasi (tak-unik)\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "nama grup `%s' tidak sah\n"
@@ -1387,6 +1356,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Penggunaan: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s dan -r tidak kompatible\n"
+
 msgid "invalid password file entry"
 msgstr "entri kata sandi tak sah"
 
@@ -1592,72 +1566,87 @@
 msgstr "%s: grup yang diberikan terlalu banyak (maks %d).\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Penggunaan: %s [input]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Penggunaan: useradd [pilihan-pilihan] NAMA-LOGIN\n"
-"\n"
-"Options:\n"
-"  -b, --base-dir BASE_DIR       direktori awal untuk direktori rumah dari\n"
-"                                pengguna baru\n"
-"  -c, --comment KOMENTAR        atur ruas GECOS untuk pengguna baru\n"
-"  -d, --home-dir DIR_RUMAH      direktori rumah untuk pengguna baru\n"
-"  -D, --defaults                cetak atau simpan konfigurasi bawaan "
-"useradd\n"
-"  -e, --expiredate KADALUARSA   atur tanggal kadaluarsa pada KADALUARSA\n"
-"  -f, --inactive INAKTIF        atur masa inaktif kata sandi setelah\n"
-"                                kadaluarsa menjadi INAKTIF\n"
-"  -g, --gid GRUP                paksakan grup GRUP untuk pengguna baru\n"
-"  -G, --groups GRUP-GRUP        daftar grup-grup tambahan untuk\n"
-"                                pengguna baru\n"
-"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
-"  -k, --skel SKEL_DIR           berikan direktori skel alternatif\n"
-"  -K, --key KEY=VALUE           ganti nilai-nilai bawaan pada /etc/login."
-"defs\n"
-"  -m, --create-home             buat direktori rumah untuk pengguna baru\n"
-"  -o, --non-unique              perbolehkan pembuatan pengguna dengan\n"
-"                                UID terduplikasi (tak-unik)\n"
-"  -p, --password PASSWORD       gunakan kata sandi terenkripsi untuk\n"
-"                                pengguna baru\n"
-"  -s, --shell SHELL             shell login untuk pengguna baru\n"
-"  -u, --uid UID                 paksakan uid UID untuk pengguna baru\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -1987,6 +1976,192 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: tidak dapat mengembalikan %s: %s (perubahan ada dalam %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Penggunaan: faillog [pilihan-pilihan]\n"
+#~ "\n"
+#~ "Pilihan-pilihan:\n"
+#~ "  -a, --all                     tampilkan record faillog records untuk\n"
+#~ "                                semua pengguna\n"
+#~ "  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+#~ "  -l, --lock-time DTK           setelah kegagalan login blok akun selama\n"
+#~ "                                DTK detik\n"
+#~ "  -m, --maximum MAX             atur penghitung kegagalan login maksimum\n"
+#~ "                                pada MAX\n"
+#~ "  -r, --reset                   reset penghitung kegagalan login\n"
+#~ "  -t, --time HARI               tampilkan record faillog yang lebih baru\n"
+#~ "                                dari HARI\n"
+#~ "  -u, --user NAMA               tampilkan record faillog atau atur\n"
+#~ "                                penghitung kegagalan dan batasnya (bila\n"
+#~ "                                digunakan dengan -r, -m atau -l) hanya\n"
+#~ "                                untuk pengguna dengan nama NAMA\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Usage: groupadd [pilihan-pilihan] namagroup\n"
+#~ "\n"
+#~ "Pilihan-pilihan:\n"
+#~ "  -f, --force                   paksa status sukses saat keluar bila "
+#~ "grup\n"
+#~ "                                telah ada\n"
+#~ "  -g, --gid GID                 gunakan GID untuk grup yang baru ini\n"
+#~ "  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+#~ "  -K, --key KEY=VALUE           ganti nilai bawaan pada /etc/login.defs\n"
+#~ "  -o, --non-unique              perbolehkan pembuatan grup dengan GID\n"
+#~ "                                terduplikasi (tak-unik)\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Usage: groupadd [pilihan-pilihan] namagroup\n"
+#~ "\n"
+#~ "Pilihan-pilihan:\n"
+#~ "  -f, --force                   paksa status sukses saat keluar bila "
+#~ "grup\n"
+#~ "                                telah ada\n"
+#~ "  -g, --gid GID                 gunakan GID untuk grup yang baru ini\n"
+#~ "  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+#~ "  -K, --key KEY=VALUE           ganti nilai bawaan pada /etc/login.defs\n"
+#~ "  -o, --non-unique              perbolehkan pembuatan grup dengan GID\n"
+#~ "                                terduplikasi (tak-unik)\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Penggunaan: useradd [pilihan-pilihan] NAMA-LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       direktori awal untuk direktori rumah "
+#~ "dari\n"
+#~ "                                pengguna baru\n"
+#~ "  -c, --comment KOMENTAR        atur ruas GECOS untuk pengguna baru\n"
+#~ "  -d, --home-dir DIR_RUMAH      direktori rumah untuk pengguna baru\n"
+#~ "  -D, --defaults                cetak atau simpan konfigurasi bawaan "
+#~ "useradd\n"
+#~ "  -e, --expiredate KADALUARSA   atur tanggal kadaluarsa pada KADALUARSA\n"
+#~ "  -f, --inactive INAKTIF        atur masa inaktif kata sandi setelah\n"
+#~ "                                kadaluarsa menjadi INAKTIF\n"
+#~ "  -g, --gid GRUP                paksakan grup GRUP untuk pengguna baru\n"
+#~ "  -G, --groups GRUP-GRUP        daftar grup-grup tambahan untuk\n"
+#~ "                                pengguna baru\n"
+#~ "  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+#~ "  -k, --skel SKEL_DIR           berikan direktori skel alternatif\n"
+#~ "  -K, --key KEY=VALUE           ganti nilai-nilai bawaan pada /etc/login."
+#~ "defs\n"
+#~ "  -m, --create-home             buat direktori rumah untuk pengguna baru\n"
+#~ "  -o, --non-unique              perbolehkan pembuatan pengguna dengan\n"
+#~ "                                UID terduplikasi (tak-unik)\n"
+#~ "  -p, --password PASSWORD       gunakan kata sandi terenkripsi untuk\n"
+#~ "                                pengguna baru\n"
+#~ "  -s, --shell SHELL             shell login untuk pengguna baru\n"
+#~ "  -u, --uid UID                 paksakan uid UID untuk pengguna baru\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "Kata sandi dibuat kadaluarsa."
 

Modified: upstream/trunk/po/it.po
===================================================================
--- upstream/trunk/po/it.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/it.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -25,7 +25,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2008-03-27 14:40+0100\n"
 "Last-Translator: Danilo Piazzalunga <danilopiazza at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -135,6 +135,11 @@
 "L'ultimo è stato %s su %s.\n"
 
 #, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "Impossibile ottenere un UID univoco (nessun UID disponibile)\n"
+
+#, fuzzy, c-format
 #| msgid "Can't get unique GID (no more available GIDs)\n"
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "Impossibile ottenere un GID univoco (nessun GID disponibile)\n"
@@ -654,62 +659,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Uso: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Uso: faillog [OPZIONI]\n"
-"\n"
-"Opzioni:\n"
-"  -a, --all                     mostra i record degli accessi falliti per\n"
-"                                tutti gli utenti\n"
-"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
-"  -l, --lock-time SEC           blocca l'account per SEC secondi dopo un\n"
-"                                tentativo di accesso fallito\n"
-"  -m, --maximum MAX             imposta a MAX il numero massimo di\n"
-"                                tentativi di accesso falliti\n"
-"  -r, --reset                   azzera i conteggi degli accessi falliti\n"
-"  -t, --time GIORNI             mostra i record degli accessi falliti più\n"
-"                                recenti di un numero di GIORNI\n"
-"  -u, --user LOGIN              mostra il record degli accessi falliti o,\n"
-"                                se sono state usate con le opzioni -r, -m\n"
-"                                o -l, imposta conteggi e limiti solo per\n"
-"                                l'utente specificato da LOGIN\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -829,36 +804,50 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: non è un terminale\n"
 
+#, c-format
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Uso: groupadd [OPZIONI] GRUPPO\n"
-"\n"
-"Opzioni:\n"
-"  -f, --force                   termina con successo anche se il gruppo\n"
-"                                specificato esiste già\n"
-"  -g, --gid GID                 usa GID per il nuovo gruppo\n"
-"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
-"  -K, --key CHIAVE=VALORE       specifica un valore diverso da quello\n"
-"                                predefinito in /etc/login.defs\n"
-"  -o, --non-unique              permette di creare un gruppo con un GID\n"
-"                                duplicato (non univoco)\n"
-"  -p, --password PASSWORD       imposta la nuova PASSWORD cifrata\n"
-"  -r, --system                  crea un account di sistema\n"
-"\n"
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -946,30 +935,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Uso: groupmod [OPZIONI] GRUPPO\n"
-"\n"
-"Opzioni:\n"
-"  -g, --gid GID                 impone l'uso di GID per il GRUPPO\n"
-"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
-"  -n, --new-name NUOVO_GRUPPO   impone l'uso del nome NUOVO_GRUPPO per il\n"
-"                                GRUPPO\n"
-"  -o, --non-unique              permette di che il GRUPPO usi un GID\n"
-"                                duplicato (non univoco)\n"
-"  -p, --password PASSWORD       imposta la nuova PASSWORD cifrata\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: invalid group name `%s'\n"
 msgid "%s: invalid group name '%s'\n"
@@ -1498,6 +1478,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Uso: %s [-q] [-r] [-s] [PASSWD [SHADOW]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s e -r sono incompatibili\n"
+
 msgid "invalid password file entry"
 msgstr "voce non valida nel file delle password"
 
@@ -1700,121 +1685,123 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: troppi gruppi specificati (max %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: useradd [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-#| "                                home directory\n"
-#| "  -c, --comment COMMENT         set the GECOS field for the new user "
-#| "account\n"
-#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-#| "  -D, --defaults                print or save modified default useradd\n"
-#| "                                configuration\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
-#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
-#| "                                user account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-#| "  -l,                           do not add the user to the lastlog and\n"
-#| "                                faillog databases\n"
-#| "  -m, --create-home             create home directory for the new user\n"
-#| "                                account\n"
-#| "  -N, --no-user-group           do not create a group with the same name "
-#| "as\n"
-#| "                                the user\n"
-#| "  -o, --non-unique              allow create user with duplicate\n"
-#| "                                (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
-#| "                                account\n"
-#| "  -r, --system                  create a system account\n"
-#| "  -s, --shell SHELL             the login shell for the new user account\n"
-#| "  -u, --uid UID                 force use the UID for the new user "
-#| "account\n"
-#| "  -U, --user-group              create a group with the same name as the "
-#| "user\n"
-#| "\n"
+#, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+"  -s, --sha-rounds              il numero di passaggi SHA per gli\n"
+"                                algoritmi di cifratura SHA*\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Uso: useradd [OPZIONI] LOGIN\n"
-"\n"
-"Opzioni:\n"
-"  -b, --base-dir DIR_BASE       specifica la directory di base in cui "
-"creare\n"
-"                                la directory home per il nuovo account\n"
-"  -c, --comment COMMENTO        imposta il campo GECOS per il nuovo account\n"
-"  -d, --home-dir DIR_HOME       specifica la directory home per il nuovo\n"
-"                                account\n"
-"  -D, --defaults                mostra o imposta i valori predefiniti della\n"
-"                                configurazione di useradd\n"
-"  -e, --expiredate SCADENZA     imposta la data di SCADENZA dell'account\n"
-"  -f, --inactive INATTIVITÀ     imposta il numero di giorni di INATTIVITÀ\n"
-"                                della password oltre la sua scadenza\n"
-"  -g, --gid GRUPPO              impone l'uso di GRUPPO per il nuovo account\n"
-"  -G, --groups GRUPPI           elenco di GRUPPI aggiuntivi per il nuovo\n"
-"                                account\n"
-"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
-"  -k, --skel DIR_SKEL           specifica una directory skel alternativa\n"
-"  -K, --key CHIAVE=VALORE       specifica un valore diverso da quello\n"
-"                                predefinito in /etc/login.defs\n"
-"  -l                            non aggiunge l'utente ai database lastlog e\n"
-"                                faillog\n"
-"  -m, --create-home             crea la directory home per il nuovo account\n"
-"  -N, --no-user-group           non crea un gruppo con lo stesso nome\n"
-"                                dell'utente\n"
-"  -o, --non-unique              permette di creare un utente con un UID\n"
-"                                duplicato (non univoco)\n"
-"  -p, --password PASSWORD       usa la PASSWORD cifrata per il nuovo "
-"account\n"
-"  -r, --system                  crea un account di sistema\n"
-"  -s, --shell SHELL             la shell di login per il nuovo account\n"
-"  -u, --uid UID                 impone l'uso di UID per il nuovo account\n"
-"  -U, --user-group              crea un gruppo con lo stesso nome\n"
-"                                dell'utente\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2208,7 +2195,253 @@
 msgstr ""
 "%s: impossibile ripristinare %s: %s (le modifiche effettuate sono in %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: faillog [OPZIONI]\n"
+#~ "\n"
+#~ "Opzioni:\n"
+#~ "  -a, --all                     mostra i record degli accessi falliti "
+#~ "per\n"
+#~ "                                tutti gli utenti\n"
+#~ "  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+#~ "  -l, --lock-time SEC           blocca l'account per SEC secondi dopo un\n"
+#~ "                                tentativo di accesso fallito\n"
+#~ "  -m, --maximum MAX             imposta a MAX il numero massimo di\n"
+#~ "                                tentativi di accesso falliti\n"
+#~ "  -r, --reset                   azzera i conteggi degli accessi falliti\n"
+#~ "  -t, --time GIORNI             mostra i record degli accessi falliti "
+#~ "più\n"
+#~ "                                recenti di un numero di GIORNI\n"
+#~ "  -u, --user LOGIN              mostra il record degli accessi falliti "
+#~ "o,\n"
+#~ "                                se sono state usate con le opzioni -r, -"
+#~ "m\n"
+#~ "                                o -l, imposta conteggi e limiti solo per\n"
+#~ "                                l'utente specificato da LOGIN\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: groupadd [OPZIONI] GRUPPO\n"
+#~ "\n"
+#~ "Opzioni:\n"
+#~ "  -f, --force                   termina con successo anche se il gruppo\n"
+#~ "                                specificato esiste già\n"
+#~ "  -g, --gid GID                 usa GID per il nuovo gruppo\n"
+#~ "  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+#~ "  -K, --key CHIAVE=VALORE       specifica un valore diverso da quello\n"
+#~ "                                predefinito in /etc/login.defs\n"
+#~ "  -o, --non-unique              permette di creare un gruppo con un GID\n"
+#~ "                                duplicato (non univoco)\n"
+#~ "  -p, --password PASSWORD       imposta la nuova PASSWORD cifrata\n"
+#~ "  -r, --system                  crea un account di sistema\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: groupmod [OPZIONI] GRUPPO\n"
+#~ "\n"
+#~ "Opzioni:\n"
+#~ "  -g, --gid GID                 impone l'uso di GID per il GRUPPO\n"
+#~ "  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+#~ "  -n, --new-name NUOVO_GRUPPO   impone l'uso del nome NUOVO_GRUPPO per "
+#~ "il\n"
+#~ "                                GRUPPO\n"
+#~ "  -o, --non-unique              permette di che il GRUPPO usi un GID\n"
+#~ "                                duplicato (non univoco)\n"
+#~ "  -p, --password PASSWORD       imposta la nuova PASSWORD cifrata\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Usage: useradd [options] LOGIN\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~| "                                home directory\n"
+#~| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~| "account\n"
+#~| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~| "  -D, --defaults                print or save modified default useradd\n"
+#~| "                                configuration\n"
+#~| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -g, --gid GROUP               force use GROUP for the new user "
+#~| "account\n"
+#~| "  -G, --groups GROUPS           list of supplementary groups for the "
+#~| "new\n"
+#~| "                                user account\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~| "  -l,                           do not add the user to the lastlog and\n"
+#~| "                                faillog databases\n"
+#~| "  -m, --create-home             create home directory for the new user\n"
+#~| "                                account\n"
+#~| "  -N, --no-user-group           do not create a group with the same name "
+#~| "as\n"
+#~| "                                the user\n"
+#~| "  -o, --non-unique              allow create user with duplicate\n"
+#~| "                                (non-unique) UID\n"
+#~| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~| "                                account\n"
+#~| "  -r, --system                  create a system account\n"
+#~| "  -s, --shell SHELL             the login shell for the new user "
+#~| "account\n"
+#~| "  -u, --uid UID                 force use the UID for the new user "
+#~| "account\n"
+#~| "  -U, --user-group              create a group with the same name as the "
+#~| "user\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Uso: useradd [OPZIONI] LOGIN\n"
+#~ "\n"
+#~ "Opzioni:\n"
+#~ "  -b, --base-dir DIR_BASE       specifica la directory di base in cui "
+#~ "creare\n"
+#~ "                                la directory home per il nuovo account\n"
+#~ "  -c, --comment COMMENTO        imposta il campo GECOS per il nuovo "
+#~ "account\n"
+#~ "  -d, --home-dir DIR_HOME       specifica la directory home per il nuovo\n"
+#~ "                                account\n"
+#~ "  -D, --defaults                mostra o imposta i valori predefiniti "
+#~ "della\n"
+#~ "                                configurazione di useradd\n"
+#~ "  -e, --expiredate SCADENZA     imposta la data di SCADENZA dell'account\n"
+#~ "  -f, --inactive INATTIVITÀ     imposta il numero di giorni di "
+#~ "INATTIVITÀ\n"
+#~ "                                della password oltre la sua scadenza\n"
+#~ "  -g, --gid GRUPPO              impone l'uso di GRUPPO per il nuovo "
+#~ "account\n"
+#~ "  -G, --groups GRUPPI           elenco di GRUPPI aggiuntivi per il nuovo\n"
+#~ "                                account\n"
+#~ "  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+#~ "  -k, --skel DIR_SKEL           specifica una directory skel alternativa\n"
+#~ "  -K, --key CHIAVE=VALORE       specifica un valore diverso da quello\n"
+#~ "                                predefinito in /etc/login.defs\n"
+#~ "  -l                            non aggiunge l'utente ai database lastlog "
+#~ "e\n"
+#~ "                                faillog\n"
+#~ "  -m, --create-home             crea la directory home per il nuovo "
+#~ "account\n"
+#~ "  -N, --no-user-group           non crea un gruppo con lo stesso nome\n"
+#~ "                                dell'utente\n"
+#~ "  -o, --non-unique              permette di creare un utente con un UID\n"
+#~ "                                duplicato (non univoco)\n"
+#~ "  -p, --password PASSWORD       usa la PASSWORD cifrata per il nuovo "
+#~ "account\n"
+#~ "  -r, --system                  crea un account di sistema\n"
+#~ "  -s, --shell SHELL             la shell di login per il nuovo account\n"
+#~ "  -u, --uid UID                 impone l'uso di UID per il nuovo account\n"
+#~ "  -U, --user-group              crea un gruppo con lo stesso nome\n"
+#~ "                                dell'utente\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/ja.po
===================================================================
--- upstream/trunk/po/ja.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/ja.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2009-05-10 15:58+0900\n"
 "Last-Translator: NAKANO Takeo <nakano at webmasters.gr.jp>\n"
 "Language-Team: Japanese\n"
@@ -109,6 +109,13 @@
 "最後のログインから %d 回失敗。\n"
 "最後のログインは %s (マシン %s)。\n"
 
+#, fuzzy, c-format
+#| msgid "%s: Can't get unique system UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr ""
+"%s: 他と重ならないシステム UID を取得できません (利用できる UID がありませ"
+"ん)\n"
+
 #, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr ""
@@ -587,39 +594,38 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "使い方: expiry {-f|-c}\n"
 
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+"  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
+"                                ユーザマッピング\n"
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"使い方: faillog [オプション]\n"
-"\n"
-"オプション:\n"
-"  -a, --all                     全ユーザの faillog 記録を表示する\n"
-"  -h, --help                    このヘルプメッセージを表示して終了する\n"
-"  -l, --lock-time SEC           ログイン失敗後 SEC 秒アカウントをロックする\n"
-"  -m, --maximum MAX             ログインの失敗が許される回数を MAX にする\n"
-"  -r, --reset                   ログイン失敗のカウンタをリセットする\n"
-"  -t, --time DAYS               最近 DAYS 日分の faillog 記録を表示する\n"
-"  -u, --user LOGIN              ユーザ LOGIN の faillog 記録を表示する。\n"
-"                                あるいは -r, -m, -l が同時に指定された場合"
-"は\n"
-"                                このユーザのみの失敗カウンタに制限を加える\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
@@ -747,37 +753,60 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: 端末ではありません\n"
 
+#, c-format
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+"  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
+"                                ユーザマッピング\n"
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"使い方: groupadd [オプション] GROUP\n"
-"\n"
-"オプション:\n"
-"  -f, --force                   指定グループが存在していた場合、終了ステータ"
-"ス\n"
-"                                success で強制的に終了する\n"
-"  -g, --gid GID                 新グループの GID\n"
-"  -h, --help                    このヘルプメッセージを表示して終了する\n"
-"  -K, --key KEY=VALUE           /etc/login.defs のデフォルトを変更する\n"
-"  -o, --non-unique              一意でないグループ (GID の重なるグループ) "
-"の\n"
-"                                作成を許可する\n"
-"  -p, --password PASSWORD       新規グループにこの暗号化パスワードを用いる\n"
-"  -r, --system                  システムアカウントを作成する\n"
-"\n"
+"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+"  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
+"                                ユーザマッピング\n"
+
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: '%s' はグループ名として正しくありません\n"
@@ -866,31 +895,27 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr "%s: -g/--group オプションは root のみが指定できます\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+"  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
+"                                ユーザマッピング\n"
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"使い方: groupmod [オプション] GROUP\n"
-"\n"
-"オプション:\n"
-"  -g, --gid GID                 GROUP の新 GID を設定する\n"
-"  -h, --help                    このヘルプメッセージを表示して終了する\n"
-"  -n, --new-name NEW_GROUP      GROUP の新グループ名を設定する\n"
-"  -o, --non-unique              一意でないグループ (GID の重なるグループ) "
-"の\n"
-"                                使用を GROUP に許可する\n"
-"  -p, --password PASSWORD       暗号化済みパスワードを新しいパスワードに用い"
-"る\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s '%s' はグループ名として正しくありません\n"
@@ -1374,6 +1399,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "使い方: %s [-q] [-r] [-s] [パスワード [シャドウ]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s と -r は同時に指定できません\n"
+
 msgid "invalid password file entry"
 msgstr "パスワードファイルのエントリが不正です"
 
@@ -1569,75 +1599,130 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+"  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
+"                                ユーザマッピング\n"
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+"  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
+"                                ユーザマッピング\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+"  -Z, --selinux-user            このユーザアカウントへの新規 SELinux\n"
+"                                ユーザマッピング\n"
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"使い方: useradd [オプション] ログイン名\n"
-"\n"
-"オプション:\n"
-"  -b, --base-dir BASE_DIR       新ユーザアカウントのホームディレクトリの\n"
-"                                ベースディレクトリを指定する\n"
-"  -c, --comment COMMENT         新ユーザアカウントの GECOS フィールド\n"
-"  -d, --home-dir HOME_DIR       新ユーザアカウントのホームディレクトリ\n"
-"  -D, --defaults                変更された useradd のデフォルト設定を\n"
-"                                保存または表示する\n"
-"  -e, --expiredate EXPIRE_DATE  アカウント期限切れの日を EXPIRE_DATE にする\n"
-"  -f, --inactive INACTIVE       パスワードを期限切れ後に無効化する日数を\n"
-"                                INACTIVEにする\n"
-"  -g, --gid GROUP               新ユーザアカウントのグループを GROUP にする\n"
-"  -G, --groups GROUPS           新ユーザアカウントの補助グループの\n"
-"                                リストを与える\n"
-"  -h, --help                    このヘルプを表示して終了する\n"
-"  -k, --skel SKEL_DIR           skel ディレクトリを指定する\n"
-"  -K, --key KEY=VALUE           /etc/login.defs のデフォルトを変更する\n"
-"  -l, --no-log-init             このユーザを lastlog・faillog のデータ\n"
-"                                ベースに追加しない。\n"
-"  -m, --create-home             新ユーザアカウントのホームディレクトリを\n"
-"                                作成する\n"
-"  -M, --no-create-home          ユ−ザのホームディレクトリを作成しない\n"
-"                                (/etc/login.defs より優先される)\n"
-"  -N, --no-user-group           ユーザと同名のグループを作成しない\n"
-"  -o, --non-unique              一意でないユーザ (UID の重なるユーザ) の\n"
-"                                作成を許可する\n"
-"  -p, --password PASSWORD       新ユーザアカウントの暗号化済みパスワードを\n"
-"                                与える\n"
-"  -r, --system                  システムアカウントを作成する\n"
-"  -s, --shell SHELL             新ユーザアカウントのログインシェル\n"
-"  -u, --uid UID                 新ユーザアカウントのユーザ ID を指定する\n"
-"  -U, --user-group              ユーザと同名のグループを作成する\n"
-"%s\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -1984,6 +2069,181 @@
 msgstr "%s: %s を復旧できませんでした: %s (あなたの変更は %s にあります)\n"
 
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "使い方: faillog [オプション]\n"
+#~ "\n"
+#~ "オプション:\n"
+#~ "  -a, --all                     全ユーザの faillog 記録を表示する\n"
+#~ "  -h, --help                    このヘルプメッセージを表示して終了する\n"
+#~ "  -l, --lock-time SEC           ログイン失敗後 SEC 秒アカウントをロックす"
+#~ "る\n"
+#~ "  -m, --maximum MAX             ログインの失敗が許される回数を MAX にす"
+#~ "る\n"
+#~ "  -r, --reset                   ログイン失敗のカウンタをリセットする\n"
+#~ "  -t, --time DAYS               最近 DAYS 日分の faillog 記録を表示する\n"
+#~ "  -u, --user LOGIN              ユーザ LOGIN の faillog 記録を表示する。\n"
+#~ "                                あるいは -r, -m, -l が同時に指定された場合"
+#~ "は\n"
+#~ "                                このユーザのみの失敗カウンタに制限を加え"
+#~ "る\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "使い方: groupadd [オプション] GROUP\n"
+#~ "\n"
+#~ "オプション:\n"
+#~ "  -f, --force                   指定グループが存在していた場合、終了ステー"
+#~ "タス\n"
+#~ "                                success で強制的に終了する\n"
+#~ "  -g, --gid GID                 新グループの GID\n"
+#~ "  -h, --help                    このヘルプメッセージを表示して終了する\n"
+#~ "  -K, --key KEY=VALUE           /etc/login.defs のデフォルトを変更する\n"
+#~ "  -o, --non-unique              一意でないグループ (GID の重なるグループ) "
+#~ "の\n"
+#~ "                                作成を許可する\n"
+#~ "  -p, --password PASSWORD       新規グループにこの暗号化パスワードを用い"
+#~ "る\n"
+#~ "  -r, --system                  システムアカウントを作成する\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "使い方: groupmod [オプション] GROUP\n"
+#~ "\n"
+#~ "オプション:\n"
+#~ "  -g, --gid GID                 GROUP の新 GID を設定する\n"
+#~ "  -h, --help                    このヘルプメッセージを表示して終了する\n"
+#~ "  -n, --new-name NEW_GROUP      GROUP の新グループ名を設定する\n"
+#~ "  -o, --non-unique              一意でないグループ (GID の重なるグループ) "
+#~ "の\n"
+#~ "                                使用を GROUP に許可する\n"
+#~ "  -p, --password PASSWORD       暗号化済みパスワードを新しいパスワードに用"
+#~ "いる\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "使い方: useradd [オプション] ログイン名\n"
+#~ "\n"
+#~ "オプション:\n"
+#~ "  -b, --base-dir BASE_DIR       新ユーザアカウントのホームディレクトリの\n"
+#~ "                                ベースディレクトリを指定する\n"
+#~ "  -c, --comment COMMENT         新ユーザアカウントの GECOS フィールド\n"
+#~ "  -d, --home-dir HOME_DIR       新ユーザアカウントのホームディレクトリ\n"
+#~ "  -D, --defaults                変更された useradd のデフォルト設定を\n"
+#~ "                                保存または表示する\n"
+#~ "  -e, --expiredate EXPIRE_DATE  アカウント期限切れの日を EXPIRE_DATE にす"
+#~ "る\n"
+#~ "  -f, --inactive INACTIVE       パスワードを期限切れ後に無効化する日数を\n"
+#~ "                                INACTIVEにする\n"
+#~ "  -g, --gid GROUP               新ユーザアカウントのグループを GROUP にす"
+#~ "る\n"
+#~ "  -G, --groups GROUPS           新ユーザアカウントの補助グループの\n"
+#~ "                                リストを与える\n"
+#~ "  -h, --help                    このヘルプを表示して終了する\n"
+#~ "  -k, --skel SKEL_DIR           skel ディレクトリを指定する\n"
+#~ "  -K, --key KEY=VALUE           /etc/login.defs のデフォルトを変更する\n"
+#~ "  -l, --no-log-init             このユーザを lastlog・faillog のデータ\n"
+#~ "                                ベースに追加しない。\n"
+#~ "  -m, --create-home             新ユーザアカウントのホームディレクトリを\n"
+#~ "                                作成する\n"
+#~ "  -M, --no-create-home          ユ−ザのホームディレクトリを作成しない\n"
+#~ "                                (/etc/login.defs より優先される)\n"
+#~ "  -N, --no-user-group           ユーザと同名のグループを作成しない\n"
+#~ "  -o, --non-unique              一意でないユーザ (UID の重なるユーザ) の\n"
+#~ "                                作成を許可する\n"
+#~ "  -p, --password PASSWORD       新ユーザアカウントの暗号化済みパスワード"
+#~ "を\n"
+#~ "                                与える\n"
+#~ "  -r, --system                  システムアカウントを作成する\n"
+#~ "  -s, --shell SHELL             新ユーザアカウントのログインシェル\n"
+#~ "  -u, --uid UID                 新ユーザアカウントのユーザ ID を指定する\n"
+#~ "  -U, --user-group              ユーザと同名のグループを作成する\n"
+#~ "%s\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/kk.po
===================================================================
--- upstream/trunk/po/kk.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/kk.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadowutils\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2009-03-02 13:55+0600\n"
 "Last-Translator: Baurzhan M. <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
@@ -112,6 +112,11 @@
 "Соңғысы %s болған, терминал %s.\n"
 
 #, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "Ерекше UID алу мүмкін емес (бос UID-тар қалмады)\n"
+
+#, fuzzy, c-format
 #| msgid "Can't get unique GID (no more available GIDs)\n"
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "Ерекше GID алу мүмкін емес (бос GID-тар қалмады)\n"
@@ -634,64 +639,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Қолданылуы: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Қолданылуы: faillog [опциялар]\n"
-"\n"
-"Опциялары:\n"
-"  -a, --all                     барлық пайдаланушылар үшін faillog "
-"жазбаларын көрсету\n"
-"  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -l, --lock-time SEC           сәтсіз талаптан кейін тіркелгіні SEC "
-"секундқа оқшаулау\n"
-"  -m, --maximum MAX             максимум сәтсіз жүйеге кіру талап шегін MAX "
-"мәніне орнату\n"
-"  -r, --reset                   сәтсіз жүйеге кіру талаптары жазбаларын "
-"өшіру\n"
-"  -t, --time DAYS               DAYS күнге дейінгі faillog жазбаларын "
-"көрсету\n"
-"  -u, --user ПАЙДАЛАНУШЫ              көрсетілген ПАЙДАЛАНУШЫ ушін faillog "
-"жазбаларын\n"
-"                                көрсету немесе шектеу (-r, -m не -l бірге "
-"қолдану керек)\n"
-"                                мәндерін баптау\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -807,36 +780,50 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Терминал емес\n"
 
+#, c-format
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
+"                                раундтар саны\n"
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Қолданылуы: groupadd [опциялар] ТОП\n"
-"\n"
-"Опциялары:\n"
-"  -f, --force                   көрсетілген топ бар болса да сәтті нәтижені\n"
-"                                қайтаруды мәжбүрлету\n"
-"  -g, --gid GID                 жаңа топ үшін GID қолдану\n"
-"  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -K, --key KEY=МӘН           /etc/login.defs ішіндегісін елемеу(одан "
-"басыңқы болу)\n"
-"  -o, --non-unique              қайталанатын GID бар топтарды құруға рұқсат "
-"беру\n"
-"  -p, --password PASSWORD       жаңа топ үшін шифрленген парольді қолдану\n"
-"  -r, --system                  жүйелік тіркелгіні жасау\n"
-"\n"
+"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
+"                                раундтар саны\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -925,31 +912,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Қолданылуы: groupmod [опциялар] ТОП\n"
-"\n"
-"Опциялары:\n"
-"  -g, --gid GID                 ТОП үшін жаңа GID қолдануды мәжбүрлету\n"
-"  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -n, --new-name NEW_GROUP      ТОП үшін жаңа ТОП_АТЫ атын қолдануды "
-"мәжбүрлету\n"
-"  -o, --non-unique              ТОП үшін қайталанатын (ерекше емес) GID "
-"қолдануға рұқсат беру\n"
-"  -p, --password PASSWORD       жаңа пароль ретінде шифрленген парольді "
-"қолдану\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: invalid group name `%s'\n"
 msgid "%s: invalid group name '%s'\n"
@@ -1477,6 +1454,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Қолданылуы: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s пен -r өзара үйлеспейді\n"
+
 msgid "invalid password file entry"
 msgstr "парольдер файлының қате жазбасы"
 
@@ -1681,122 +1663,123 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: шектен көп топ саны көрсетілген (максимум %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: useradd [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-#| "                                home directory\n"
-#| "  -c, --comment COMMENT         set the GECOS field for the new user "
-#| "account\n"
-#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-#| "  -D, --defaults                print or save modified default useradd\n"
-#| "                                configuration\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
-#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
-#| "                                user account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-#| "  -l,                           do not add the user to the lastlog and\n"
-#| "                                faillog databases\n"
-#| "  -m, --create-home             create home directory for the new user\n"
-#| "                                account\n"
-#| "  -N, --no-user-group           do not create a group with the same name "
-#| "as\n"
-#| "                                the user\n"
-#| "  -o, --non-unique              allow create user with duplicate\n"
-#| "                                (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
-#| "                                account\n"
-#| "  -r, --system                  create a system account\n"
-#| "  -s, --shell SHELL             the login shell for the new user account\n"
-#| "  -u, --uid UID                 force use the UID for the new user "
-#| "account\n"
-#| "  -U, --user-group              create a group with the same name as the "
-#| "user\n"
-#| "\n"
+#, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
+"                                раундтар саны\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
+"                                раундтар саны\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
+"                                раундтар саны\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
+"                                раундтар саны\n"
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
+"                                раундтар саны\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
+"                                раундтар саны\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Қолданылуы: useradd [опциялар] ТІРКЕЛГІ\n"
-"\n"
-"Опциялары:\n"
-"  -b, --base-dir BASE_DIR       жаңа пайдаланушы тіркелгісінің үй бумасы\n"
-"                                үшін базалық бума\n"
-"  -c, --comment COMMENT         жаңа пайдаланушы тіркелгісі үшін GECOS мәнін "
-"орнату\n"
-"  -d, --home-dir HOME_DIR       жаңа пайдаланушы тіркелгісі үшін үй бумасы\n"
-"  -D, --defaults                өзгертілген бастапқы useradd баптауларын\n"
-"                                шығару немесе сақтау\n"
-"  -e, --expiredate EXPIRE_DATE  тіркелгі мерзімі аяқталуын EXPIRE_DATE "
-"күніне орнату\n"
-"  -f, --inactive INACTIVE       мерзімі аяқталған соң тіркелгі сөндірілу "
-"үшін өту керек\n"
-"                                күн санын INACTIVE мәніне орнату\n"
-"  -g, --gid GROUP               жаңа пайдаланушы тіркелгісі үшін GROUP "
-"қолдануды мәжбүрлету\n"
-"  -G, --groups GROUPS           жаңа пайдаланушы тіркелгісі үшін қосымша\n"
-"                                топтар тізімін шығару\n"
-"  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -k, --skel SKEL_DIR           басақ skel бумасын қолдану\n"
-"  -K, --key KEY=VALUE           /etc/login.defs ішіндегі мәндерін үстінен "
-"жазу\n"
-"  -l,                           пайдаланушыны lastlog пен faillog "
-"дерекқорларына\n"
-"                                 қоспау\n"
-"  -m, --create-home             жаңа пайдаланушы үшін үй бумасын құру\n"
-"  -N, --no-user-group           пайдаланушымен аттас жаңа топты құрмау\n"
-"  -o, --non-unique              қайталанатын (ерекше емес) UID-тары бар\n"
-"                                тіркелгілерді жасауға рұқсат ету\n"
-"  -p, --password PASSWORD       жаңа тіркелгі үшін шифрленген парольді "
-"қолдану\n"
-"  -r, --system                  жүйелік тіркелгіні жасау\n"
-"  -s, --shell SHELL             жаңа тіркелгі үшін қоршам\n"
-"  -u, --uid UID                 жаңа тіркелгі үшін UID қолдануды мәжбүрлету\n"
-"  -U, --user-group              пайдаланушымен аттас топты құру\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2187,7 +2170,250 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %s қайтару мүмкін емес: %s (сіздің өзгертулеріңіз %s ішінде)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Қолданылуы: faillog [опциялар]\n"
+#~ "\n"
+#~ "Опциялары:\n"
+#~ "  -a, --all                     барлық пайдаланушылар үшін faillog "
+#~ "жазбаларын көрсету\n"
+#~ "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
+#~ "  -l, --lock-time SEC           сәтсіз талаптан кейін тіркелгіні SEC "
+#~ "секундқа оқшаулау\n"
+#~ "  -m, --maximum MAX             максимум сәтсіз жүйеге кіру талап шегін "
+#~ "MAX мәніне орнату\n"
+#~ "  -r, --reset                   сәтсіз жүйеге кіру талаптары жазбаларын "
+#~ "өшіру\n"
+#~ "  -t, --time DAYS               DAYS күнге дейінгі faillog жазбаларын "
+#~ "көрсету\n"
+#~ "  -u, --user ПАЙДАЛАНУШЫ              көрсетілген ПАЙДАЛАНУШЫ ушін "
+#~ "faillog жазбаларын\n"
+#~ "                                көрсету немесе шектеу (-r, -m не -l бірге "
+#~ "қолдану керек)\n"
+#~ "                                мәндерін баптау\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Қолданылуы: groupadd [опциялар] ТОП\n"
+#~ "\n"
+#~ "Опциялары:\n"
+#~ "  -f, --force                   көрсетілген топ бар болса да сәтті "
+#~ "нәтижені\n"
+#~ "                                қайтаруды мәжбүрлету\n"
+#~ "  -g, --gid GID                 жаңа топ үшін GID қолдану\n"
+#~ "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
+#~ "  -K, --key KEY=МӘН           /etc/login.defs ішіндегісін елемеу(одан "
+#~ "басыңқы болу)\n"
+#~ "  -o, --non-unique              қайталанатын GID бар топтарды құруға "
+#~ "рұқсат беру\n"
+#~ "  -p, --password PASSWORD       жаңа топ үшін шифрленген парольді "
+#~ "қолдану\n"
+#~ "  -r, --system                  жүйелік тіркелгіні жасау\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Қолданылуы: groupmod [опциялар] ТОП\n"
+#~ "\n"
+#~ "Опциялары:\n"
+#~ "  -g, --gid GID                 ТОП үшін жаңа GID қолдануды мәжбүрлету\n"
+#~ "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
+#~ "  -n, --new-name NEW_GROUP      ТОП үшін жаңа ТОП_АТЫ атын қолдануды "
+#~ "мәжбүрлету\n"
+#~ "  -o, --non-unique              ТОП үшін қайталанатын (ерекше емес) GID "
+#~ "қолдануға рұқсат беру\n"
+#~ "  -p, --password PASSWORD       жаңа пароль ретінде шифрленген парольді "
+#~ "қолдану\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Usage: useradd [options] LOGIN\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~| "                                home directory\n"
+#~| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~| "account\n"
+#~| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~| "  -D, --defaults                print or save modified default useradd\n"
+#~| "                                configuration\n"
+#~| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -g, --gid GROUP               force use GROUP for the new user "
+#~| "account\n"
+#~| "  -G, --groups GROUPS           list of supplementary groups for the "
+#~| "new\n"
+#~| "                                user account\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~| "  -l,                           do not add the user to the lastlog and\n"
+#~| "                                faillog databases\n"
+#~| "  -m, --create-home             create home directory for the new user\n"
+#~| "                                account\n"
+#~| "  -N, --no-user-group           do not create a group with the same name "
+#~| "as\n"
+#~| "                                the user\n"
+#~| "  -o, --non-unique              allow create user with duplicate\n"
+#~| "                                (non-unique) UID\n"
+#~| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~| "                                account\n"
+#~| "  -r, --system                  create a system account\n"
+#~| "  -s, --shell SHELL             the login shell for the new user "
+#~| "account\n"
+#~| "  -u, --uid UID                 force use the UID for the new user "
+#~| "account\n"
+#~| "  -U, --user-group              create a group with the same name as the "
+#~| "user\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Қолданылуы: useradd [опциялар] ТІРКЕЛГІ\n"
+#~ "\n"
+#~ "Опциялары:\n"
+#~ "  -b, --base-dir BASE_DIR       жаңа пайдаланушы тіркелгісінің үй бумасы\n"
+#~ "                                үшін базалық бума\n"
+#~ "  -c, --comment COMMENT         жаңа пайдаланушы тіркелгісі үшін GECOS "
+#~ "мәнін орнату\n"
+#~ "  -d, --home-dir HOME_DIR       жаңа пайдаланушы тіркелгісі үшін үй "
+#~ "бумасы\n"
+#~ "  -D, --defaults                өзгертілген бастапқы useradd баптауларын\n"
+#~ "                                шығару немесе сақтау\n"
+#~ "  -e, --expiredate EXPIRE_DATE  тіркелгі мерзімі аяқталуын EXPIRE_DATE "
+#~ "күніне орнату\n"
+#~ "  -f, --inactive INACTIVE       мерзімі аяқталған соң тіркелгі сөндірілу "
+#~ "үшін өту керек\n"
+#~ "                                күн санын INACTIVE мәніне орнату\n"
+#~ "  -g, --gid GROUP               жаңа пайдаланушы тіркелгісі үшін GROUP "
+#~ "қолдануды мәжбүрлету\n"
+#~ "  -G, --groups GROUPS           жаңа пайдаланушы тіркелгісі үшін қосымша\n"
+#~ "                                топтар тізімін шығару\n"
+#~ "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
+#~ "  -k, --skel SKEL_DIR           басақ skel бумасын қолдану\n"
+#~ "  -K, --key KEY=VALUE           /etc/login.defs ішіндегі мәндерін үстінен "
+#~ "жазу\n"
+#~ "  -l,                           пайдаланушыны lastlog пен faillog "
+#~ "дерекқорларына\n"
+#~ "                                 қоспау\n"
+#~ "  -m, --create-home             жаңа пайдаланушы үшін үй бумасын құру\n"
+#~ "  -N, --no-user-group           пайдаланушымен аттас жаңа топты құрмау\n"
+#~ "  -o, --non-unique              қайталанатын (ерекше емес) UID-тары бар\n"
+#~ "                                тіркелгілерді жасауға рұқсат ету\n"
+#~ "  -p, --password PASSWORD       жаңа тіркелгі үшін шифрленген парольді "
+#~ "қолдану\n"
+#~ "  -r, --system                  жүйелік тіркелгіні жасау\n"
+#~ "  -s, --shell SHELL             жаңа тіркелгі үшін қоршам\n"
+#~ "  -u, --uid UID                 жаңа тіркелгі үшін UID қолдануды "
+#~ "мәжбүрлету\n"
+#~ "  -U, --user-group              пайдаланушымен аттас топты құру\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/km.po
===================================================================
--- upstream/trunk/po/km.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/km.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: shadow_po_km\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2006-06-28 10:08+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem at khmeros.info>\n"
 "Language-Team: Khmer <support at khmeros.info>\n"
@@ -122,6 +122,10 @@
 "ចុងក្រោម​ %s  %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s ៖ មិនអាចយក​ UID ដែលមានតែមួយ​បានទេ\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s ៖ មិនអាច​យក​​ GID ​ដែលមានតែមួយ​បានឡើយ​\n"
 
@@ -602,39 +606,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "របៀបប្រើ ៖ ការផុតកំណត់ {-f|-c}\n"
 
-#, fuzzy
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"របៀប​ប្រើ ៖ faillog [ជម្រើស]\n"
-"\n"
-"ជម្រើស ៖\n"
-"  -a, --all\t\t\tបង្ហាញ​កំណត់ត្រា​កំណត់ហេតុ​បរាជ័យ សម្រាប់​អ្នក​ប្រើ​ទាំងអស់\n"
-"  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួយ​នេះ ហើយ​ចេញ\n"
-"  -l, --lock-time វិ.\t\tបន្ទាប់​ពី​ចូល​បរាជ័យ ត្រូវ​ចាក់សោ​គណនី​រយៈពេល វិ. វិនាទី\n"
-"  -m, --maximum អតិ.\t\tកំណត់​ចំនួន​អតិបរមា​នៃ​ការ​ចូល​ដែល​បរាជ័យ ចំនួន អតិ.\n"
-"  -r, --reset\t\t\tកំណត់​អថេរ​រាប់​នៃ​ការ​ចូល​ដែល​បរាជ័យ​ឡើង​វិញ\n"
-"  -t, --time ថ្ងៃ\t\tបង្ហាញ​កំណត់ត្រា​កំណត់ហេតុ​បរាជ័យ ថ្មីៗ​ជាង \"ថ្ងៃ\" ថ្ងៃ\n"
-"  -u, --user ឈ្មោះចូល\t\tបង្ហាញ​កំណត់ត្រា​កំណត់ហេតុ​បរាជ័យ ឬ ថែទាំ​អថេរ​រាប់​ការ​បរាជ័យ\n"
-"\t\t\t\tនិង កំណត់ (បើ​ប្រើ​ជាមួយ​ជម្រើស -r, -m ឬ -l) សម្រាប់​តែ\n"
-"\t\t\t\tអ្នកប្រើ​ដែល​មាន​ឈ្មោះ​ចូល \"ឈ្មោះចូល\"\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -747,34 +744,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s ៖ មិនមែន​ tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "របៀបប្រើ ៖ %s [input]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"របៀបប្រើ ៖ groupadd [ជម្រើស] ក្រុម\n"
-"\n"
-"ជម្រើស ៖\n"
-"  -f, --force\t\t\tបង្ខំឲ្យ​ចេញ​ជា​មួយ​នឹង​ស្ថានភាព​ជោគជ័យ ប្រសិន​បើ​ក្រុម\n"
-"\t\t\t\tដែល​បាន​បញ្ជាក់​មាន​រួច​ហើយ\n"
-"  -g, --gid GID\t\t\tប្រើ GID សម្រាប់​ក្រុមថ្មី\n"
-"  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួយ​នេះ និង​ចេញ\n"
-"  -K, --key KEY=VALUE\t\tបដិសេធលំនាំដើមរបស់ /etc/login.defs \n"
-"  -o, --non-unique\t\tអនុញ្ញាត​ឲ្យ​បង្កើត​ក្រុម​ដែល​មាន\n"
-"\t\t\t\t GID (មិនមាន​តែមួយ​គត់) ស្ទួន\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -857,31 +859,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"របៀបប្រើ ៖ groupadd ក្រុម [options]​\n"
-"\n"
-"ជម្រើស ៖\n"
-"  -f, --បង្ខំ​ \t\t បង្ខំឲ្យ​​ចេញ​ជាមួយ​ស្ថានភាព​ជោគជ័យ​ ប្រសិនបើ​មាន​\n"
-"\t\t\t\tក្រុមដែលបានបញ្ជាក់​​មាន​រួច​ហើយ​\n"
-"  -g, --gid GID\t\tប្រើ​ GID សម្រាប់​ក្រុម​ថ្មី​\n"
-"  -h, --ជំនួយ\t\t\tបង្ហាញ​សារជំនួយ​​នេះ​ ហើយ​ ចេញ​\n"
-"  -K, --កូនសោ KEY=VALUE\t\tបដិសេធ​ /etc/login.defs លំនាំ​ដើម​\n"
-"  -o, --មិនមែនមានតែមួយ\t\t អនុញ្ញាតឲ្យ​​បង្កើត​ក្រុម​ស្ទួន​\n"
-"\t\t\t\t(មិនមែនមានតែមួយ) GID\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "ឈ្មោះ​ក្រុម​ '%s' មិនត្រឹមត្រូវ\n"
@@ -1373,6 +1365,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "របៀបប្រើ ៖ %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s ៖ -s និង​ -r គឺមិន​ត្រូវ​គ្នាទេ​\n"
+
 #, fuzzy
 msgid "invalid password file entry"
 msgstr "ធាតុបញ្ចូល​ឯកសារ​ពាក្យសម្ងាត់​មិនត្រឹមត្រូវ\n"
@@ -1583,72 +1580,87 @@
 msgstr "%s ៖ ក្រុម​ដែលបានបញ្ជាក់​ច្រើនពេក​ (អតិ​ %d) ។\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "របៀបប្រើ ៖ %s [input]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"របៀបប្រើ ៖ useradd [ជម្រើស] LOGIN\n"
-"\n"
-"ជម្រើស ៖\n"
-"  -b, --base-dir BASE_DIR\tថត​មូលដ្ឋាន​សម្រាប់​គណនី​អ្នក​ប្រើ​ថ្មី\n"
-"\t\t\t\tថតផ្ទះ\n"
-"  -c, --comment COMMENT\t\tកំណត់វាល GECOS សម្រាប់​គណនី​អ្នកប្រើ​ថ្មី\n"
-"  -d, --home-dir HOME_DIR\tថត​ផ្ទះ​សម្រាប់​គណនី​អ្នក​ប្រើ​ថ្មី\n"
-"  -D, --defaults\t\tបោះពុម្ព ឬ​រក្សាទុក useradd លំនាំដើម​ដែល​បាន​កែប្រែ\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tកំណត់​កាលបរិច្ឆេទ​គណនី​ទៅ​ជា EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tកំណត់​ពាក្យ​សម្ងាត់​ឲ្យ​អសកម្ម​បន្ទាប់​ពី​ផុតកំណត់\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tបង្ខំ​ឲ្យ​ប្រើ GROUP សម្រាប់​គណនី​អ្នក​ប្រើ​ថ្មី\n"
-"  -G, --groups GROUPS\t\tបញ្ជី​របស់​ក្រុម​ផ្ដល់​សម្រាប់\n"
-"\t\t\t\tគណនី​អ្នក​ប្រើ​ថ្មី\n"
-"  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួយ​នេះ និង​ចេញ\n"
-"  -k, --skel SKEL_DIR\t\tបញ្ជាក់ថត skel ជំនួស\n"
-"  -K, --key KEY=VALUE\t\tបដិសេធលំនាំដើម /etc/login.defs\n"
-"  -m, --create-home\t\tបង្កើត​ថត​ផ្ទះ​សម្រាប់​អ្នកប្រើ​ថ្មី\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tអនុញ្ញា​ឲ្យ​បង្កើត​អ្នកប្រើ​ដែល​មាន\n"
-"\t\t\t\t UID(មិនមែន​តែ​មួយគត់) ស្ទួន \n"
-"  -p, --password PASSWORD\tប្រើ​ពាក្យសម្ងាត់​ដែល​បាន​អ៊ិនគ្រីប​សម្រាប់\n"
-"\t\t\t\tគណនី​អ្នកប្រើ​ថ្មី\n"
-"  -s, --shell SHELL\t\tសែល​ចូល​សម្រាប់​គណនី​អ្នកប្រើ​ថ្មី\n"
-"  -u, --uid UID\t\t\tបង្ខំឲ្យប្រើ UID សម្រាប់​គណនី​អ្នកប្រើ​ថ្មី\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -1985,6 +1997,165 @@
 msgstr "%s ៖ មិន​អាច​ស្តារ %s ៖ %s (ការប្ដូរ​របស់អ្នក​គឺនៅក្នុង​ %s)\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "របៀប​ប្រើ ៖ faillog [ជម្រើស]\n"
+#~ "\n"
+#~ "ជម្រើស ៖\n"
+#~ "  -a, --all\t\t\tបង្ហាញ​កំណត់ត្រា​កំណត់ហេតុ​បរាជ័យ សម្រាប់​អ្នក​ប្រើ​ទាំងអស់\n"
+#~ "  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួយ​នេះ ហើយ​ចេញ\n"
+#~ "  -l, --lock-time វិ.\t\tបន្ទាប់​ពី​ចូល​បរាជ័យ ត្រូវ​ចាក់សោ​គណនី​រយៈពេល វិ. វិនាទី\n"
+#~ "  -m, --maximum អតិ.\t\tកំណត់​ចំនួន​អតិបរមា​នៃ​ការ​ចូល​ដែល​បរាជ័យ ចំនួន អតិ.\n"
+#~ "  -r, --reset\t\t\tកំណត់​អថេរ​រាប់​នៃ​ការ​ចូល​ដែល​បរាជ័យ​ឡើង​វិញ\n"
+#~ "  -t, --time ថ្ងៃ\t\tបង្ហាញ​កំណត់ត្រា​កំណត់ហេតុ​បរាជ័យ ថ្មីៗ​ជាង \"ថ្ងៃ\" ថ្ងៃ\n"
+#~ "  -u, --user ឈ្មោះចូល\t\tបង្ហាញ​កំណត់ត្រា​កំណត់ហេតុ​បរាជ័យ ឬ ថែទាំ​អថេរ​រាប់​ការ​បរាជ័យ\n"
+#~ "\t\t\t\tនិង កំណត់ (បើ​ប្រើ​ជាមួយ​ជម្រើស -r, -m ឬ -l) សម្រាប់​តែ\n"
+#~ "\t\t\t\tអ្នកប្រើ​ដែល​មាន​ឈ្មោះ​ចូល \"ឈ្មោះចូល\"\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "របៀបប្រើ ៖ groupadd [ជម្រើស] ក្រុម\n"
+#~ "\n"
+#~ "ជម្រើស ៖\n"
+#~ "  -f, --force\t\t\tបង្ខំឲ្យ​ចេញ​ជា​មួយ​នឹង​ស្ថានភាព​ជោគជ័យ ប្រសិន​បើ​ក្រុម\n"
+#~ "\t\t\t\tដែល​បាន​បញ្ជាក់​មាន​រួច​ហើយ\n"
+#~ "  -g, --gid GID\t\t\tប្រើ GID សម្រាប់​ក្រុមថ្មី\n"
+#~ "  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួយ​នេះ និង​ចេញ\n"
+#~ "  -K, --key KEY=VALUE\t\tបដិសេធលំនាំដើមរបស់ /etc/login.defs \n"
+#~ "  -o, --non-unique\t\tអនុញ្ញាត​ឲ្យ​បង្កើត​ក្រុម​ដែល​មាន\n"
+#~ "\t\t\t\t GID (មិនមាន​តែមួយ​គត់) ស្ទួន\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "របៀបប្រើ ៖ groupadd ក្រុម [options]​\n"
+#~ "\n"
+#~ "ជម្រើស ៖\n"
+#~ "  -f, --បង្ខំ​ \t\t បង្ខំឲ្យ​​ចេញ​ជាមួយ​ស្ថានភាព​ជោគជ័យ​ ប្រសិនបើ​មាន​\n"
+#~ "\t\t\t\tក្រុមដែលបានបញ្ជាក់​​មាន​រួច​ហើយ​\n"
+#~ "  -g, --gid GID\t\tប្រើ​ GID សម្រាប់​ក្រុម​ថ្មី​\n"
+#~ "  -h, --ជំនួយ\t\t\tបង្ហាញ​សារជំនួយ​​នេះ​ ហើយ​ ចេញ​\n"
+#~ "  -K, --កូនសោ KEY=VALUE\t\tបដិសេធ​ /etc/login.defs លំនាំ​ដើម​\n"
+#~ "  -o, --មិនមែនមានតែមួយ\t\t អនុញ្ញាតឲ្យ​​បង្កើត​ក្រុម​ស្ទួន​\n"
+#~ "\t\t\t\t(មិនមែនមានតែមួយ) GID\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "របៀបប្រើ ៖ useradd [ជម្រើស] LOGIN\n"
+#~ "\n"
+#~ "ជម្រើស ៖\n"
+#~ "  -b, --base-dir BASE_DIR\tថត​មូលដ្ឋាន​សម្រាប់​គណនី​អ្នក​ប្រើ​ថ្មី\n"
+#~ "\t\t\t\tថតផ្ទះ\n"
+#~ "  -c, --comment COMMENT\t\tកំណត់វាល GECOS សម្រាប់​គណនី​អ្នកប្រើ​ថ្មី\n"
+#~ "  -d, --home-dir HOME_DIR\tថត​ផ្ទះ​សម្រាប់​គណនី​អ្នក​ប្រើ​ថ្មី\n"
+#~ "  -D, --defaults\t\tបោះពុម្ព ឬ​រក្សាទុក useradd លំនាំដើម​ដែល​បាន​កែប្រែ\n"
+#~ "\t\t\t\tconfiguration\n"
+#~ "  -e, --expiredate EXPIRE_DATE\tកំណត់​កាលបរិច្ឆេទ​គណនី​ទៅ​ជា EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE\tកំណត់​ពាក្យ​សម្ងាត់​ឲ្យ​អសកម្ម​បន្ទាប់​ពី​ផុតកំណត់\n"
+#~ "\t\t\t\tto INACTIVE\n"
+#~ "  -g, --gid GROUP\t\tបង្ខំ​ឲ្យ​ប្រើ GROUP សម្រាប់​គណនី​អ្នក​ប្រើ​ថ្មី\n"
+#~ "  -G, --groups GROUPS\t\tបញ្ជី​របស់​ក្រុម​ផ្ដល់​សម្រាប់\n"
+#~ "\t\t\t\tគណនី​អ្នក​ប្រើ​ថ្មី\n"
+#~ "  -h, --help\t\t\tបង្ហាញ​សារ​ជំនួយ​នេះ និង​ចេញ\n"
+#~ "  -k, --skel SKEL_DIR\t\tបញ្ជាក់ថត skel ជំនួស\n"
+#~ "  -K, --key KEY=VALUE\t\tបដិសេធលំនាំដើម /etc/login.defs\n"
+#~ "  -m, --create-home\t\tបង្កើត​ថត​ផ្ទះ​សម្រាប់​អ្នកប្រើ​ថ្មី\n"
+#~ "\t\t\t\taccount\n"
+#~ "  -o, --non-unique\t\tអនុញ្ញា​ឲ្យ​បង្កើត​អ្នកប្រើ​ដែល​មាន\n"
+#~ "\t\t\t\t UID(មិនមែន​តែ​មួយគត់) ស្ទួន \n"
+#~ "  -p, --password PASSWORD\tប្រើ​ពាក្យសម្ងាត់​ដែល​បាន​អ៊ិនគ្រីប​សម្រាប់\n"
+#~ "\t\t\t\tគណនី​អ្នកប្រើ​ថ្មី\n"
+#~ "  -s, --shell SHELL\t\tសែល​ចូល​សម្រាប់​គណនី​អ្នកប្រើ​ថ្មី\n"
+#~ "  -u, --uid UID\t\t\tបង្ខំឲ្យប្រើ UID សម្រាប់​គណនី​អ្នកប្រើ​ថ្មី\n"
+#~ "\n"
+
+#, fuzzy
 #~ msgid "Password set to expire."
 #~ msgstr "កំណត់​ពាក្យ​សម្ងាត់​ឲ្យ​ផុត​កំណត់​ ។\n"
 

Modified: upstream/trunk/po/ko.po
===================================================================
--- upstream/trunk/po/ko.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/ko.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2009-04-19 21:32+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu at debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean at lists.debian.org>\n"
@@ -110,6 +110,11 @@
 "마지막 로그인 이후 %d번 실패.\n"
 "마지막 로그인은 %s, %s에서.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: 유일한 UID를 얻을 수 없습니다 (UID가 남아 있지 않습니다)\n"
+
 #, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: 유일한 GID를 얻을 수 없습니다 (GID가 남아 있지 않습니다)\n"
@@ -606,41 +611,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "사용법: expiry {-f|-c}\n"
 
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"사용법: faillog [옵션]\n"
-"\n"
-"옵션:\n"
-"  -a, --all                  모든 사용자의 로그인 실패 기록을 표시합니다\n"
-"  -h, --help                 이 도움말 메시지를 표시하고 끝냅니다\n"
-"  -l, --lock-time <초>       로그인에 실패하면 <초>초 동안 계정을 잠급니다\n"
-"  -m, --maximum <최대값>     로그인 실패 횟수의 최대값을 <최대값>으로 합니"
-"다\n"
-"  -r, --reset                로그인 실패 횟수를 초기화합니다\n"
-"  -t, --time <날짜>          <날짜>일 내의 로그인 실패 기록만 표시합니다\n"
-"  -u, --user <로그인>        <로그인> 사용자의 로그인 실패 기록을 표시하거"
-"나,\n"
-"                             -r, -m, -l 옵션을 사용할 때에는 <로그인> 사용자"
-"의\n"
-"                             로그인 실패 횟수와 한계값만 관리합니다\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
@@ -765,36 +761,46 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: TTY가 아닙니다\n"
 
+#, c-format
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
 msgstr ""
-"사용법: groupadd [옵션] <그룹>\n"
-"\n"
-"옵션\n"
-"  -f, --force                   지정한 그룹이 이미 있을 경우에도 끝내고 \n"
-"                                성공한 것으로 표시합니다\n"
-"  -g, --gid <GID>               새 그룹의 gid를 <GID>로 합니다\n"
-"  -h, --help                    이 도움말 메시지를 표시하고 끝냅니다\n"
-"  -K, --key <키>=<값>           /etc/login.defs의 기본값을 무시하고 설정합니"
-"다\n"
-"  -o, --non-unique              GID가 중복되더라도(유일하지 않더라도)\n"
-"                                그룹 만들기를 허용합니다\n"
-"  -p, --password <암호>         새 그룹에 암호화한 암호를 사용합니다\n"
-"  -r, --system                  시스템 계정을 만듭니다\n"
-"\n"
 
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: '%s'은(는) 사용할 수 없는 그룹 이름입니다\n"
@@ -883,30 +889,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr "%s: root만 -g/--group 옵션을 쓸 수 있습니다\n"
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"사용법: groupmod [옵션] <그룹>\n"
-"\n"
-"옵션:\n"
-"  -g, --gid <GID>               <그룹>에 새 <GID>를 사용합니다\n"
-"  -h, --help                    이 도움말을 출력하고 끝납니다\n"
-"  -n, --new-name <새그룹>       <그룹>에 <새그룹> 이름을 강제로 사용합니다\n"
-"  -o, --non-unique              <그룹>에 중복된 (유일하지 않은) GID로 그룹"
-"을 \n"
-"                                만듭니다\n"
-"  -p, --password <암호>         새 암호에 암호화한 암호를 사용합니다\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: '%s' 그룹 이름은 쓸 수 없습니다\n"
@@ -1379,6 +1376,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "사용법: %s [-q] [-r] [-s] [암호 [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s 옵션과 -r 옵션을 동시에 쓸 수 없습니다\n"
+
 msgid "invalid password file entry"
 msgstr "올바르지 않은 암호 파일 항목"
 
@@ -1569,121 +1571,111 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: 그룹이 너무 많이 명시되었습니다 (최대 %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: useradd [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-#| "                                home directory\n"
-#| "  -c, --comment COMMENT         set the GECOS field for the new user "
-#| "account\n"
-#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-#| "  -D, --defaults                print or save modified default useradd\n"
-#| "                                configuration\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
-#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
-#| "                                user account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-#| "  -l, --no-log-init             do not add the user to the lastlog and\n"
-#| "                                faillog databases\n"
-#| "  -m, --create-home             create home directory for the new user\n"
-#| "                                account\n"
-#| "  -M, --no-create-home          do not create user's home directory\n"
-#| "                                (overrides /etc/login.defs)\n"
-#| "  -N, --no-user-group           do not create a group with the same name "
-#| "as\n"
-#| "                                the user\n"
-#| "  -o, --non-unique              allow create user with duplicate\n"
-#| "                                (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
-#| "                                account\n"
-#| "  -r, --system                  create a system account\n"
-#| "  -s, --shell SHELL             the login shell for the new user account\n"
-#| "  -u, --uid UID                 force use the UID for the new user "
-#| "account\n"
-#| "  -U, --user-group              create a group with the same name as the "
-#| "user\n"
-#| "\n"
+#, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr "  -s, --sha-rounds              SHA* 암호화 알고리즘의 SHA 라운드 수\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"사용법: useradd [옵션] <로그인>\n"
-"\n"
-"옵션:\n"
-"  -b, --base-dir <기본디렉터리>  새 사용자 계정의 홈 디렉터리의 기본 디렉토"
-"리\n"
-"  -c, --comment <설명>           새 사용자 계정의 GECOS 필드를 설정합니다\n"
-"  -d, --home-dir <홈디렉터리>    새 사용자 계정의 홈 디렉터리\n"
-"  -D, --defaults                 기본 useradd 설정을 표시하거나 변경합니다\n"
-"  -e, --expiredate <만료일>      계정 만료 날짜를 <만료일>로 합니다\n"
-"  -f, --inactive <비활성화기간>  만료된 후 비활성화 기간을 <비활성화기간>으"
-"로\n"
-"                                 합니다\n"
-"  -g, --gid <그룹>               새 주요 그룹을 <그룹>으로 강제로 지정합니"
-"다\n"
-"  -G, --groups <그룹목록>        보조 그룹의 목록을 새로 지정합니다\n"
-"  -h, --help                     이 도움말을 표시하고 끝냅니다\n"
-"  -k, --skel <SKEL디렉터리>      다른 skel 디렉터리를 지정합니다\n"
-"  -K, --key <키>=<값>            /etc/login.defs의 기본값을 무시하고 설정합니"
-"다\n"
-"  -l, --no-log-init              사용자를 최근 기록 및 로그인 실패\n"
-"                                 데이터베이스에 추가하지 않습니다\n"
-"  -m, --create-home              새 사용자 계정의 홈 디렉터리를 만듭니다\n"
-"  -M, --no-create-home           홈 디렉터리를 만들지 않습니다\n"
-"                                 (/etc/login.defs의 설정을 무시합니다)\n"
-"  -o, --non-user-group           사용자와 같은 이름의 그룹을 만들지 않습니"
-"다\n"
-"  -o, --non-unique               중복되는 UID도 허용합니다\n"
-"  -p, --password <암호>          새로 사용할 암호를 암호화하여 사용합니다\n"
-"  -s, --shell <쉘>               지정한 사용자 계정의 로그인 쉘을 지정합니"
-"다\n"
-"  -u, --uid <UID>                지정한 사용자 계정의 새 <UID> 값을 지정합니"
-"다\n"
-"  -U, --user-group               사용자와 같은 이름의 그룹을 만듭니다\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2058,6 +2050,224 @@
 msgstr "%s: %s을(를) 복구할 수 없습니다: %s (바뀐 사항은 %s에 있습니다)\n"
 
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "사용법: faillog [옵션]\n"
+#~ "\n"
+#~ "옵션:\n"
+#~ "  -a, --all                  모든 사용자의 로그인 실패 기록을 표시합니다\n"
+#~ "  -h, --help                 이 도움말 메시지를 표시하고 끝냅니다\n"
+#~ "  -l, --lock-time <초>       로그인에 실패하면 <초>초 동안 계정을 잠급니"
+#~ "다\n"
+#~ "  -m, --maximum <최대값>     로그인 실패 횟수의 최대값을 <최대값>으로 합니"
+#~ "다\n"
+#~ "  -r, --reset                로그인 실패 횟수를 초기화합니다\n"
+#~ "  -t, --time <날짜>          <날짜>일 내의 로그인 실패 기록만 표시합니다\n"
+#~ "  -u, --user <로그인>        <로그인> 사용자의 로그인 실패 기록을 표시하거"
+#~ "나,\n"
+#~ "                             -r, -m, -l 옵션을 사용할 때에는 <로그인> 사용"
+#~ "자의\n"
+#~ "                             로그인 실패 횟수와 한계값만 관리합니다\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "사용법: groupadd [옵션] <그룹>\n"
+#~ "\n"
+#~ "옵션\n"
+#~ "  -f, --force                   지정한 그룹이 이미 있을 경우에도 끝내고 \n"
+#~ "                                성공한 것으로 표시합니다\n"
+#~ "  -g, --gid <GID>               새 그룹의 gid를 <GID>로 합니다\n"
+#~ "  -h, --help                    이 도움말 메시지를 표시하고 끝냅니다\n"
+#~ "  -K, --key <키>=<값>           /etc/login.defs의 기본값을 무시하고 설정합"
+#~ "니다\n"
+#~ "  -o, --non-unique              GID가 중복되더라도(유일하지 않더라도)\n"
+#~ "                                그룹 만들기를 허용합니다\n"
+#~ "  -p, --password <암호>         새 그룹에 암호화한 암호를 사용합니다\n"
+#~ "  -r, --system                  시스템 계정을 만듭니다\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "사용법: groupmod [옵션] <그룹>\n"
+#~ "\n"
+#~ "옵션:\n"
+#~ "  -g, --gid <GID>               <그룹>에 새 <GID>를 사용합니다\n"
+#~ "  -h, --help                    이 도움말을 출력하고 끝납니다\n"
+#~ "  -n, --new-name <새그룹>       <그룹>에 <새그룹> 이름을 강제로 사용합니"
+#~ "다\n"
+#~ "  -o, --non-unique              <그룹>에 중복된 (유일하지 않은) GID로 그룹"
+#~ "을 \n"
+#~ "                                만듭니다\n"
+#~ "  -p, --password <암호>         새 암호에 암호화한 암호를 사용합니다\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Usage: useradd [options] LOGIN\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~| "                                home directory\n"
+#~| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~| "account\n"
+#~| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~| "  -D, --defaults                print or save modified default useradd\n"
+#~| "                                configuration\n"
+#~| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -g, --gid GROUP               force use GROUP for the new user "
+#~| "account\n"
+#~| "  -G, --groups GROUPS           list of supplementary groups for the "
+#~| "new\n"
+#~| "                                user account\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~| "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~| "                                faillog databases\n"
+#~| "  -m, --create-home             create home directory for the new user\n"
+#~| "                                account\n"
+#~| "  -M, --no-create-home          do not create user's home directory\n"
+#~| "                                (overrides /etc/login.defs)\n"
+#~| "  -N, --no-user-group           do not create a group with the same name "
+#~| "as\n"
+#~| "                                the user\n"
+#~| "  -o, --non-unique              allow create user with duplicate\n"
+#~| "                                (non-unique) UID\n"
+#~| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~| "                                account\n"
+#~| "  -r, --system                  create a system account\n"
+#~| "  -s, --shell SHELL             the login shell for the new user "
+#~| "account\n"
+#~| "  -u, --uid UID                 force use the UID for the new user "
+#~| "account\n"
+#~| "  -U, --user-group              create a group with the same name as the "
+#~| "user\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "사용법: useradd [옵션] <로그인>\n"
+#~ "\n"
+#~ "옵션:\n"
+#~ "  -b, --base-dir <기본디렉터리>  새 사용자 계정의 홈 디렉터리의 기본 디렉"
+#~ "토리\n"
+#~ "  -c, --comment <설명>           새 사용자 계정의 GECOS 필드를 설정합니"
+#~ "다\n"
+#~ "  -d, --home-dir <홈디렉터리>    새 사용자 계정의 홈 디렉터리\n"
+#~ "  -D, --defaults                 기본 useradd 설정을 표시하거나 변경합니"
+#~ "다\n"
+#~ "  -e, --expiredate <만료일>      계정 만료 날짜를 <만료일>로 합니다\n"
+#~ "  -f, --inactive <비활성화기간>  만료된 후 비활성화 기간을 <비활성화기간>"
+#~ "으로\n"
+#~ "                                 합니다\n"
+#~ "  -g, --gid <그룹>               새 주요 그룹을 <그룹>으로 강제로 지정합니"
+#~ "다\n"
+#~ "  -G, --groups <그룹목록>        보조 그룹의 목록을 새로 지정합니다\n"
+#~ "  -h, --help                     이 도움말을 표시하고 끝냅니다\n"
+#~ "  -k, --skel <SKEL디렉터리>      다른 skel 디렉터리를 지정합니다\n"
+#~ "  -K, --key <키>=<값>            /etc/login.defs의 기본값을 무시하고 설정"
+#~ "합니다\n"
+#~ "  -l, --no-log-init              사용자를 최근 기록 및 로그인 실패\n"
+#~ "                                 데이터베이스에 추가하지 않습니다\n"
+#~ "  -m, --create-home              새 사용자 계정의 홈 디렉터리를 만듭니다\n"
+#~ "  -M, --no-create-home           홈 디렉터리를 만들지 않습니다\n"
+#~ "                                 (/etc/login.defs의 설정을 무시합니다)\n"
+#~ "  -o, --non-user-group           사용자와 같은 이름의 그룹을 만들지 않습니"
+#~ "다\n"
+#~ "  -o, --non-unique               중복되는 UID도 허용합니다\n"
+#~ "  -p, --password <암호>          새로 사용할 암호를 암호화하여 사용합니"
+#~ "다\n"
+#~ "  -s, --shell <쉘>               지정한 사용자 계정의 로그인 쉘을 지정합니"
+#~ "다\n"
+#~ "  -u, --uid <UID>                지정한 사용자 계정의 새 <UID> 값을 지정합"
+#~ "니다\n"
+#~ "  -U, --user-group               사용자와 같은 이름의 그룹을 만듭니다\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/nb.po
===================================================================
--- upstream/trunk/po/nb.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/nb.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2009-04-12 17:14+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst at skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -120,6 +120,12 @@
 "Forrige var %s på %s.\n"
 
 # , c-format
+#, fuzzy, c-format
+#| msgid "%s: Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: klarer ikke å få entydig UID (ingen flere UID-er tilgjengelig)\n"
+
+# , c-format
 #, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: klarer ikke å få entydig GID (ingen flere GID-er tilgjengelig)\n"
@@ -647,41 +653,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Bruk: expiry {-f|-c}\n"
 
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Bruk: faillog [valg]\n"
-"\n"
-"Valg:\n"
-"  -a, --all                     vis faillog-oppføringer for alle brukere\n"
-"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
-"  -l, --lock-time SEK           etter mislykket innlogging, lås kontoen\n"
-"                                i SEK sekunder\n"
-"  -m, --maximum MAX             sett største antall mislykte innlogginger\n"
-"                                til MAX\n"
-"  -r, --reset                   nullstill tellerne for mislykte "
-"innlogginger\n"
-"  -t, --time DAGER              vis mislykte innlogginger nyere enn DAGER\n"
-"  -u, --user BRUKER             vis mislykte innlogginger eller styr\n"
-"                                tellene og grenseverdiene (med -r, -m\n"
-"                                eller -l) bare for bruker BRUKER\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
@@ -812,36 +809,51 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Ikke en tty\n"
 
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Bruk: %s [input]\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Bruk: groupadd [valg] GRUPPE\n"
-"\n"
-"Valg:\n"
-"  -f, --force                   tving fram normal avslutning hvis den\n"
-"                                oppgitte gruppa finnes fra før\n"
-"  -g, --gid GID                 bruk GID for den nye gruppa\n"
-"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
-"  -K, --key NØKKEL=VERDI        overstyrer standardverdier\n"
-"                                fra /etc/login.defs\n"
-"  -o, --non-unique              tillat å opprette en gruppe med duplisert\n"
-"                                GID\n"
-"  -p, --password PASSORD   bruk kryptert passord for den nye gruppa\n"
-"  -r, --system               opprett en systemkonto\n"
-"\n"
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 # , c-format
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
@@ -941,30 +953,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr "%s: bare root kan bruke valget -g/--group\n"
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Bruk: groupmod [valg] gruppe\n"
-"\n"
-"Valg:\n"
-"  -g, --gid GID                 bruk GID for den nye gruppa\n"
-"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
-"  -n, --new-name NY_GRUPPE  tving fram nytt navn NY_GRUPPE\n"
-"                                   på GRUPPE\n"
-"  -o, --non-unique              tillat å opprette en gruppe med duplisert\n"
-"                                GID\n"
-"  -p, --password PASSORD  bruk kryptert passord som nytt passord\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 # , c-format
 #, c-format
 msgid "%s: invalid group name '%s'\n"
@@ -1451,6 +1454,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Bruk: %s [-q] [-r] [-s] [passord [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s og -r kan ikke brukes samtidig\n"
+
 msgid "invalid password file entry"
 msgstr "ugyldig oppføring i passordfila"
 
@@ -1650,117 +1658,123 @@
 msgstr "%s: for mange grupper oppgitt (maks %d).\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: useradd [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-#| "                                home directory\n"
-#| "  -c, --comment COMMENT         set the GECOS field for the new user "
-#| "account\n"
-#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-#| "  -D, --defaults                print or save modified default useradd\n"
-#| "                                configuration\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
-#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
-#| "                                user account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-#| "  -l, --no-log-init             do not add the user to the lastlog and\n"
-#| "                                faillog databases\n"
-#| "  -m, --create-home             create home directory for the new user\n"
-#| "                                account\n"
-#| "  -M, --no-create-home          do not create user's home directory\n"
-#| "                                (overrides /etc/login.defs)\n"
-#| "  -N, --no-user-group           do not create a group with the same name "
-#| "as\n"
-#| "                                the user\n"
-#| "  -o, --non-unique              allow create user with duplicate\n"
-#| "                                (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
-#| "                                account\n"
-#| "  -r, --system                  create a system account\n"
-#| "  -s, --shell SHELL             the login shell for the new user account\n"
-#| "  -u, --uid UID                 force use the UID for the new user "
-#| "account\n"
-#| "  -U, --user-group              create a group with the same name as the "
-#| "user\n"
-#| "\n"
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Bruk: %s [input]\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+"  -s, --sha-rounds              antall SHA-runder for  SHA*\n"
+"                                kryptoalgoritmene\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Bruk: useradd [valg] KONTO\n"
-"\n"
-"Valg:\n"
-"  -b, --base-dir BASIS          basis-mappe for hjemmemappa til den nye\n"
-"                                brukerkontoen\n"
-"  -c, --comment KOMMENTAR       sett i GECOS-feltet for den nye\n"
-"                                brukerkontoen\n"
-"  -d, --home-dir HJEMME         hjemmemappe for den nye brukerkontoen\n"
-"  -D, --defaults                skriv ut eller lagre endret standardoppsett\n"
-"                                for useradd\n"
-"  -e, --expiredate DATO         angi at kontoen utgår på DATO\n"
-"  -f, --inactive INAKTIV        sett passordet inaktivt etter utløp til "
-"INAKTIV\n"
-"  -g, --gid GRUPPE              angi GRUPPE for den nye brukerkontoen\n"
-"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
-"  -k, --skel SKJELETT           oppgi en annen skel-mappe\n"
-"  -K, --key NØKKEL=VERDI        overstyrer oppsett fra /etc/login.defs\n"
-"  -m, --create-home             opprett hjemmemappe for den nye "
-"brukerkontoen\n"
-"  -M, --no-create-home        ikke opprett hjemmemappe for den nye \n"
-"                                   brukeren (overstyrer /etc/login.defs)\n"
-"  -N, --no-user-group          ikke opprett en gruppe med samme navn som\n"
-"                                   brukeren  -o, --non-unique              "
-"tillat å opprette bruker med duplisert UID\n"
-"  -p, --password PASSORD        bruk dette krypterte passordet for\n"
-"                                den nye brukerkontoen\n"
-"  -s, --shell SKALL             innloggingsskall for den nye brukerkontoen\n"
-"  -u, --uid UID                 bruk UID for den nye brukerkontoen\n"
-"  -U, --user-group           opprett en gruppe med samme navn som\n"
-"                                    brukeren\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2134,6 +2148,222 @@
 msgstr "%s: kan ikke gjenopprette %s: %s (dine endringer befinner seg i %s)\n"
 
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Bruk: faillog [valg]\n"
+#~ "\n"
+#~ "Valg:\n"
+#~ "  -a, --all                     vis faillog-oppføringer for alle brukere\n"
+#~ "  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+#~ "  -l, --lock-time SEK           etter mislykket innlogging, lås kontoen\n"
+#~ "                                i SEK sekunder\n"
+#~ "  -m, --maximum MAX             sett største antall mislykte "
+#~ "innlogginger\n"
+#~ "                                til MAX\n"
+#~ "  -r, --reset                   nullstill tellerne for mislykte "
+#~ "innlogginger\n"
+#~ "  -t, --time DAGER              vis mislykte innlogginger nyere enn "
+#~ "DAGER\n"
+#~ "  -u, --user BRUKER             vis mislykte innlogginger eller styr\n"
+#~ "                                tellene og grenseverdiene (med -r, -m\n"
+#~ "                                eller -l) bare for bruker BRUKER\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Bruk: groupadd [valg] GRUPPE\n"
+#~ "\n"
+#~ "Valg:\n"
+#~ "  -f, --force                   tving fram normal avslutning hvis den\n"
+#~ "                                oppgitte gruppa finnes fra før\n"
+#~ "  -g, --gid GID                 bruk GID for den nye gruppa\n"
+#~ "  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+#~ "  -K, --key NØKKEL=VERDI        overstyrer standardverdier\n"
+#~ "                                fra /etc/login.defs\n"
+#~ "  -o, --non-unique              tillat å opprette en gruppe med "
+#~ "duplisert\n"
+#~ "                                GID\n"
+#~ "  -p, --password PASSORD   bruk kryptert passord for den nye gruppa\n"
+#~ "  -r, --system               opprett en systemkonto\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Bruk: groupmod [valg] gruppe\n"
+#~ "\n"
+#~ "Valg:\n"
+#~ "  -g, --gid GID                 bruk GID for den nye gruppa\n"
+#~ "  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+#~ "  -n, --new-name NY_GRUPPE  tving fram nytt navn NY_GRUPPE\n"
+#~ "                                   på GRUPPE\n"
+#~ "  -o, --non-unique              tillat å opprette en gruppe med "
+#~ "duplisert\n"
+#~ "                                GID\n"
+#~ "  -p, --password PASSORD  bruk kryptert passord som nytt passord\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Usage: useradd [options] LOGIN\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~| "                                home directory\n"
+#~| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~| "account\n"
+#~| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~| "  -D, --defaults                print or save modified default useradd\n"
+#~| "                                configuration\n"
+#~| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -g, --gid GROUP               force use GROUP for the new user "
+#~| "account\n"
+#~| "  -G, --groups GROUPS           list of supplementary groups for the "
+#~| "new\n"
+#~| "                                user account\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~| "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~| "                                faillog databases\n"
+#~| "  -m, --create-home             create home directory for the new user\n"
+#~| "                                account\n"
+#~| "  -M, --no-create-home          do not create user's home directory\n"
+#~| "                                (overrides /etc/login.defs)\n"
+#~| "  -N, --no-user-group           do not create a group with the same name "
+#~| "as\n"
+#~| "                                the user\n"
+#~| "  -o, --non-unique              allow create user with duplicate\n"
+#~| "                                (non-unique) UID\n"
+#~| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~| "                                account\n"
+#~| "  -r, --system                  create a system account\n"
+#~| "  -s, --shell SHELL             the login shell for the new user "
+#~| "account\n"
+#~| "  -u, --uid UID                 force use the UID for the new user "
+#~| "account\n"
+#~| "  -U, --user-group              create a group with the same name as the "
+#~| "user\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Bruk: useradd [valg] KONTO\n"
+#~ "\n"
+#~ "Valg:\n"
+#~ "  -b, --base-dir BASIS          basis-mappe for hjemmemappa til den nye\n"
+#~ "                                brukerkontoen\n"
+#~ "  -c, --comment KOMMENTAR       sett i GECOS-feltet for den nye\n"
+#~ "                                brukerkontoen\n"
+#~ "  -d, --home-dir HJEMME         hjemmemappe for den nye brukerkontoen\n"
+#~ "  -D, --defaults                skriv ut eller lagre endret "
+#~ "standardoppsett\n"
+#~ "                                for useradd\n"
+#~ "  -e, --expiredate DATO         angi at kontoen utgår på DATO\n"
+#~ "  -f, --inactive INAKTIV        sett passordet inaktivt etter utløp til "
+#~ "INAKTIV\n"
+#~ "  -g, --gid GRUPPE              angi GRUPPE for den nye brukerkontoen\n"
+#~ "  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+#~ "  -k, --skel SKJELETT           oppgi en annen skel-mappe\n"
+#~ "  -K, --key NØKKEL=VERDI        overstyrer oppsett fra /etc/login.defs\n"
+#~ "  -m, --create-home             opprett hjemmemappe for den nye "
+#~ "brukerkontoen\n"
+#~ "  -M, --no-create-home        ikke opprett hjemmemappe for den nye \n"
+#~ "                                   brukeren (overstyrer /etc/login.defs)\n"
+#~ "  -N, --no-user-group          ikke opprett en gruppe med samme navn som\n"
+#~ "                                   brukeren  -o, --non-"
+#~ "unique              tillat å opprette bruker med duplisert UID\n"
+#~ "  -p, --password PASSORD        bruk dette krypterte passordet for\n"
+#~ "                                den nye brukerkontoen\n"
+#~ "  -s, --shell SKALL             innloggingsskall for den nye "
+#~ "brukerkontoen\n"
+#~ "  -u, --uid UID                 bruk UID for den nye brukerkontoen\n"
+#~ "  -U, --user-group           opprett en gruppe med samme navn som\n"
+#~ "                                    brukeren\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/ne.po
===================================================================
--- upstream/trunk/po/ne.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/ne.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2006-06-16 14:30+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva at hotmail.com>\n"
 "Language-Team: Nepali <info at mpp.org.np>\n"
@@ -115,6 +115,10 @@
 "अन्तिम %s मा %s थियो ।\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: अद्वितिय UID प्राप्त गर्न सकिएन\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: अद्वितिय GID प्राप्त गर्न सकिएन\n"
 
@@ -595,39 +599,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "उपयोग: अवधि {-f|-c}\n"
 
-#, fuzzy
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"उपयोग: असफल लग [options]\n"
-"\n"
-"विकल्पहरू:\n"
-"  -a, --सबै\t\t\t ले सबै प्रयोगकर्ताहरुको लागि असफल लगको रेकर्डहरू प्रदर्शन गर्दछ\n"
-"  -h, --मद्दत\t\t\t ले यो मद्दत संदेशलाई प्रदर्शन गर्छ र बन्द गर्दछ\n"
-"  -l, --ताल्चा मार्ने समय SEC\t\t ले SEC सेकेण्डमा लगइन लग खाता असफल भएपछि \n"
-"  -m, --अधिक्तम MAX\t\t ले अधिक्तम असफल लगइन काउन्टरहरू MAX मा सेट गर्दछ\n"
-"  -r, --पुन:सेट गर्नु\t\t\t ले असफल लगइनहरुको काउन्टरलाई पुन:सेट गर्दछ\n"
-"  -t, --समय DAYS\t\t ले समयको भन्दा धेरै नयाँ असफल लग रेकर्डहरू प्रदर्शन गर्दछ\n"
-"  -u, --प्रयोगकर्ता LOGIN\t\t ले असफल लगइन प्रदर्शन गर्छ वा असफल काउन्टरहरू\n"
-"\t\t\t\tर सीमाहरू (यदि -r, -m वा -l विकल्पहरू संगै प्रयोग भयो भने) मात्र संभार गर्दछ\n"
-"\t\t\t\tप्रयोगकर्ताको लागि LOGIN संगै \n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -740,34 +737,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: tty होइन\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "उपयोग: %s [आगत]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"उपयोग: groupadd [विकल्प] समूह\n"
-"\n"
-"विकल्पहरू:\n"
-"  -f, --जोड दिनुहोस्\t\t यदि निर्दिष्ट गरिएको छ भने सफल स्थिति सहित जोड दिन बन्द \n"
-"\t\t\t\tहुन्छ समूह पहिल्यै अवस्थित छ\n"
-"  -g, --gid GID\t\tनयाँ समूहको लागि GID प्रयोग गर्नुहोस्\n"
-"  -h, --मद्दत\t\t\t ले यो मद्दत संदेशलाई प्रदर्शन गर्छ र बन्द गर्छ\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\t ले नक्कली संगै समूह सिर्जना गर्न अनुमति दिन्छ\n"
-"\t\t\t\t(non-unique) GID\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -850,31 +852,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"उपयोग: groupadd [विकल्प] समूह\n"
-"\n"
-"विकल्पहरू:\n"
-"  -f, --जोड दिनुहोस्\t\t यदि निर्दिष्ट गरिएको छ भने सफल स्थिति सहित जोड दिन बन्द \n"
-"\t\t\t\tहुन्छ समूह पहिल्यै अवस्थित छ\n"
-"  -g, --gid GID\t\tनयाँ समूहको लागि GID प्रयोग गर्नुहोस्\n"
-"  -h, --मद्दत\t\t\t ले यो मद्दत संदेशलाई प्रदर्शन गर्छ र बन्द गर्छ\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\t ले नक्कली संगै समूह सिर्जना गर्न अनुमति दिन्छ\n"
-"\t\t\t\t(non-unique) GID\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "अवैध समूह नाम '%s'\n"
@@ -1357,6 +1349,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "उपयोग: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s र -r मिल्दोजुल्दो छैन\n"
+
 msgid "invalid password file entry"
 msgstr "अवैध पासवर्ड फाइल प्रविष्टि"
 
@@ -1560,71 +1557,87 @@
 msgstr "%s: अति धेरै समूहरू निर्दिष्ट गरिएको छ (max %d) ।\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "उपयोग: %s [आगत]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"उपयोग: useradd [options] LOGIN\n"
-"\n"
-"विकल्पहरू:\n"
-"  -b, --base-dir BASE_DIR\tनयाँ प्रयोगकर्ता खाताको लागि बेस डाइरेक्ट्री\n"
-"\t\t\t\tगृह डाइरेक्ट्री\n"
-"  -c, --comment COMMENT\t\tनयाँ प्रयोगकर्ता खाताको लागि GECOS फाँट सेट गर्दछ\n"
-"  -d, --home-dir HOME_DIR\t नयाँ प्रयोगकर्ता खाताको लागि गृह डाइरेक्ट्री\n"
-"  -D, --defaults\t\tपरिमार्जित पूर्वनिर्धारित थप प्रयोगकर्ता मुद्रण गर्नुहोस् वा बचत\n"
-"\t\t\t\tगर्नुहोस् कनफिगरेसन\n"
-"  -e, --expiredate EXPIRE_DATE\t ले EXPIRE_DATE मा खाता समाप्ति मिति सेट गर्दछ\n"
-"  -f, --inactive INACTIVE\tले मिति समाप्ति पछि पासवर्डलाई INACTIVE मा सेट गर्दछ\n"
-"  -g, --gid GROUP\t\tनयाँ प्रयोगकर्ता खाताको लागि GROUP प्रयोग गर्न जोड गर्दछ\n"
-"  -G, --groups GROUPS\t\t नयाँको लागि परिपूरक समूहहरुको सूचि\n"
-"\t\t\t\tप्रयोगकर्ता खाता\n"
-"  -h, --help\t\t\tयो मद्दत संदेशलाई प्रदर्शन गर्छ र बन्द गर्दछ\n"
-"  -k, --skel SKEL_DIR\t\tएउटा वैकल्पिक स्केल डाइरेक्ट्री निर्दिष्ट गर्नुहोस्\n"
-"  -K, --key KEY=VALUE\t\t /etc/login.defs पूर्वनिर्धारणहरू अधिलेखन गर्दछ\n"
-"  -m, --create-home\t\tनयाँ प्रयोगकर्ताको लागि गृह डाइरेक्ट्री सिर्जना गर्दछ\n"
-"\t\t\t\tखाता\n"
-"  -o, --non-unique\t\tनक्कली संग प्रयोगकर्ता सिर्जना गर्न अनुमति दिन्छ\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\t नयाँ प्रयोगकर्ताको लागि गुप्तिकृत पासवर्ड प्रयोग गर्दछ\n"
-"\t\t\t\tखाता\n"
-"  -s, --shell SHELL\t\t नयाँ प्रयोगकर्ता खाताको लागि लगइन शेल\n"
-"  -u, --uid UID\t\t\t नयाँ प्रयोगकर्ता खाताको लागि UID प्रयोग गर्न जोड दिन्छ\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -1963,6 +1976,171 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: पुन:भण्डारण गर्न सकिदैन %s: %s (तपाईँको परिवर्तनहरू %s मा छ)\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "उपयोग: असफल लग [options]\n"
+#~ "\n"
+#~ "विकल्पहरू:\n"
+#~ "  -a, --सबै\t\t\t ले सबै प्रयोगकर्ताहरुको लागि असफल लगको रेकर्डहरू प्रदर्शन गर्दछ\n"
+#~ "  -h, --मद्दत\t\t\t ले यो मद्दत संदेशलाई प्रदर्शन गर्छ र बन्द गर्दछ\n"
+#~ "  -l, --ताल्चा मार्ने समय SEC\t\t ले SEC सेकेण्डमा लगइन लग खाता असफल भएपछि \n"
+#~ "  -m, --अधिक्तम MAX\t\t ले अधिक्तम असफल लगइन काउन्टरहरू MAX मा सेट गर्दछ\n"
+#~ "  -r, --पुन:सेट गर्नु\t\t\t ले असफल लगइनहरुको काउन्टरलाई पुन:सेट गर्दछ\n"
+#~ "  -t, --समय DAYS\t\t ले समयको भन्दा धेरै नयाँ असफल लग रेकर्डहरू प्रदर्शन गर्दछ\n"
+#~ "  -u, --प्रयोगकर्ता LOGIN\t\t ले असफल लगइन प्रदर्शन गर्छ वा असफल काउन्टरहरू\n"
+#~ "\t\t\t\tर सीमाहरू (यदि -r, -m वा -l विकल्पहरू संगै प्रयोग भयो भने) मात्र संभार "
+#~ "गर्दछ\n"
+#~ "\t\t\t\tप्रयोगकर्ताको लागि LOGIN संगै \n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "उपयोग: groupadd [विकल्प] समूह\n"
+#~ "\n"
+#~ "विकल्पहरू:\n"
+#~ "  -f, --जोड दिनुहोस्\t\t यदि निर्दिष्ट गरिएको छ भने सफल स्थिति सहित जोड दिन "
+#~ "बन्द \n"
+#~ "\t\t\t\tहुन्छ समूह पहिल्यै अवस्थित छ\n"
+#~ "  -g, --gid GID\t\tनयाँ समूहको लागि GID प्रयोग गर्नुहोस्\n"
+#~ "  -h, --मद्दत\t\t\t ले यो मद्दत संदेशलाई प्रदर्शन गर्छ र बन्द गर्छ\n"
+#~ "  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique\t\t ले नक्कली संगै समूह सिर्जना गर्न अनुमति दिन्छ\n"
+#~ "\t\t\t\t(non-unique) GID\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "उपयोग: groupadd [विकल्प] समूह\n"
+#~ "\n"
+#~ "विकल्पहरू:\n"
+#~ "  -f, --जोड दिनुहोस्\t\t यदि निर्दिष्ट गरिएको छ भने सफल स्थिति सहित जोड दिन "
+#~ "बन्द \n"
+#~ "\t\t\t\tहुन्छ समूह पहिल्यै अवस्थित छ\n"
+#~ "  -g, --gid GID\t\tनयाँ समूहको लागि GID प्रयोग गर्नुहोस्\n"
+#~ "  -h, --मद्दत\t\t\t ले यो मद्दत संदेशलाई प्रदर्शन गर्छ र बन्द गर्छ\n"
+#~ "  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique\t\t ले नक्कली संगै समूह सिर्जना गर्न अनुमति दिन्छ\n"
+#~ "\t\t\t\t(non-unique) GID\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "उपयोग: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "विकल्पहरू:\n"
+#~ "  -b, --base-dir BASE_DIR\tनयाँ प्रयोगकर्ता खाताको लागि बेस डाइरेक्ट्री\n"
+#~ "\t\t\t\tगृह डाइरेक्ट्री\n"
+#~ "  -c, --comment COMMENT\t\tनयाँ प्रयोगकर्ता खाताको लागि GECOS फाँट सेट गर्दछ\n"
+#~ "  -d, --home-dir HOME_DIR\t नयाँ प्रयोगकर्ता खाताको लागि गृह डाइरेक्ट्री\n"
+#~ "  -D, --defaults\t\tपरिमार्जित पूर्वनिर्धारित थप प्रयोगकर्ता मुद्रण गर्नुहोस् वा "
+#~ "बचत\n"
+#~ "\t\t\t\tगर्नुहोस् कनफिगरेसन\n"
+#~ "  -e, --expiredate EXPIRE_DATE\t ले EXPIRE_DATE मा खाता समाप्ति मिति सेट "
+#~ "गर्दछ\n"
+#~ "  -f, --inactive INACTIVE\tले मिति समाप्ति पछि पासवर्डलाई INACTIVE मा सेट "
+#~ "गर्दछ\n"
+#~ "  -g, --gid GROUP\t\tनयाँ प्रयोगकर्ता खाताको लागि GROUP प्रयोग गर्न जोड गर्दछ\n"
+#~ "  -G, --groups GROUPS\t\t नयाँको लागि परिपूरक समूहहरुको सूचि\n"
+#~ "\t\t\t\tप्रयोगकर्ता खाता\n"
+#~ "  -h, --help\t\t\tयो मद्दत संदेशलाई प्रदर्शन गर्छ र बन्द गर्दछ\n"
+#~ "  -k, --skel SKEL_DIR\t\tएउटा वैकल्पिक स्केल डाइरेक्ट्री निर्दिष्ट गर्नुहोस्\n"
+#~ "  -K, --key KEY=VALUE\t\t /etc/login.defs पूर्वनिर्धारणहरू अधिलेखन गर्दछ\n"
+#~ "  -m, --create-home\t\tनयाँ प्रयोगकर्ताको लागि गृह डाइरेक्ट्री सिर्जना गर्दछ\n"
+#~ "\t\t\t\tखाता\n"
+#~ "  -o, --non-unique\t\tनक्कली संग प्रयोगकर्ता सिर्जना गर्न अनुमति दिन्छ\n"
+#~ "\t\t\t\t(non-unique) UID\n"
+#~ "  -p, --password PASSWORD\t नयाँ प्रयोगकर्ताको लागि गुप्तिकृत पासवर्ड प्रयोग "
+#~ "गर्दछ\n"
+#~ "\t\t\t\tखाता\n"
+#~ "  -s, --shell SHELL\t\t नयाँ प्रयोगकर्ता खाताको लागि लगइन शेल\n"
+#~ "  -u, --uid UID\t\t\t नयाँ प्रयोगकर्ता खाताको लागि UID प्रयोग गर्न जोड दिन्छ\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "समाप्तिलाई पासवर्ड सेट गरियो ।"
 

Modified: upstream/trunk/po/nl.po
===================================================================
--- upstream/trunk/po/nl.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/nl.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2007-11-25 21:11+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -114,6 +114,10 @@
 "De laatste mislukte poging %s was op %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: kan geen unieke UID verkrijgen\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: kan geen unieke GID verkrijgen\n"
 
@@ -611,59 +615,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Gebruik: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Gebruik: faillog [opties]\n"
-"\n"
-"Opties:\n"
-"  -a, --all             toon de faillog-records van alle gebruikers\n"
-"  -h, --help            toon dit bericht en sluit af\n"
-"  -l, --lock-time SEC   Bevries accounts SEC seconden na mislukt aanmelden\n"
-"  -m, --maximum MAX     stel maximaal aantal mislukte aanmeldingen in op "
-"MAX\n"
-"  -r, --reset           herbegin de tellers voor mislukte aanmeldingen\n"
-"  -t, --time AANTAL     geef alle faillog records van de laatste AANTAL\n"
-"                        dagen weer\n"
-"   -u, --user LOGIN     geef faillog-record weer en onderhoud mislukking-\n"
-"                        tellers en limieten (indien de -r, -m or -l opties\n"
-"                        gebruikt worden), maar enkel voor gebruiker LOGIN\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -776,35 +753,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Is geen tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Gebruik: %s [invoer]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Gebruik: groupadd [opties] GROEP\n"
-"\n"
-"Opties:\n"
-"  -f, --force                   succesvolle afsluitstatus afdwingen ook\n"
-"                                als de opgegeven groep reeds bestaat\n"
-"  -g, --gid GID                 nieuwe groep krijgt de opgegeven GID\n"
-"  -h, --help                    geef deze boodschap weer en sluit af\n"
-"  -K, --key SLEUTEL=WAARDE      overstijgt standaardwaarden\n"
-"                                uit /etc/login.defs\n"
-"  -o, --non-unique              laat aanmaken van groep met dubbele\n"
-"                                (niet-unieke) GID toe\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -888,29 +869,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Gebruik: groupmod [opties] GROEP\n"
-"\n"
-"Opties:\n"
-"  -g, --gid GID                 groep krijgt deze nieuwe GID\n"
-"  -h, --help                    geef deze boodschap weer en sluit af\n"
-"  -n, --new-name NIEUWE_NAAM    groep krijgt deze nieuwe naam\n"
-"  -o, --non-unique              laat aanmaken van groep met dubbele\n"
-"                                (niet-unieke) GID toe\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "ongeldige groepsnaam '%s'\n"
@@ -1431,6 +1404,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Gebruik: %s [-q] [-r] [-s] [wachtwoord [shaduw]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s en -r zijn niet compatibel\n"
+
 msgid "invalid password file entry"
 msgstr "ongeldige ingang in het wachtwoordbestand"
 
@@ -1634,77 +1612,87 @@
 msgstr "%s: te veel groepen gespecificeerd (max %d).\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Gebruik: %s [invoer]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Gebruik: useradd [opties] GEBRUIKERSNAAM\n"
-"\n"
-"Opties:\n"
-"  -b, --base-dir BASIS_MAP      basismap voor de thuismap van de nieuwe\n"
-"                                gebruikersaccount\n"
-"  -c, --comment OPMERKING       stel het GECOS-veld voor de nieuwe\n"
-"                                gebruikersaccount in\n"
-"  -d, --home-dir THUIS_MAP      thuismap voor de nieuwe gebruikersaccount\n"
-"  -D, --defaults                print de aangepaste useradd-configuratie,\n"
-"                                of sla deze op\n"
-"  -e, --expiredate VERVALDATUM  stel de vervaldatum in op VERVALDATUM\n"
-"  -f, --inactive INACTIVE       stel het 'wachtwoord inactief na verval'\n"
-"                                in op INACTIEF\n"
-"  -g, --gid GROEP               dwing gebruik van GROEP voor de nieuwe\n"
-"                                gebruikersaccount af\n"
-"  -G, --groups GROEPEN          lijst met aanvullende groepen voor de\n"
-"                                gebruikersaccount\n"
-"  -h, --help                    geef deze boodschap weer en sluit af\n"
-"  -k, --skel SKEL_MAP           gebruik een alternatief map-skelet\n"
-"  -K, --key SLEUTEL=WAARDE      overstijg de standaardwaarden uit\n"
-"                                /etc/login.defs\n"
-"  -m, --create-home             maak een thuismap aan voor de nieuwe\n"
-"                                gebruikersaccount\n"
-"  -o, --non-unique              laat het aanmaken van gebruikersaccounts\n"
-"                                met een dubbele (niet-unieke) UID toe\n"
-"  -p, --password WACHTWOORD     gebruik versleuteld wachtwoord voor de\n"
-"                                nieuwe gebruikersaccount\n"
-"  -s, --shell SHELL             gebruik gegeven shell als aanmeld-shell\n"
-"                                voor de gebruikersaccount\n"
-"  -u, --uid UID                 gebruik UID voor de nieuwe "
-"gebruikersaccount\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2056,6 +2044,196 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: kan %s niet herstellen: %s (uw aanpassingen staan in %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Gebruik: faillog [opties]\n"
+#~ "\n"
+#~ "Opties:\n"
+#~ "  -a, --all             toon de faillog-records van alle gebruikers\n"
+#~ "  -h, --help            toon dit bericht en sluit af\n"
+#~ "  -l, --lock-time SEC   Bevries accounts SEC seconden na mislukt "
+#~ "aanmelden\n"
+#~ "  -m, --maximum MAX     stel maximaal aantal mislukte aanmeldingen in op "
+#~ "MAX\n"
+#~ "  -r, --reset           herbegin de tellers voor mislukte aanmeldingen\n"
+#~ "  -t, --time AANTAL     geef alle faillog records van de laatste AANTAL\n"
+#~ "                        dagen weer\n"
+#~ "   -u, --user LOGIN     geef faillog-record weer en onderhoud "
+#~ "mislukking-\n"
+#~ "                        tellers en limieten (indien de -r, -m or -l "
+#~ "opties\n"
+#~ "                        gebruikt worden), maar enkel voor gebruiker "
+#~ "LOGIN\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Gebruik: groupadd [opties] GROEP\n"
+#~ "\n"
+#~ "Opties:\n"
+#~ "  -f, --force                   succesvolle afsluitstatus afdwingen ook\n"
+#~ "                                als de opgegeven groep reeds bestaat\n"
+#~ "  -g, --gid GID                 nieuwe groep krijgt de opgegeven GID\n"
+#~ "  -h, --help                    geef deze boodschap weer en sluit af\n"
+#~ "  -K, --key SLEUTEL=WAARDE      overstijgt standaardwaarden\n"
+#~ "                                uit /etc/login.defs\n"
+#~ "  -o, --non-unique              laat aanmaken van groep met dubbele\n"
+#~ "                                (niet-unieke) GID toe\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Gebruik: groupmod [opties] GROEP\n"
+#~ "\n"
+#~ "Opties:\n"
+#~ "  -g, --gid GID                 groep krijgt deze nieuwe GID\n"
+#~ "  -h, --help                    geef deze boodschap weer en sluit af\n"
+#~ "  -n, --new-name NIEUWE_NAAM    groep krijgt deze nieuwe naam\n"
+#~ "  -o, --non-unique              laat aanmaken van groep met dubbele\n"
+#~ "                                (niet-unieke) GID toe\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Gebruik: useradd [opties] GEBRUIKERSNAAM\n"
+#~ "\n"
+#~ "Opties:\n"
+#~ "  -b, --base-dir BASIS_MAP      basismap voor de thuismap van de nieuwe\n"
+#~ "                                gebruikersaccount\n"
+#~ "  -c, --comment OPMERKING       stel het GECOS-veld voor de nieuwe\n"
+#~ "                                gebruikersaccount in\n"
+#~ "  -d, --home-dir THUIS_MAP      thuismap voor de nieuwe "
+#~ "gebruikersaccount\n"
+#~ "  -D, --defaults                print de aangepaste useradd-"
+#~ "configuratie,\n"
+#~ "                                of sla deze op\n"
+#~ "  -e, --expiredate VERVALDATUM  stel de vervaldatum in op VERVALDATUM\n"
+#~ "  -f, --inactive INACTIVE       stel het 'wachtwoord inactief na verval'\n"
+#~ "                                in op INACTIEF\n"
+#~ "  -g, --gid GROEP               dwing gebruik van GROEP voor de nieuwe\n"
+#~ "                                gebruikersaccount af\n"
+#~ "  -G, --groups GROEPEN          lijst met aanvullende groepen voor de\n"
+#~ "                                gebruikersaccount\n"
+#~ "  -h, --help                    geef deze boodschap weer en sluit af\n"
+#~ "  -k, --skel SKEL_MAP           gebruik een alternatief map-skelet\n"
+#~ "  -K, --key SLEUTEL=WAARDE      overstijg de standaardwaarden uit\n"
+#~ "                                /etc/login.defs\n"
+#~ "  -m, --create-home             maak een thuismap aan voor de nieuwe\n"
+#~ "                                gebruikersaccount\n"
+#~ "  -o, --non-unique              laat het aanmaken van gebruikersaccounts\n"
+#~ "                                met een dubbele (niet-unieke) UID toe\n"
+#~ "  -p, --password WACHTWOORD     gebruik versleuteld wachtwoord voor de\n"
+#~ "                                nieuwe gebruikersaccount\n"
+#~ "  -s, --shell SHELL             gebruik gegeven shell als aanmeld-shell\n"
+#~ "                                voor de gebruikersaccount\n"
+#~ "  -u, --uid UID                 gebruik UID voor de nieuwe "
+#~ "gebruikersaccount\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "Uw wachtwoord gaat vervallen."
 

Modified: upstream/trunk/po/nn.po
===================================================================
--- upstream/trunk/po/nn.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/nn.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2004-06-03 21:41+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll at skulelinux.no>\n"
 "Language-Team: Norwegian (Nynorsk) <i18n-nn at lister.ping.uio.no>\n"
@@ -109,6 +109,10 @@
 msgstr[1] "%d %s sidan førre innlogging. Førre var %s på %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: klarer ikkje få unikt gid\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: klarer ikkje få unikt gid\n"
 
@@ -559,25 +563,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Bruk: expiry {-f|-c}\n"
 
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -690,22 +701,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Ikkje ein tty\n"
 
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Bruk: %s [inndata]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -787,19 +815,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "ugyldig gruppenamn «%s»\n"
@@ -1248,6 +1278,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Bruk: %s [-q] [-r] [-s] [passord [skugge]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s og -r er inkompatible\n"
+
 msgid "invalid password file entry"
 msgstr "Ugyldig oppføring i passordfila"
 
@@ -1438,45 +1473,87 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: for mange grupper spesifisert (maks %d).\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Bruk: %s [inndata]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
 
 msgid ""

Modified: upstream/trunk/po/pl.po
===================================================================
--- upstream/trunk/po/pl.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/pl.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2007-11-25 20:53+0100\n"
 "Last-Translator: Tomasz Kłoczko <kloczek at pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -119,6 +119,10 @@
 "Ostatnie logowanie: dnia %s na terminalu %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: nie można uzyskać niepowtarzalnego UID\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: nie można uzyskać niepowtarzalnego GID\n"
 
@@ -620,59 +624,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Użycie: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Użycie: faillog [opcje]\n"
-"\n"
-"Opcje:\n"
-"  -a, --all             wyświetlaj rekordy failloga dla wszystkich "
-"użytkowników\n"
-"  -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
-"  -l, --lock-time SEK   ustaw na SEK sekund blokadę konta po nieudanym\n"
-"                        logowaniu\n"
-"  -m, --maximum MAX     ustaw maksymalną ilość niepoprawnych logowań na MAX\n"
-"  -r, --reset           wyzeruj licznik niepoprawnych logowań\n"
-"  -t, --time DNI        wyświetlaj rekordy nie starsze niż DNI\n"
-"  -u, --user LOGIN      wyświetlaj rekordy lub zarządzaj licznikami\n"
-"                        i limitami faillog (w połaczeniu z opcjami -r,\n"
-"                        -m lub -l) tylko dla użytkownika o loginie LOGIN\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -785,34 +762,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: To nie tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Użycie: %s [wejście]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Użycie: groupadd [opcje] GRUPA\n"
-"\n"
-"Opcje:\n"
-"  -f, --force                wymyś zakończenie programu z poprawnym\n"
-"                             statusem jeżeli grupa już istnieje\n"
-"  -g, --gid GID              użyj GID dla tworzonej grupy\n"
-"  -h, --help                 wyświetlenie tego opisu i zakończenie "
-"działania\n"
-"  -K, --key KLUCZ=WARTOŚĆ    przysłoń wartość domyślną z /etc/login.defs\n"
-"  -o, --non-unique           pozwól na utworzenie grupy z nieunikalnym GID\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -896,31 +878,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Użycie: groupmod [opcje] GRUPA\n"
-"\n"
-"Opcje:\n"
-"  -g, --gid GID                 wymuś użycie nowego GID dla grupy GRUPA\n"
-"  -h, --help                    wyświetlenie tego opisu i zakończenie "
-"działania\n"
-"  -n, --new-name NOWA_GRUPA     wymuś użycie nazwy grupy NOWA_GRUPA zamiast\n"
-"                                GRUPA\n"
-"  -o, --non-unique              pozwól na utworzenie grupy z nieunikalnym "
-"GID\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "nieprawidłowa nazwa grupy '%s'\n"
@@ -1435,6 +1407,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Użycie: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s i -r są niekompatybilne\n"
+
 msgid "invalid password file entry"
 msgstr "nieprawidłowy wpis do pliku z hasłami"
 
@@ -1636,76 +1613,87 @@
 msgstr "%s: podano zbyt wiele grup (maks %d).\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Użycie: %s [wejście]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Użycie: useradd [opcje] LOGIN\n"
-"\n"
-"Opcje:\n"
-"  -b, --base-dir KAT_BAZOWY     katalog bazowy dla katalogu domowego nowo\n"
-"                                tworzonego konta\n"
-"  -c, --comment COMMENT         ustaw pole komentarza (GECOS) dla nowo\n"
-"                                tworzonego konta\n"
-"  -d, --home-dir KAT_DOMOWY     katalog domowy dla nowo tworzonego konta\n"
-"  -D, --defaults                wypisz lub zapisz domyślną konfigurację\n"
-"                                programu useradd\n"
-"  -e, --expiredate DATA_WAŻN.   ustawia datę wazności dla nowo tworzonego\n"
-"                                konta na DATA_WAŻN.\n"
-"  -f, --inactive NIEAKTYWNE     ustwia liczbę dni po których konto jest\n"
-"                                blokowane na NIEAKTYWNE\n"
-"  -h, --help                    wyświetlenie tego opisu i zakończenie\n"
-"                                działania\n"
-"  -g, --gid GROUP               wymuś użycie konkretnej grupy dla nowo\n"
-"                                tworzonego konta\n"
-"  -G, --groups GROUPS           lista dodatkowych grup dla nowo tworzonego\n"
-"                                konta\n"
-"  -k, --skel SKEL_DIR           podaj alternatywną ścieżkę do katalogu skel\n"
-"  -K, --key KLUCZ=WARTOŚĆ       przysłoń wartość domyślną z /etc/login.defs\n"
-"  -m, --create-home             twórz katalog domowy dla nowego użytkownika\n"
-"  -o, --non-unique              pozwól na utworzenie konta z nieunikalnym "
-"UID\n"
-"  -p, --password PASSWORD       użyj zakodowane hasło dla nowego tworzonego\n"
-"                                konta\n"
-"  -s, --shell SHELL             tshell dla nowo tworzonego konta\n"
-"  -u, --uid UID                 wymuś użycie konkretnego UID dla nowo\n"
-"                                tworzonego konta\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2050,6 +2038,200 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: nie można odzyskać %s: %s (twoje zmiany są w %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Użycie: faillog [opcje]\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ "  -a, --all             wyświetlaj rekordy failloga dla wszystkich "
+#~ "użytkowników\n"
+#~ "  -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
+#~ "  -l, --lock-time SEK   ustaw na SEK sekund blokadę konta po nieudanym\n"
+#~ "                        logowaniu\n"
+#~ "  -m, --maximum MAX     ustaw maksymalną ilość niepoprawnych logowań na "
+#~ "MAX\n"
+#~ "  -r, --reset           wyzeruj licznik niepoprawnych logowań\n"
+#~ "  -t, --time DNI        wyświetlaj rekordy nie starsze niż DNI\n"
+#~ "  -u, --user LOGIN      wyświetlaj rekordy lub zarządzaj licznikami\n"
+#~ "                        i limitami faillog (w połaczeniu z opcjami -r,\n"
+#~ "                        -m lub -l) tylko dla użytkownika o loginie LOGIN\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Użycie: groupadd [opcje] GRUPA\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ "  -f, --force                wymyś zakończenie programu z poprawnym\n"
+#~ "                             statusem jeżeli grupa już istnieje\n"
+#~ "  -g, --gid GID              użyj GID dla tworzonej grupy\n"
+#~ "  -h, --help                 wyświetlenie tego opisu i zakończenie "
+#~ "działania\n"
+#~ "  -K, --key KLUCZ=WARTOŚĆ    przysłoń wartość domyślną z /etc/login.defs\n"
+#~ "  -o, --non-unique           pozwól na utworzenie grupy z nieunikalnym "
+#~ "GID\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Użycie: groupmod [opcje] GRUPA\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ "  -g, --gid GID                 wymuś użycie nowego GID dla grupy GRUPA\n"
+#~ "  -h, --help                    wyświetlenie tego opisu i zakończenie "
+#~ "działania\n"
+#~ "  -n, --new-name NOWA_GRUPA     wymuś użycie nazwy grupy NOWA_GRUPA "
+#~ "zamiast\n"
+#~ "                                GRUPA\n"
+#~ "  -o, --non-unique              pozwól na utworzenie grupy z nieunikalnym "
+#~ "GID\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Użycie: useradd [opcje] LOGIN\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ "  -b, --base-dir KAT_BAZOWY     katalog bazowy dla katalogu domowego "
+#~ "nowo\n"
+#~ "                                tworzonego konta\n"
+#~ "  -c, --comment COMMENT         ustaw pole komentarza (GECOS) dla nowo\n"
+#~ "                                tworzonego konta\n"
+#~ "  -d, --home-dir KAT_DOMOWY     katalog domowy dla nowo tworzonego konta\n"
+#~ "  -D, --defaults                wypisz lub zapisz domyślną konfigurację\n"
+#~ "                                programu useradd\n"
+#~ "  -e, --expiredate DATA_WAŻN.   ustawia datę wazności dla nowo "
+#~ "tworzonego\n"
+#~ "                                konta na DATA_WAŻN.\n"
+#~ "  -f, --inactive NIEAKTYWNE     ustwia liczbę dni po których konto jest\n"
+#~ "                                blokowane na NIEAKTYWNE\n"
+#~ "  -h, --help                    wyświetlenie tego opisu i zakończenie\n"
+#~ "                                działania\n"
+#~ "  -g, --gid GROUP               wymuś użycie konkretnej grupy dla nowo\n"
+#~ "                                tworzonego konta\n"
+#~ "  -G, --groups GROUPS           lista dodatkowych grup dla nowo "
+#~ "tworzonego\n"
+#~ "                                konta\n"
+#~ "  -k, --skel SKEL_DIR           podaj alternatywną ścieżkę do katalogu "
+#~ "skel\n"
+#~ "  -K, --key KLUCZ=WARTOŚĆ       przysłoń wartość domyślną z /etc/login."
+#~ "defs\n"
+#~ "  -m, --create-home             twórz katalog domowy dla nowego "
+#~ "użytkownika\n"
+#~ "  -o, --non-unique              pozwól na utworzenie konta z nieunikalnym "
+#~ "UID\n"
+#~ "  -p, --password PASSWORD       użyj zakodowane hasło dla nowego "
+#~ "tworzonego\n"
+#~ "                                konta\n"
+#~ "  -s, --shell SHELL             tshell dla nowo tworzonego konta\n"
+#~ "  -u, --uid UID                 wymuś użycie konkretnego UID dla nowo\n"
+#~ "                                tworzonego konta\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "Hasłu zaznaczone jako przeterminowane."
 

Modified: upstream/trunk/po/pt.po
===================================================================
--- upstream/trunk/po/pt.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/pt.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2009-04-19 10:32+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -113,6 +113,13 @@
 "%d falhas desde o último login.\n"
 "O último foi %s em %s.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: Can't get unique system UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr ""
+"%s: Não foi possível obter um UID de sistema único (não existem mais UIDs "
+"disponíveis)\n"
+
 #, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr ""
@@ -599,43 +606,38 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Utilização: expiry {-f|-c}\n"
 
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+"  -Z, --selinux-user\t\t novo mapeamento de utilizador SELinux para a conta "
+"do utilizador\n"
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Utilização: faillog [opções]\n"
-"\n"
-"Opções:\n"
-"  -a, --all                     mostrar os registos de faillog para todos\n"
-"                                os utilizadores\n"
-"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
-"  -l, --lock-time SEG           após login falhado bloquear conta por\n"
-"                                SEG segundos\n"
-"  -m, --maximum MAX             definir contadores de máximo de logins\n"
-"                                falhados para MAX\n"
-"  -r, --reset                   esvaziar os contadores de login falhados\n"
-"  -t, --time DIAS               mostrar registos do faillog mais recentes\n"
-"                                do que DIAS\n"
-"  -u, --user LOGIN              mostra o registo de faillog ou contadores\n"
-"\t\t\t\t de falhas mantidos e limites (se utilizado\n"
-"\t\t\t\t com as opções -r, -m ou -l) apenas para o\n"
-"                                utilizador com LOGIN\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
@@ -760,37 +762,62 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Não é um tty\n"
 
+#, c-format
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
+"                                de encriptação SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+"  -Z, --selinux-user\t\t novo mapeamento de utilizador SELinux para a conta "
+"do utilizador\n"
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Utilização: groupadd [opções] GRUPO\n"
-"\n"
-"Opções:\n"
-"  -f, --force                   forçar sair com estado de sucesso se o\n"
-"                                grupo especificado já existir\n"
-"  -g, --gid GID                 utilizar GID para o novo grupo\n"
-"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
-"  -k, --key KEY=VALOR           ultrapassar os valores pré-definidos em\n"
-"                                /etc/login.defs\n"
-"  -o, --non-unique              permitir criar grupo com GID duplicado\n"
-"                                (não-único)\n"
-"  -p, --password PALAVRA-PASSE  utilizar a palavra-passe encriptada para o\n"
-"                                novo grupo\n"
-"  -r, --system                  criar uma conta de sistema\n"
-"\n"
+"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
+"                                de encriptação SHA*\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+"  -Z, --selinux-user\t\t novo mapeamento de utilizador SELinux para a conta "
+"do utilizador\n"
+
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: '%s' não é um nome válido para o grupo\n"
@@ -879,30 +906,27 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr "%s: apenas o root pode utilizar a opção -g/--group\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+"  -Z, --selinux-user\t\t novo mapeamento de utilizador SELinux para a conta "
+"do utilizador\n"
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Utilização: groupmod [opções] GRUPO\n"
-"\n"
-"Opções:\n"
-"  -g, --gid GID                 forçar utilizar novo GID pelo GRUPO\n"
-"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
-"  -n, --new-name NOVO_GRUPO     forçar utilizar NOVO_GRUPO pelo GRUPO\n"
-"  -o, --non-unique              permitir utilizar, pelo GRUPO, GIDs\n"
-"                                duplicados (não-únicos)\n"
-"  -p, --password PALAVRA-PASSE  utilizar palavra-passe encriptada para a\n"
-"                                nova palavra-passe\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: nome de grupo '%s' inválido\n"
@@ -1396,6 +1420,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Utilização: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s e -r são incompatíveis\n"
+
 msgid "invalid password file entry"
 msgstr "entrada no ficheiro de palavras-passe inválida"
 
@@ -1593,83 +1622,136 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
+"                                de encriptação SHA*\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
+"                                de encriptação SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
+"                                de encriptação SHA*\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
+"                                de encriptação SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+"  -Z, --selinux-user\t\t novo mapeamento de utilizador SELinux para a conta "
+"do utilizador\n"
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
+"                                de encriptação SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
+"                                de encriptação SHA*\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+"  -Z, --selinux-user\t\t novo mapeamento de utilizador SELinux para a conta "
+"do utilizador\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+"  -Z, --selinux-user\t\t novo mapeamento de utilizador SELinux para a conta "
+"do utilizador\n"
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Utilização: useradd [opções] LOGIN\n"
-"\n"
-"Opções:\n"
-"  -b, --base-dir BASE_DIR       directório base para o directório home\n"
-"                                da conta do novo utilizador\n"
-"  -c, --comment COMENTÁRIO      define o campo GECOS para a conta do novo\n"
-"                                utilizador\n"
-"  -d, --home-dir HOME_DIR       directório home para a conta do novo\n"
-"                                utilizador\n"
-"  -D, --defaults                mostrar ou gravar a configuração\n"
-"                                pré-definida alterada do useradd\n"
-"  -e, --expiredate EXPIRE_DATE  define para EXPIRE_DATE a data de \t\t\t\t "
-"caducidade da conta\n"
-"  -f, --inactive INACTIVA       definir para INACTIVA o número de dias após\n"
-"                                os quais uma palavra-passe caducada passa\n"
-"                                a inactiva\n"
-"  -g, --gid GRUPO               forçar a utilização do GRUPO para a conta\n"
-"\t\t\t\t do novo utilizador\n"
-"  -G, --groups GRUPOS           listar grupos adicionais para a conta\n"
-"                                do novo utilizador\n"
-"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
-"  -k, --skel SKEL_DIR           especificar um directório SKEL alternativo\n"
-"  -K, --key KEY=VALUE           ultrapassar as pré-definições de\n"
-"\t\t\t\t /etc/login.defs\n"
-"  -l, --no-log-init             não acrescentar o utilizador às bases de\n"
-"                                dados lastlog e faillog\n"
-"  -m, --create-home             criar directório home para a conta\n"
-"                                do novo utilizador\n"
-"  -M, no-create-home\t\t não criar o directório home para o\n"
-"\t\t\t \t utilizador (ultrapassa /etc/login.defs)\n"
-"  -o, --non-unique              deixar criar utilizador com UID duplicado\n"
-"                                (não-único)\n"
-"  -p, --password PALAVRA-PASSE  utilizar palavra-passe encriptada para a\n"
-"                                conta do novo utilizador\n"
-"  -r, --system                  criar uma conta de sistema\n"
-"  -s, --shell SHELL             shell de login para a conta do novo\n"
-"\t\t\t\t utilizador\n"
-"  -u, --uid UID                 forçar a utilização do UID para a conta\n"
-"\t\t\t\t do novo utilizador\n"
-"  -U, --user-group              criar um grupo com o mesmo nome do\n"
-"\t\t\t\t utilizador\n"
-"%s\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2026,6 +2108,195 @@
 msgstr "%s: não é possível restaurar %s: %s (a suas alterações estão em %s)\n"
 
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Utilização: faillog [opções]\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -a, --all                     mostrar os registos de faillog para "
+#~ "todos\n"
+#~ "                                os utilizadores\n"
+#~ "  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+#~ "  -l, --lock-time SEG           após login falhado bloquear conta por\n"
+#~ "                                SEG segundos\n"
+#~ "  -m, --maximum MAX             definir contadores de máximo de logins\n"
+#~ "                                falhados para MAX\n"
+#~ "  -r, --reset                   esvaziar os contadores de login falhados\n"
+#~ "  -t, --time DIAS               mostrar registos do faillog mais "
+#~ "recentes\n"
+#~ "                                do que DIAS\n"
+#~ "  -u, --user LOGIN              mostra o registo de faillog ou "
+#~ "contadores\n"
+#~ "\t\t\t\t de falhas mantidos e limites (se utilizado\n"
+#~ "\t\t\t\t com as opções -r, -m ou -l) apenas para o\n"
+#~ "                                utilizador com LOGIN\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Utilização: groupadd [opções] GRUPO\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -f, --force                   forçar sair com estado de sucesso se o\n"
+#~ "                                grupo especificado já existir\n"
+#~ "  -g, --gid GID                 utilizar GID para o novo grupo\n"
+#~ "  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+#~ "  -k, --key KEY=VALOR           ultrapassar os valores pré-definidos em\n"
+#~ "                                /etc/login.defs\n"
+#~ "  -o, --non-unique              permitir criar grupo com GID duplicado\n"
+#~ "                                (não-único)\n"
+#~ "  -p, --password PALAVRA-PASSE  utilizar a palavra-passe encriptada para "
+#~ "o\n"
+#~ "                                novo grupo\n"
+#~ "  -r, --system                  criar uma conta de sistema\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Utilização: groupmod [opções] GRUPO\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -g, --gid GID                 forçar utilizar novo GID pelo GRUPO\n"
+#~ "  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+#~ "  -n, --new-name NOVO_GRUPO     forçar utilizar NOVO_GRUPO pelo GRUPO\n"
+#~ "  -o, --non-unique              permitir utilizar, pelo GRUPO, GIDs\n"
+#~ "                                duplicados (não-únicos)\n"
+#~ "  -p, --password PALAVRA-PASSE  utilizar palavra-passe encriptada para a\n"
+#~ "                                nova palavra-passe\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Utilização: useradd [opções] LOGIN\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -b, --base-dir BASE_DIR       directório base para o directório home\n"
+#~ "                                da conta do novo utilizador\n"
+#~ "  -c, --comment COMENTÁRIO      define o campo GECOS para a conta do "
+#~ "novo\n"
+#~ "                                utilizador\n"
+#~ "  -d, --home-dir HOME_DIR       directório home para a conta do novo\n"
+#~ "                                utilizador\n"
+#~ "  -D, --defaults                mostrar ou gravar a configuração\n"
+#~ "                                pré-definida alterada do useradd\n"
+#~ "  -e, --expiredate EXPIRE_DATE  define para EXPIRE_DATE a data de \t\t\t"
+#~ "\t caducidade da conta\n"
+#~ "  -f, --inactive INACTIVA       definir para INACTIVA o número de dias "
+#~ "após\n"
+#~ "                                os quais uma palavra-passe caducada "
+#~ "passa\n"
+#~ "                                a inactiva\n"
+#~ "  -g, --gid GRUPO               forçar a utilização do GRUPO para a "
+#~ "conta\n"
+#~ "\t\t\t\t do novo utilizador\n"
+#~ "  -G, --groups GRUPOS           listar grupos adicionais para a conta\n"
+#~ "                                do novo utilizador\n"
+#~ "  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+#~ "  -k, --skel SKEL_DIR           especificar um directório SKEL "
+#~ "alternativo\n"
+#~ "  -K, --key KEY=VALUE           ultrapassar as pré-definições de\n"
+#~ "\t\t\t\t /etc/login.defs\n"
+#~ "  -l, --no-log-init             não acrescentar o utilizador às bases de\n"
+#~ "                                dados lastlog e faillog\n"
+#~ "  -m, --create-home             criar directório home para a conta\n"
+#~ "                                do novo utilizador\n"
+#~ "  -M, no-create-home\t\t não criar o directório home para o\n"
+#~ "\t\t\t \t utilizador (ultrapassa /etc/login.defs)\n"
+#~ "  -o, --non-unique              deixar criar utilizador com UID "
+#~ "duplicado\n"
+#~ "                                (não-único)\n"
+#~ "  -p, --password PALAVRA-PASSE  utilizar palavra-passe encriptada para a\n"
+#~ "                                conta do novo utilizador\n"
+#~ "  -r, --system                  criar uma conta de sistema\n"
+#~ "  -s, --shell SHELL             shell de login para a conta do novo\n"
+#~ "\t\t\t\t utilizador\n"
+#~ "  -u, --uid UID                 forçar a utilização do UID para a conta\n"
+#~ "\t\t\t\t do novo utilizador\n"
+#~ "  -U, --user-group              criar um grupo com o mesmo nome do\n"
+#~ "\t\t\t\t utilizador\n"
+#~ "%s\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/pt_BR.po
===================================================================
--- upstream/trunk/po/pt_BR.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/pt_BR.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2008-03-20 12:40-0300\n"
 "Last-Translator: leoblink182 <leorock182 at gmail.com>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -115,6 +115,10 @@
 "O último foi %s em %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s : não foi possível obter UID único\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s : não foi possível obter GID único\n"
 
@@ -608,57 +612,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Uso : expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Uso: faillog [opções]\n"
-"\n"
-"Opções:\n"
-"  -a, --all             exibir registros faillog para todos os usuários\n"
-"  -h, --help            exibiri esta mensagem de ajuda e finalizar\n"
-"  -l, --lock-time SEG   após falha de login travar conta por SEG segundos\n"
-"  -m, --maximum MAX     define contadores de logins falhos para MAX\n"
-"  -r, --reset           zerar os contadores de falhas de login\n"
-"  -t, --time DIAS       exibir registros faillog mais recentes que DIAS\n"
-"  -u, --user LOGIN      exibir registros faillog ou manter somente\n"
-"                        contadores de falhas e limites (caso usado com\n"
-"                        as opções -r, -m ou -l) para usuário com LOGIN\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -771,34 +750,51 @@
 msgid "%s: Not a tty\n"
 msgstr "%s : Não é um tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Uso : %s [entrada]\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+"-s, --sha-rounds              Numeros de SHA rodadas para a SHA *\n"
+"                                algoritmos encriptados\n"
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Uso: groupadd [opções] grupo\n"
-"\n"
-"Opções:\n"
-"  -f, --force                   forçar sair com estado de sucesso caso\n"
-"                                grupo especificado já exista\n"
-"  -g, --gid GID                 utilizar GID para o novo grupo\n"
-"  -h, --help                    exibir esta mensagem de ajuda e finalizar\n"
-"  -K, --key CHAVE=VALOR         sobrepõe os padrões em /etc/login.defs\n"
-"  -o, --non-unique              permiti criar grupo com GID duplicado\n"
-"                                (não-único)\n"
-"\n"
+"-s, --sha-rounds              Numeros de SHA rodadas para a SHA *\n"
+"                                algoritmos encriptados\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -881,31 +877,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Uso: groupadd [opções] grupo\n"
-"\n"
-"Opções:\n"
-"  -f, --force                   forçar sair com estado de sucesso caso\n"
-"                                grupo especificado já exista\n"
-"  -g, --gid GID                 utilizar GID para o novo grupo\n"
-"  -h, --help                    exibir esta mensagem de ajuda e finalizar\n"
-"  -K, --key CHAVE=VALOR         sobrepõe os padrões em /etc/login.defs\n"
-"  -o, --non-unique              permiti criar grupo com GID duplicado\n"
-"                                (não-único)\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "nome de grupo `%s' inválido\n"
@@ -1398,6 +1384,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Uso : %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s : -s e -r são incompatíveis\n"
+
 msgid "invalid password file entry"
 msgstr "entrada de arquivo de senha inválida"
 
@@ -1601,78 +1592,123 @@
 msgstr "%s : muitos grupos especificados *máimo %d).\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Uso : %s [entrada]\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+"-s, --sha-rounds              Numeros de SHA rodadas para a SHA *\n"
+"                                algoritmos encriptados\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+"-s, --sha-rounds              Numeros de SHA rodadas para a SHA *\n"
+"                                algoritmos encriptados\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+"-s, --sha-rounds              Numeros de SHA rodadas para a SHA *\n"
+"                                algoritmos encriptados\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+"-s, --sha-rounds              Numeros de SHA rodadas para a SHA *\n"
+"                                algoritmos encriptados\n"
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+"-s, --sha-rounds              Numeros de SHA rodadas para a SHA *\n"
+"                                algoritmos encriptados\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+"-s, --sha-rounds              Numeros de SHA rodadas para a SHA *\n"
+"                                algoritmos encriptados\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Uso: useradd [opções] LOGIN\n"
-"\n"
-"Opções:\n"
-"  -b, --base-dir DIR_BASE       diretório base para o diretório pessoal\n"
-"                                da nova conta de usuário\n"
-"  -c, --comment COMENTÁRIO      define o campo GECOS para a nova conta de\n"
-"                                usuário\n"
-"  -d, --home-dir DIR_PESSOAL    diretório pessoal para a nova conta de\n"
-"                                usuário\n"
-"  -D, --defaults                imprime ou salva configuração padrão do\n"
-"                                useradd modificada\n"
-"  -e, --expiredate DATA_EXPIRA  define data de expiração de conta para\n"
-"                                DATA_EXPIRA\n"
-"  -f, --inactive INATIVO        define inatividade de senha após expiração\n"
-"                                para INATIVO\n"
-"  -g, --gid GRUPO               força utilização de GRUPO para nova conta\n"
-"                                de usuário\n"
-"  -G, --groups GRUPOS           lista de grupos suplementares para a nova\n"
-"                                conta de usuário\n"
-"  -h, --help                    exibe esta mensagem de ajuda e finaliza\n"
-"  -k, --skel DIR_SKEL           especifica um diretório skel alternativo\n"
-"  -K, --key CHAVE=VALOR         sobrepões os padrões do /etc/login.defs\n"
-"  -m, --create-home             cria diretório pessoal para a nova conta de\n"
-"                                usuário\n"
-"  -o, --non-unique              permite cirar usuário com UID duplicado\n"
-"                                (não-único)\n"
-"  -p, --password SENHA          utiliza senha encriptada para a nova conta\n"
-"                                de usuário\n"
-"  -s, --shell SHELL             o shell de login para a nova conta\n"
-"                                de usuário\n"
-"  -u, --uid UID                 força o uso de UID para a nova conta\n"
-"                                de usuário\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2028,7 +2064,200 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s : não foi possível restaurar %s : %s (suas mudanças estão em %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: faillog [opções]\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -a, --all             exibir registros faillog para todos os usuários\n"
+#~ "  -h, --help            exibiri esta mensagem de ajuda e finalizar\n"
+#~ "  -l, --lock-time SEG   após falha de login travar conta por SEG "
+#~ "segundos\n"
+#~ "  -m, --maximum MAX     define contadores de logins falhos para MAX\n"
+#~ "  -r, --reset           zerar os contadores de falhas de login\n"
+#~ "  -t, --time DIAS       exibir registros faillog mais recentes que DIAS\n"
+#~ "  -u, --user LOGIN      exibir registros faillog ou manter somente\n"
+#~ "                        contadores de falhas e limites (caso usado com\n"
+#~ "                        as opções -r, -m ou -l) para usuário com LOGIN\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: groupadd [opções] grupo\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -f, --force                   forçar sair com estado de sucesso caso\n"
+#~ "                                grupo especificado já exista\n"
+#~ "  -g, --gid GID                 utilizar GID para o novo grupo\n"
+#~ "  -h, --help                    exibir esta mensagem de ajuda e "
+#~ "finalizar\n"
+#~ "  -K, --key CHAVE=VALOR         sobrepõe os padrões em /etc/login.defs\n"
+#~ "  -o, --non-unique              permiti criar grupo com GID duplicado\n"
+#~ "                                (não-único)\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: groupadd [opções] grupo\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -f, --force                   forçar sair com estado de sucesso caso\n"
+#~ "                                grupo especificado já exista\n"
+#~ "  -g, --gid GID                 utilizar GID para o novo grupo\n"
+#~ "  -h, --help                    exibir esta mensagem de ajuda e "
+#~ "finalizar\n"
+#~ "  -K, --key CHAVE=VALOR         sobrepõe os padrões em /etc/login.defs\n"
+#~ "  -o, --non-unique              permiti criar grupo com GID duplicado\n"
+#~ "                                (não-único)\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Uso: useradd [opções] LOGIN\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -b, --base-dir DIR_BASE       diretório base para o diretório pessoal\n"
+#~ "                                da nova conta de usuário\n"
+#~ "  -c, --comment COMENTÁRIO      define o campo GECOS para a nova conta "
+#~ "de\n"
+#~ "                                usuário\n"
+#~ "  -d, --home-dir DIR_PESSOAL    diretório pessoal para a nova conta de\n"
+#~ "                                usuário\n"
+#~ "  -D, --defaults                imprime ou salva configuração padrão do\n"
+#~ "                                useradd modificada\n"
+#~ "  -e, --expiredate DATA_EXPIRA  define data de expiração de conta para\n"
+#~ "                                DATA_EXPIRA\n"
+#~ "  -f, --inactive INATIVO        define inatividade de senha após "
+#~ "expiração\n"
+#~ "                                para INATIVO\n"
+#~ "  -g, --gid GRUPO               força utilização de GRUPO para nova "
+#~ "conta\n"
+#~ "                                de usuário\n"
+#~ "  -G, --groups GRUPOS           lista de grupos suplementares para a "
+#~ "nova\n"
+#~ "                                conta de usuário\n"
+#~ "  -h, --help                    exibe esta mensagem de ajuda e finaliza\n"
+#~ "  -k, --skel DIR_SKEL           especifica um diretório skel alternativo\n"
+#~ "  -K, --key CHAVE=VALOR         sobrepões os padrões do /etc/login.defs\n"
+#~ "  -m, --create-home             cria diretório pessoal para a nova conta "
+#~ "de\n"
+#~ "                                usuário\n"
+#~ "  -o, --non-unique              permite cirar usuário com UID duplicado\n"
+#~ "                                (não-único)\n"
+#~ "  -p, --password SENHA          utiliza senha encriptada para a nova "
+#~ "conta\n"
+#~ "                                de usuário\n"
+#~ "  -s, --shell SHELL             o shell de login para a nova conta\n"
+#~ "                                de usuário\n"
+#~ "  -u, --uid UID                 força o uso de UID para a nova conta\n"
+#~ "                                de usuário\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/ro.po
===================================================================
--- upstream/trunk/po/ro.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/ro.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2007-11-26 18:18+0100\n"
 "Last-Translator: Sorin Batariuc <sorin at bonbon.net>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -115,6 +115,10 @@
 "Ultima oară a fost %s în %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: nu pot prelua UID\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: nu pot prelua GID unic\n"
 
@@ -602,62 +606,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Utilizare: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Utilizare: faillog [opţiuni]\n"
-"\n"
-"Opţiuni:\n"
-"  -a, --all                     afişează jurnalul înregistrărilor de eşuări\n"
-"                                pentru toţi utilizatorii\n"
-"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
-"  -l, --lock-time SEC           blochează contul la SEC secunde după o\n"
-"                                autentificare eşuată\n"
-"  -m, --maximum MAX             setează numărul maxim de autentificări\n"
-"                                eşuate la MAX\n"
-"  -r, --reset                   resetează contorul de autentificări eşuate\n"
-"  -t, --time DAYS               afişează jurnalul înregistrărilor de eşuări\n"
-"                                mai recente de DAYS zile\n"
-"  -u, --user LOGIN              afişează jurnalul înregistrărilor de eşuări\n"
-"                                sau menţine contoarele de eşuări şi limite\n"
-"                                (dacă este folosit cu opţiunile -r, -m sau\n"
-"                                -l) doar pentru utilizatorul LOGIN\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -770,35 +744,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: nu este un tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Utilizare: %s [input]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Utilizare: groupadd [opţiuni] grup\n"
-"\n"
-"Opţiuni:\n"
-"  -f, --force                   forţează terminarea cu starea de succes\n"
-"                                dacă grupul specificat există deja\n"
-"  -g, --gid GID                 foloseşte GID pentru noul grup\n"
-"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
-"  -K, --key KEY=VALUE           înlocuieşte cu setările implicite\n"
-"                                /etc/login.defs\n"
-"  -o, --non-unique              permite crearea grupului cu GID duplicat\n"
-"                                (ne-unic)\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -881,31 +859,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Utilizare: groupadd [opţiuni] grup\n"
-"\n"
-"Opţiuni:\n"
-"  -f, --force           forţează terminarea cu starea de succes\n"
-"                        dacă grupul specificat există deja\n"
-"  -g, --gid GID         foloseşte GID pentru noul grup\n"
-"  -h, --help            afişează acest mesaj de ajutor şi ieşi\n"
-"  -K, --key KEY=VALUE   înlocuieşte cu setările implicite /etc/login.defs\n"
-"  -o, --non-unique      permite crearea grupului cu GID duplicat\n"
-"                        (ne-unic)\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "nume de grup nevalid '%s'\n"
@@ -1395,6 +1363,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Folosire: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s şi -r sunt incompatibile\n"
+
 msgid "invalid password file entry"
 msgstr "intrare nevalidă în fişierul passwd"
 
@@ -1599,79 +1572,87 @@
 msgstr "%s: prea multe grupuri specificate (maximum %d).\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Utilizare: %s [input]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Folosire: useradd [opţiuni] LOGIN\n"
-"\n"
-"Opţiuni:\n"
-"  -b, --base-dir DIR_BAZA         baza directorului pentru noul director\n"
-"                                  personal al contului\n"
-"  -c, --comment COMENTARIU        setează câmpul GECOS pentru noul cont\n"
-"  -d, --home-dir DIR_ACASA        directorul personal pentru noul cont\n"
-"  -D, --defaults                  afişează sau salvează configuraţia "
-"useradd\n"
-"                                  implicită modificată\n"
-"  -e, --expiredate DATA_EXPIRĂRII setează data expirării contului la\n"
-"                                  DATA_EXPIRĂRII\n"
-"  -f, --inactive INACTIVĂ         setează parola inactivă după expirare\n"
-"                                  la INACTIVĂ\n"
-"  -g, --gid GRUP                  forţează folosirea GRUPULUI pentru noul "
-"cont\n"
-"  -G, --groups GRUPURI            afişează grupurile suplimentare pentru\n"
-"                                  noul cont utilizator\n"
-"  -h, --help                      afişează acest mesaj de ajutor şi ieşi\n"
-"  -k, --skel DIR_SKELET           specifică un schelet director alternativ\n"
-"  -K, --key KEY=VALOARE           suprascrie valorile implicite ale\n"
-"                                  /etc/login.defs\n"
-"  -m, --create-home               crează directorul personal pentru noul\n"
-"                                  cont utilizator\n"
-"  -o, --non-unique                permite creare unui utilizator cu un UID\n"
-"                                  duplicat (non-unic)\n"
-"  -p, --password PAROLA           foloseşte parola criptată pentru noul "
-"cont\n"
-"                                  utilizator\n"
-"  -s, --shell SHELL               mediul de autentificare pentru noul\n"
-"                                  cont utilizator\n"
-"  -u, --uid UID                   forţează utilizarea UID pentru noul\n"
-"                                  cont utilizator\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2020,6 +2001,206 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: nu pot reface %s: %s (schimbările dvs. sunt în %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Utilizare: faillog [opţiuni]\n"
+#~ "\n"
+#~ "Opţiuni:\n"
+#~ "  -a, --all                     afişează jurnalul înregistrărilor de "
+#~ "eşuări\n"
+#~ "                                pentru toţi utilizatorii\n"
+#~ "  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+#~ "  -l, --lock-time SEC           blochează contul la SEC secunde după o\n"
+#~ "                                autentificare eşuată\n"
+#~ "  -m, --maximum MAX             setează numărul maxim de autentificări\n"
+#~ "                                eşuate la MAX\n"
+#~ "  -r, --reset                   resetează contorul de autentificări "
+#~ "eşuate\n"
+#~ "  -t, --time DAYS               afişează jurnalul înregistrărilor de "
+#~ "eşuări\n"
+#~ "                                mai recente de DAYS zile\n"
+#~ "  -u, --user LOGIN              afişează jurnalul înregistrărilor de "
+#~ "eşuări\n"
+#~ "                                sau menţine contoarele de eşuări şi "
+#~ "limite\n"
+#~ "                                (dacă este folosit cu opţiunile -r, -m "
+#~ "sau\n"
+#~ "                                -l) doar pentru utilizatorul LOGIN\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Utilizare: groupadd [opţiuni] grup\n"
+#~ "\n"
+#~ "Opţiuni:\n"
+#~ "  -f, --force                   forţează terminarea cu starea de succes\n"
+#~ "                                dacă grupul specificat există deja\n"
+#~ "  -g, --gid GID                 foloseşte GID pentru noul grup\n"
+#~ "  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+#~ "  -K, --key KEY=VALUE           înlocuieşte cu setările implicite\n"
+#~ "                                /etc/login.defs\n"
+#~ "  -o, --non-unique              permite crearea grupului cu GID duplicat\n"
+#~ "                                (ne-unic)\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Utilizare: groupadd [opţiuni] grup\n"
+#~ "\n"
+#~ "Opţiuni:\n"
+#~ "  -f, --force           forţează terminarea cu starea de succes\n"
+#~ "                        dacă grupul specificat există deja\n"
+#~ "  -g, --gid GID         foloseşte GID pentru noul grup\n"
+#~ "  -h, --help            afişează acest mesaj de ajutor şi ieşi\n"
+#~ "  -K, --key KEY=VALUE   înlocuieşte cu setările implicite /etc/login."
+#~ "defs\n"
+#~ "  -o, --non-unique      permite crearea grupului cu GID duplicat\n"
+#~ "                        (ne-unic)\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Folosire: useradd [opţiuni] LOGIN\n"
+#~ "\n"
+#~ "Opţiuni:\n"
+#~ "  -b, --base-dir DIR_BAZA         baza directorului pentru noul director\n"
+#~ "                                  personal al contului\n"
+#~ "  -c, --comment COMENTARIU        setează câmpul GECOS pentru noul cont\n"
+#~ "  -d, --home-dir DIR_ACASA        directorul personal pentru noul cont\n"
+#~ "  -D, --defaults                  afişează sau salvează configuraţia "
+#~ "useradd\n"
+#~ "                                  implicită modificată\n"
+#~ "  -e, --expiredate DATA_EXPIRĂRII setează data expirării contului la\n"
+#~ "                                  DATA_EXPIRĂRII\n"
+#~ "  -f, --inactive INACTIVĂ         setează parola inactivă după expirare\n"
+#~ "                                  la INACTIVĂ\n"
+#~ "  -g, --gid GRUP                  forţează folosirea GRUPULUI pentru noul "
+#~ "cont\n"
+#~ "  -G, --groups GRUPURI            afişează grupurile suplimentare pentru\n"
+#~ "                                  noul cont utilizator\n"
+#~ "  -h, --help                      afişează acest mesaj de ajutor şi ieşi\n"
+#~ "  -k, --skel DIR_SKELET           specifică un schelet director "
+#~ "alternativ\n"
+#~ "  -K, --key KEY=VALOARE           suprascrie valorile implicite ale\n"
+#~ "                                  /etc/login.defs\n"
+#~ "  -m, --create-home               crează directorul personal pentru noul\n"
+#~ "                                  cont utilizator\n"
+#~ "  -o, --non-unique                permite creare unui utilizator cu un "
+#~ "UID\n"
+#~ "                                  duplicat (non-unic)\n"
+#~ "  -p, --password PAROLA           foloseşte parola criptată pentru noul "
+#~ "cont\n"
+#~ "                                  utilizator\n"
+#~ "  -s, --shell SHELL               mediul de autentificare pentru noul\n"
+#~ "                                  cont utilizator\n"
+#~ "  -u, --uid UID                   forţează utilizarea UID pentru noul\n"
+#~ "                                  cont utilizator\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "Parola setata pentru expirare."
 

Modified: upstream/trunk/po/ru.po
===================================================================
--- upstream/trunk/po/ru.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/ru.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: shadow 1:4.1.1-6\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2009-05-08 22:36+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -120,6 +120,13 @@
 "Последняя была %s на %s.\n"
 msgstr[2] "%d неудачных попыток входа в систему. Последняя была %s на %s.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: Can't get unique system UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr ""
+"%s: не удалось получить уникальный системный UID (кончились свободные UID-"
+"ы)\n"
+
 #, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: не удалось получить уникальный GID (кончились свободные GID-ы)\n"
@@ -605,41 +612,37 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Использование: expiry {-f|-c}\n"
 
-#
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+"  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Использование: faillog [параметры]\n"
-"\n"
-"Параметры:\n"
-"  -a, --all             показать записи faillog обо всех пользователях\n"
-"  -h, --help            показать это сообщение и завершить работу программы\n"
-"  -l, --lock-time СЕК   при неудачной попытке входа блокировать\n"
-"                        учётную запись на СЕК секунд\n"
-"  -m, --maximum МАКС    установить максимальное число неудачных попыток\n"
-"                        входа равным МАКС\n"
-"  -r, --reset           обнулить счётчики неудачных попыток входа\n"
-"  -t, --time ДНЕЙ       показать записи faillog за последние ДНЕЙ дней\n"
-"  -u, --user ИМЯ        показать запись faillog или настроить счётчики\n"
-"                        неудачных попыток и ограничения (вместе с -r, -m\n"
-"                        или -l) только для учётной записи с заданным ИМЕНЕМ\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
@@ -766,35 +769,60 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Не терминал\n"
 
+#, c-format
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
+"                        шифрования SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+"  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Использование: groupadd [параметры] ГРУППА\n"
-"\n"
-"Параметры:\n"
-"  -f, --force           закончить работу с успешным кодом возврата, если\n"
-"                        заданная группа уже существует\n"
-"  -g, --gid GID         для новой группы использовать GID\n"
-"  -h, --help            показать данное сообщение и закончить работу\n"
-"  -K, --key KEY=VALUE   изменить значения по умолчанию из /etc/login.defs\n"
-"  -o, --non-unique      разрешить создание группы с уже имеющимся\n"
-"                        (не уникальным) GID\n"
-"  -p, --password PASS   использовать шифрованный пароль для новой группы\n"
-"  -r, --system          создать системную учётную запись\n"
-"\n"
+"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
+"                        шифрования SHA*\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+"  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
+
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s не может быть именем группы\n"
@@ -884,29 +912,26 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr "%s: только root может использовать параметр -g/--group\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+"  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Использование: groupmod [параметры] ГРУППА\n"
-"\n"
-"Параметры:\n"
-"  -g, --gid GID         для новой ГРУППЫ использовать GID\n"
-"  -h, --help            показать данное сообщение и закончить работу\n"
-"  -n, --new-name НОВ_ГР использовать имя НОВ_ГР для ГРУППЫ\n"
-"  -o, --non-unique      разрешить создание ГРУППЫ с уже имеющимся\n"
-"                        (не уникальным) GID\n"
-"  -p, --password PASS   использовать шифрованный пароль для нового пароля\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: неверное имя группы '%s'\n"
@@ -1397,6 +1422,11 @@
 msgstr ""
 "Использование: %s [-q] [-r] [-s] [файл паролей [теневой файл паролей]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s и -r не могут использоваться одновременно\n"
+
 msgid "invalid password file entry"
 msgstr "неверная запись в файле паролей"
 
@@ -1593,89 +1623,138 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: указано слишком много групп (максимум %d).\n"
 
-#
 #, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
+"                        шифрования SHA*\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
+"                        шифрования SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
+"                        шифрования SHA*\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
+"                        шифрования SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+"  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
+"                        шифрования SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
+"                        шифрования SHA*\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+"  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user            new SELinux user mapping for the user "
+#| "account\n"
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+"  -Z, --selinux-user            новое SELinux-отображение учётной записи\n"
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Использование: useradd [параметры] имя пользователя\n"
-"\n"
-"Параметры:\n"
-"  -b, --base-dir BASE_DIR       базовый каталог для домашнего каталога\n"
-"                                новой учётной записи\n"
-"  -c, --comment COMMENT         заполнить поле GECOS новой учётной записи\n"
-"  -d, --home-dir HOME_DIR       домашний каталог новой учётной записи\n"
-"  -D, --defaults                показать или сохранить изменённые настройки\n"
-"                                useradd по умолчанию\n"
-"  -e, --expiredate EXPIRE_DATE  установить дату окончания действия\n"
-"                                учётной записи равной EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       установить пароль для устаревших учётных\n"
-"                                записей в INACTIVE\n"
-"  -g, --gid GROUP               принудительно назначить группу GROUP\n"
-"                                для новой учётной записи\n"
-"  -G, --groups GROUPS           задать список групп для новой\n"
-"                                учётной записи\n"
-"  -h, --help                    показать данное сообщение и закончить "
-"работу\n"
-"  -k, --skel SKEL_DIR           указать альтернативный каталог с шаблонами\n"
-"  -K, --key KEY=VALUE           изменить значения по умолчанию из\n"
-"                                /etc/login.defs\n"
-"  -l, --no-log-init             не добавлять пользователя в базы данных\n"
-"                                lastlog и faillog\n"
-"  -m, --create-home             создать домашний каталог для новой\n"
-"                                учётной записи\n"
-"  -M, --no-create-home          не создавать домашний каталог для новой\n"
-"                                учётной записи (изменяет значение\n"
-"                                 из /etc/login.defs)\n"
-"  -N, --no-user-group           не создавать группу с именем как у\n"
-"                                пользователя\n"
-"  -o, --non-unique              разрешить создание учётной записи с уже\n"
-"                                имеющимся (не уникальным) UID\n"
-"  -p, --password PASSWORD       задать шифрованный пароль для новой\n"
-"                                учётной записи\n"
-"  -r, --system                  создать системную учётную запись\n"
-"  -s, --shell SHELL             задать командную оболочку для новой\n"
-"                                учётной записи\n"
-"  -u, --uid UID                 принудительно назначить UID для новой\n"
-"                                учётной записи\n"
-"  -U, --user-group              создать группу с именем как у пользователя\n"
-"%s\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2032,7 +2111,190 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: не удалось восстановить %s: %s (ваши изменения в %s)\n"
 
+#
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Использование: faillog [параметры]\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "  -a, --all             показать записи faillog обо всех пользователях\n"
+#~ "  -h, --help            показать это сообщение и завершить работу "
+#~ "программы\n"
+#~ "  -l, --lock-time СЕК   при неудачной попытке входа блокировать\n"
+#~ "                        учётную запись на СЕК секунд\n"
+#~ "  -m, --maximum МАКС    установить максимальное число неудачных попыток\n"
+#~ "                        входа равным МАКС\n"
+#~ "  -r, --reset           обнулить счётчики неудачных попыток входа\n"
+#~ "  -t, --time ДНЕЙ       показать записи faillog за последние ДНЕЙ дней\n"
+#~ "  -u, --user ИМЯ        показать запись faillog или настроить счётчики\n"
+#~ "                        неудачных попыток и ограничения (вместе с -r, -m\n"
+#~ "                        или -l) только для учётной записи с заданным "
+#~ "ИМЕНЕМ\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Использование: groupadd [параметры] ГРУППА\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "  -f, --force           закончить работу с успешным кодом возврата, если\n"
+#~ "                        заданная группа уже существует\n"
+#~ "  -g, --gid GID         для новой группы использовать GID\n"
+#~ "  -h, --help            показать данное сообщение и закончить работу\n"
+#~ "  -K, --key KEY=VALUE   изменить значения по умолчанию из /etc/login."
+#~ "defs\n"
+#~ "  -o, --non-unique      разрешить создание группы с уже имеющимся\n"
+#~ "                        (не уникальным) GID\n"
+#~ "  -p, --password PASS   использовать шифрованный пароль для новой группы\n"
+#~ "  -r, --system          создать системную учётную запись\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Использование: groupmod [параметры] ГРУППА\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "  -g, --gid GID         для новой ГРУППЫ использовать GID\n"
+#~ "  -h, --help            показать данное сообщение и закончить работу\n"
+#~ "  -n, --new-name НОВ_ГР использовать имя НОВ_ГР для ГРУППЫ\n"
+#~ "  -o, --non-unique      разрешить создание ГРУППЫ с уже имеющимся\n"
+#~ "                        (не уникальным) GID\n"
+#~ "  -p, --password PASS   использовать шифрованный пароль для нового "
+#~ "пароля\n"
+#~ "\n"
+
+#
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Использование: useradd [параметры] имя пользователя\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "  -b, --base-dir BASE_DIR       базовый каталог для домашнего каталога\n"
+#~ "                                новой учётной записи\n"
+#~ "  -c, --comment COMMENT         заполнить поле GECOS новой учётной "
+#~ "записи\n"
+#~ "  -d, --home-dir HOME_DIR       домашний каталог новой учётной записи\n"
+#~ "  -D, --defaults                показать или сохранить изменённые "
+#~ "настройки\n"
+#~ "                                useradd по умолчанию\n"
+#~ "  -e, --expiredate EXPIRE_DATE  установить дату окончания действия\n"
+#~ "                                учётной записи равной EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       установить пароль для устаревших учётных\n"
+#~ "                                записей в INACTIVE\n"
+#~ "  -g, --gid GROUP               принудительно назначить группу GROUP\n"
+#~ "                                для новой учётной записи\n"
+#~ "  -G, --groups GROUPS           задать список групп для новой\n"
+#~ "                                учётной записи\n"
+#~ "  -h, --help                    показать данное сообщение и закончить "
+#~ "работу\n"
+#~ "  -k, --skel SKEL_DIR           указать альтернативный каталог с "
+#~ "шаблонами\n"
+#~ "  -K, --key KEY=VALUE           изменить значения по умолчанию из\n"
+#~ "                                /etc/login.defs\n"
+#~ "  -l, --no-log-init             не добавлять пользователя в базы данных\n"
+#~ "                                lastlog и faillog\n"
+#~ "  -m, --create-home             создать домашний каталог для новой\n"
+#~ "                                учётной записи\n"
+#~ "  -M, --no-create-home          не создавать домашний каталог для новой\n"
+#~ "                                учётной записи (изменяет значение\n"
+#~ "                                 из /etc/login.defs)\n"
+#~ "  -N, --no-user-group           не создавать группу с именем как у\n"
+#~ "                                пользователя\n"
+#~ "  -o, --non-unique              разрешить создание учётной записи с уже\n"
+#~ "                                имеющимся (не уникальным) UID\n"
+#~ "  -p, --password PASSWORD       задать шифрованный пароль для новой\n"
+#~ "                                учётной записи\n"
+#~ "  -r, --system                  создать системную учётную запись\n"
+#~ "  -s, --shell SHELL             задать командную оболочку для новой\n"
+#~ "                                учётной записи\n"
+#~ "  -u, --uid UID                 принудительно назначить UID для новой\n"
+#~ "                                учётной записи\n"
+#~ "  -U, --user-group              создать группу с именем как у "
+#~ "пользователя\n"
+#~ "%s\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/shadow.pot
===================================================================
--- upstream/trunk/po/shadow.pot	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/shadow.pot	2009-07-24 01:13:21 UTC (rev 3042)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -108,6 +108,10 @@
 msgstr[1] ""
 
 #, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr ""
+
+#, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr ""
 
@@ -538,25 +542,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr ""
 
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -664,22 +675,38 @@
 msgid "%s: Not a tty\n"
 msgstr ""
 
+#, c-format
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
 msgstr ""
@@ -756,19 +783,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr ""
@@ -1182,6 +1211,10 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr ""
 
+#, c-format
+msgid "%s: -s and -r are incompatible\n"
+msgstr ""
+
 msgid "invalid password file entry"
 msgstr ""
 
@@ -1359,40 +1392,81 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr ""
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
 
 msgid ""

Modified: upstream/trunk/po/sk.po
===================================================================
--- upstream/trunk/po/sk.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/sk.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2009-04-11 15:38+0100\n"
 "Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -115,6 +115,11 @@
 "%d chybných pokusov o prihlásenie od posledného prihlásenia.\n"
 "Posledné bolo %s na %s.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: Nedá sa získať jedinečný UID (už nie sú dostupné žiadne UID)\n"
+
 #, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: Nedá sa získať jedinečný GID (už nie sú dostupné žiadne GID)\n"
@@ -621,39 +626,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Použitie: expiry {-f|-c}\n"
 
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Použitie: faillog [voľby]\n"
-"\n"
-"Voľby:\n"
-"  -a, --all             zobrazí faillog záznamy všetkých používateľov\n"
-"  -h, --help            zobrazí tohto pomocníka a ukončí sa\n"
-"  -l, --lock-time SEC   po chybnom prihlásení zablokuje účet na SEC sekúnd\n"
-"  -m, --maximum MAX     nastaví maximálny počet chybných prihlásení na MAX\n"
-"  -r, --reset           vynuluje počítadlá chybných prihlásení\n"
-"  -t, --time DAYS       zobrazí záznamy faillog nie staršie ako DAYS dní\n"
-"  -u, --user LOGIN      zobrazí záznam faillog alebo nastaví počítadlá\n"
-"                        chybných prihlásení a limitov (iba s použitím "
-"volieb\n"
-"                        -r, -m or -l) pre používateľa s loginom LOGIN\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "faillog: Failed to get the entry for UID %d\n"
 msgid "faillog: Failed to get the entry for UID %lu\n"
@@ -779,36 +777,51 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Nejedná sa o tty\n"
 
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Použitie: %s [vstup]\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Použitie: groupadd [voľby] SKUPINA\n"
-"\n"
-"Voľby:\n"
-"  -f, --force                   vynúti úspešnú návratovú hodnotu aj napriek\n"
-"                                existencii zadanej skupiny\n"
-"  -g, --gid GID                 pre novú skupinu použije GID\n"
-"  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
-"  -K, --key KEY=VALUE           nahradí predvolené hodnoty z /etc/login."
-"defs\n"
-"  -o, --non-unique              povolí vytvorenie skupiny s duplicitným\n"
-"                                (nejedinečným) GID\n"
-"  -p, --password PASSWORD       použije pre novú skupinu šifrované heslo\n"
-"  -r, --system                  vytvorí systémový účet\n"
-"\n"
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: „%s“ nie je platným názvom skupiny\n"
@@ -898,29 +911,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr "%s: iba root môže používať voľbu -g/--group\n"
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Použitie: groupmod [voľby] SKUPINA\n"
-"\n"
-"Voľby:\n"
-"  -g, --gid GID                 pre novú skupinu použije GID\n"
-"  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
-"  -n, --new-name NOVÁ_SKUP      vynúti pre SKUPINu meno NOVÁ_SKUP\n"
-"  -o, --non-unique              povolí vytvorenie skupiny s duplicitným\n"
-"                                (nejedinečným) GID\n"
-"  -p, --password PASSWORD       nové heslo bude šifrované\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: chybné pomenovanie skupiny „%s“\n"
@@ -1396,6 +1401,11 @@
 msgstr ""
 "Použitie: %s [-q] [-r] [-s] [súbor_s_heslami [súbor_s_tieňovými_heslami]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s a -r nie sú zlučiteľné\n"
+
 msgid "invalid password file entry"
 msgstr "chybná položka v súbore s heslami"
 
@@ -1589,122 +1599,123 @@
 msgstr "%s: bolo zadaných príliš veľa skupín (max %d).\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: useradd [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-#| "                                home directory\n"
-#| "  -c, --comment COMMENT         set the GECOS field for the new user "
-#| "account\n"
-#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-#| "  -D, --defaults                print or save modified default useradd\n"
-#| "                                configuration\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
-#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
-#| "                                user account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-#| "  -l, --no-log-init             do not add the user to the lastlog and\n"
-#| "                                faillog databases\n"
-#| "  -m, --create-home             create home directory for the new user\n"
-#| "                                account\n"
-#| "  -M, --no-create-home          do not create user's home directory\n"
-#| "                                (overrides /etc/login.defs)\n"
-#| "  -N, --no-user-group           do not create a group with the same name "
-#| "as\n"
-#| "                                the user\n"
-#| "  -o, --non-unique              allow create user with duplicate\n"
-#| "                                (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
-#| "                                account\n"
-#| "  -r, --system                  create a system account\n"
-#| "  -s, --shell SHELL             the login shell for the new user account\n"
-#| "  -u, --uid UID                 force use the UID for the new user "
-#| "account\n"
-#| "  -U, --user-group              create a group with the same name as the "
-#| "user\n"
-#| "\n"
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Použitie: %s [vstup]\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+"  -s, --sha-rounds              počet cyklov šifrovacích\n"
+"                                algoritmov SHA*\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Použitie: useradd [voľby] ÚČET\n"
-"\n"
-"Voľby:\n"
-"  -b, --base-dir ZÁKL_ADR       základný adresár domovského adresára nového\n"
-"                                používateľského účtu\n"
-"  -c, --comment KOMENTÁR        nastaví pole GECOS nového účtu\n"
-"  -d, --home-dir DOM_ADR        domovský adresár nového účtu\n"
-"  -D, --defaults                vypíše alebo nastaví predvolené nastavenia\n"
-"                                programu useradd\n"
-"  -e, --expiredate EXP_DATUM    nastaví čas vypršania platnosti účtu na\n"
-"                                EXP_DATUM\n"
-"  -f, --inactive NEAKTIV        zablokuje účet po NEAKTIV dňoch od času\n"
-"                                vypršania platnosti\n"
-"  -g, --gid SKUPINA             vynúti použitie tejto skupiny pre nový účet\n"
-"  -G, --groups SKUPINY          zoznam ďalších skupín, do ktorých má\n"
-"                                patriť nový účet\n"
-"  -h, --help                    zobrazí tohto pomocníka a skončí\n"
-"  -k, --skel VZOR_ADR           zadá alternatívny vzorový adresár\n"
-"  -K, --key KĽÚČ=HODNOTA        nahradí predvolené nastavenia /etc/login."
-"defs\n"
-"  -l, --no-log-init             nepridávať používateľa do databáz\n"
-"                                lastlog a faillog \n"
-"  -m, --create-home             vytvorí domovský adresár pre nový\n"
-"                                používateľský účet\n"
-"  -N, --no-user-group           nevytvorí skupinu s rovnakým menom\n"
-"                                ako má používateľ\n"
-"  -o, --non-unique              povolí vytvorenie používateľa s duplicitným\n"
-"                                (nejedinečným) UID\n"
-"  -p, --password HESLO          pre nový účet použije zadané zašifrované\n"
-"                                heslo\n"
-"  -r, --system                  vytvorí systémový účet\n"
-"  -s, --shell SHELL             prihlasovací shell nového účtu\n"
-"  -u, --uid UID                 vynúti použitie tohto UID pre nový účet\n"
-"  -U, --user-group              vytvorí skupinu s rovnakým menom\n"
-"                                ako má používateľ\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2083,6 +2094,225 @@
 msgstr "%s: %s sa nedá obnoviť: %s (zmeny sú v %s)\n"
 
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použitie: faillog [voľby]\n"
+#~ "\n"
+#~ "Voľby:\n"
+#~ "  -a, --all             zobrazí faillog záznamy všetkých používateľov\n"
+#~ "  -h, --help            zobrazí tohto pomocníka a ukončí sa\n"
+#~ "  -l, --lock-time SEC   po chybnom prihlásení zablokuje účet na SEC "
+#~ "sekúnd\n"
+#~ "  -m, --maximum MAX     nastaví maximálny počet chybných prihlásení na "
+#~ "MAX\n"
+#~ "  -r, --reset           vynuluje počítadlá chybných prihlásení\n"
+#~ "  -t, --time DAYS       zobrazí záznamy faillog nie staršie ako DAYS dní\n"
+#~ "  -u, --user LOGIN      zobrazí záznam faillog alebo nastaví počítadlá\n"
+#~ "                        chybných prihlásení a limitov (iba s použitím "
+#~ "volieb\n"
+#~ "                        -r, -m or -l) pre používateľa s loginom LOGIN\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použitie: groupadd [voľby] SKUPINA\n"
+#~ "\n"
+#~ "Voľby:\n"
+#~ "  -f, --force                   vynúti úspešnú návratovú hodnotu aj "
+#~ "napriek\n"
+#~ "                                existencii zadanej skupiny\n"
+#~ "  -g, --gid GID                 pre novú skupinu použije GID\n"
+#~ "  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
+#~ "  -K, --key KEY=VALUE           nahradí predvolené hodnoty z /etc/login."
+#~ "defs\n"
+#~ "  -o, --non-unique              povolí vytvorenie skupiny s duplicitným\n"
+#~ "                                (nejedinečným) GID\n"
+#~ "  -p, --password PASSWORD       použije pre novú skupinu šifrované heslo\n"
+#~ "  -r, --system                  vytvorí systémový účet\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použitie: groupmod [voľby] SKUPINA\n"
+#~ "\n"
+#~ "Voľby:\n"
+#~ "  -g, --gid GID                 pre novú skupinu použije GID\n"
+#~ "  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
+#~ "  -n, --new-name NOVÁ_SKUP      vynúti pre SKUPINu meno NOVÁ_SKUP\n"
+#~ "  -o, --non-unique              povolí vytvorenie skupiny s duplicitným\n"
+#~ "                                (nejedinečným) GID\n"
+#~ "  -p, --password PASSWORD       nové heslo bude šifrované\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Usage: useradd [options] LOGIN\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~| "                                home directory\n"
+#~| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~| "account\n"
+#~| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~| "  -D, --defaults                print or save modified default useradd\n"
+#~| "                                configuration\n"
+#~| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -g, --gid GROUP               force use GROUP for the new user "
+#~| "account\n"
+#~| "  -G, --groups GROUPS           list of supplementary groups for the "
+#~| "new\n"
+#~| "                                user account\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~| "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~| "                                faillog databases\n"
+#~| "  -m, --create-home             create home directory for the new user\n"
+#~| "                                account\n"
+#~| "  -M, --no-create-home          do not create user's home directory\n"
+#~| "                                (overrides /etc/login.defs)\n"
+#~| "  -N, --no-user-group           do not create a group with the same name "
+#~| "as\n"
+#~| "                                the user\n"
+#~| "  -o, --non-unique              allow create user with duplicate\n"
+#~| "                                (non-unique) UID\n"
+#~| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~| "                                account\n"
+#~| "  -r, --system                  create a system account\n"
+#~| "  -s, --shell SHELL             the login shell for the new user "
+#~| "account\n"
+#~| "  -u, --uid UID                 force use the UID for the new user "
+#~| "account\n"
+#~| "  -U, --user-group              create a group with the same name as the "
+#~| "user\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Použitie: useradd [voľby] ÚČET\n"
+#~ "\n"
+#~ "Voľby:\n"
+#~ "  -b, --base-dir ZÁKL_ADR       základný adresár domovského adresára "
+#~ "nového\n"
+#~ "                                používateľského účtu\n"
+#~ "  -c, --comment KOMENTÁR        nastaví pole GECOS nového účtu\n"
+#~ "  -d, --home-dir DOM_ADR        domovský adresár nového účtu\n"
+#~ "  -D, --defaults                vypíše alebo nastaví predvolené "
+#~ "nastavenia\n"
+#~ "                                programu useradd\n"
+#~ "  -e, --expiredate EXP_DATUM    nastaví čas vypršania platnosti účtu na\n"
+#~ "                                EXP_DATUM\n"
+#~ "  -f, --inactive NEAKTIV        zablokuje účet po NEAKTIV dňoch od času\n"
+#~ "                                vypršania platnosti\n"
+#~ "  -g, --gid SKUPINA             vynúti použitie tejto skupiny pre nový "
+#~ "účet\n"
+#~ "  -G, --groups SKUPINY          zoznam ďalších skupín, do ktorých má\n"
+#~ "                                patriť nový účet\n"
+#~ "  -h, --help                    zobrazí tohto pomocníka a skončí\n"
+#~ "  -k, --skel VZOR_ADR           zadá alternatívny vzorový adresár\n"
+#~ "  -K, --key KĽÚČ=HODNOTA        nahradí predvolené nastavenia /etc/login."
+#~ "defs\n"
+#~ "  -l, --no-log-init             nepridávať používateľa do databáz\n"
+#~ "                                lastlog a faillog \n"
+#~ "  -m, --create-home             vytvorí domovský adresár pre nový\n"
+#~ "                                používateľský účet\n"
+#~ "  -N, --no-user-group           nevytvorí skupinu s rovnakým menom\n"
+#~ "                                ako má používateľ\n"
+#~ "  -o, --non-unique              povolí vytvorenie používateľa s "
+#~ "duplicitným\n"
+#~ "                                (nejedinečným) UID\n"
+#~ "  -p, --password HESLO          pre nový účet použije zadané zašifrované\n"
+#~ "                                heslo\n"
+#~ "  -r, --system                  vytvorí systémový účet\n"
+#~ "  -s, --shell SHELL             prihlasovací shell nového účtu\n"
+#~ "  -u, --uid UID                 vynúti použitie tohto UID pre nový účet\n"
+#~ "  -U, --user-group              vytvorí skupinu s rovnakým menom\n"
+#~ "                                ako má používateľ\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/sq.po
===================================================================
--- upstream/trunk/po/sq.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/sq.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.3\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2004-11-20 03:28+0100\n"
 "Last-Translator: Elian Myftiu <pinguini AT fastwebnet DOT it>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit at lists.sourceforge.net>\n"
@@ -109,6 +109,10 @@
 msgstr[1] ""
 
 #, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr ""
+
+#, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr ""
 
@@ -541,25 +545,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr ""
 
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -667,22 +678,38 @@
 msgid "%s: Not a tty\n"
 msgstr ""
 
+#, c-format
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
 msgstr ""
@@ -759,19 +786,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr ""
@@ -1187,6 +1216,10 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr ""
 
+#, c-format
+msgid "%s: -s and -r are incompatible\n"
+msgstr ""
+
 #, fuzzy
 msgid "invalid password file entry"
 msgstr "   Zgjidh një fjalëkalim të ri.\n"
@@ -1366,40 +1399,81 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr ""
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
 
 msgid ""

Modified: upstream/trunk/po/sv.po
===================================================================
--- upstream/trunk/po/sv.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/sv.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2008-03-26 12:23+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -115,6 +115,11 @@
 "Senast var %s den %s.\n"
 
 #, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "Kan inte få tag i unikt UID (inga fler tillgängliga UID)\n"
+
+#, fuzzy, c-format
 #| msgid "Can't get unique GID (no more available GIDs)\n"
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "Kan inte få tag i unikt GID (inga fler tillgängliga GID)\n"
@@ -635,60 +640,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Användning: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Användning: faillog [flaggor]\n"
-"\n"
-"Flaggor:\n"
-"  -a, --all             visa faillog-information för alla användare\n"
-"  -h, --help            visa detta hjälpmeddelande och avsluta\n"
-"  -l, --lock-time SEK   lås kontot efter misslyckade inloggningar\n"
-"                        i SEK sekunder\n"
-"  -m, --maximum MAX     ställ in maximalt antal misslyckade inloggningar "
-"till MAX\n"
-"  -r, --reset           återställ räknaren för misslyckade inloggningar\n"
-"  -t, --time DAGAR      visa faillog information för senare än DAGAR\n"
-"  -u, --user KONTO      visa faillog information eller hantera räknare för\n"
-"                        misslyckade inloggningar och begränsa\n"
-"                        (om använd med -r, -m eller -l flaggor) endast\n"
-"                        för användaren KONTO\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -804,36 +781,51 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Inte en tty\n"
 
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Användning: %s [inmatning]\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
+"                                krypteringsalgoritmerna\n"
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Användning: groupadd [flaggor] GRUPP\n"
-"\n"
-"Flaggor:\n"
-"  -f, --force                   tvinga avslut med lyckad status om den\n"
-"                                angivna gruppen redan finns\n"
-"  -g, --gid GID                 använd GID för den nya gruppen\n"
-"  -h, --help                    visa detta hjälpmeddelandet och avsluta\n"
-"  -K, --key KEY=VÄRDE           åsidosätter standardvärden från /etc/login."
-"defs\n"
-"  -o, --non-unique              tillåter skapande av grupp med duplikat\n"
-"                                (icke-unikt) GID\n"
-"  -p, --password LÖSENORD       använd krypterat lösenord för nya gruppen\n"
-"  -r, --system                  skapa ett systemkonto\n"
-"\n"
+"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
+"                                krypteringsalgoritmerna\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -921,30 +913,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Användning: groupmod [flaggor] GRUPP\n"
-"\n"
-"Flaggor:\n"
-"  -g, --gid GID             tvinga användning av nytt GID för GRUPP\n"
-"  -h, --help                visa detta hjälpmeddelande och avsluta\n"
-"  -n, --new-name NY_GRUPP   tvinga användning av namnet NY_GRUPP för GRUPP\n"
-"  -o, --non-unique          tillåt användning av dubblett (icke-unikt) GID "
-"för GRUPP\n"
-"  -p, --password LÖSENORD       använd krypterat lösenord för nya "
-"lösenordet\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: invalid group name `%s'\n"
 msgid "%s: invalid group name '%s'\n"
@@ -1467,6 +1450,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Användning: %s [-q] [-r] [-s] [lösenord [skugga]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s och -r är inkompatibla\n"
+
 msgid "invalid password file entry"
 msgstr "ogiltig post i lösenordsfil"
 
@@ -1670,126 +1658,123 @@
 msgstr "%s: för många grupper angivna (max %d).\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: useradd [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-#| "                                home directory\n"
-#| "  -c, --comment COMMENT         set the GECOS field for the new user "
-#| "account\n"
-#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-#| "  -D, --defaults                print or save modified default useradd\n"
-#| "                                configuration\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
-#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
-#| "                                user account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-#| "  -l,                           do not add the user to the lastlog and\n"
-#| "                                faillog databases\n"
-#| "  -m, --create-home             create home directory for the new user\n"
-#| "                                account\n"
-#| "  -N, --no-user-group           do not create a group with the same name "
-#| "as\n"
-#| "                                the user\n"
-#| "  -o, --non-unique              allow create user with duplicate\n"
-#| "                                (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
-#| "                                account\n"
-#| "  -r, --system                  create a system account\n"
-#| "  -s, --shell SHELL             the login shell for the new user account\n"
-#| "  -u, --uid UID                 force use the UID for the new user "
-#| "account\n"
-#| "  -U, --user-group              create a group with the same name as the "
-#| "user\n"
-#| "\n"
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Användning: %s [inmatning]\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
+"                                krypteringsalgoritmerna\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
+"                                krypteringsalgoritmerna\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
+"                                krypteringsalgoritmerna\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
+"                                krypteringsalgoritmerna\n"
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
+"                                krypteringsalgoritmerna\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
+"                                krypteringsalgoritmerna\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Användning: useradd [flaggor] KONTO\n"
-"\n"
-"Flaggor:\n"
-"  -b, --base-dir BAS_KATALOG    baskatalog för det nya användarkontots\n"
-"                                hem-map\n"
-"  -c, --comment KOMMENTAR       ställ in GECOS-fältet för det nya "
-"användarkontot\n"
-"  -d, --home-dir HEM_KATALOG    hemkatalog för det nya kontot\n"
-"  -D, --defaults                skriv ut eller spara modifierad standard "
-"för\n"
-"                                useradd konfiguration\n"
-"  -e, --expiredate UTLÖPSDATUM  ställ in kontots utgångsdatum till "
-"UTLÖPSDATUM\n"
-"  -f, --inactive INAKTIV        ställ in lösenordet till inaktivt efter "
-"utlöpsdatum\n"
-"                                till INAKTIV\n"
-"  -g, --gid GRUPP               tvinga använda GRUPP för nya användarkontot\n"
-"  -G, --groups GRUPPER          lista över tilläggsgrupper för det nya\n"
-"                                användarkontot\n"
-"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
-"  -k, --skel SKEL_KATALOG       ange en alternativ skelettkatalog\n"
-"  -K, --key KEY=VÄRDE           åsidosätter standardvärden från /etc/login."
-"defs\n"
-"  -l,                           lägg inte till användaren till databaserna "
-"lastlog och\n"
-"                                faillog\n"
-"  -m, --create-home             skapa hem-katalog för det nya "
-"användarkontot\n"
-"  -N, --no-user-group           skapa inte en grupp med samma namn som\n"
-"                                användaren\n"
-"  -o, --non-unique              tillåt skapa användare med samma dubblerat\n"
-"                                (icke-unikt) UID\n"
-"  -p, --password LÖSENORD       använd krypterat lösenord för det nya\n"
-"                                användarkontot\n"
-"  -r, --system                  skapa ett systemkonto\n"
-"  -s, --shell SKAL              inloggningsskalet för det nya "
-"användarkontot\n"
-"  -u, --uid UID                 tvinga använda UID för det nya "
-"användarkontot\n"
-"  -U, --user-group              skapa en grupp med samma namn som "
-"användaren\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2180,7 +2165,251 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: kan inte återställa %s: %s (dina ändringar finns i %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Användning: faillog [flaggor]\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ "  -a, --all             visa faillog-information för alla användare\n"
+#~ "  -h, --help            visa detta hjälpmeddelande och avsluta\n"
+#~ "  -l, --lock-time SEK   lås kontot efter misslyckade inloggningar\n"
+#~ "                        i SEK sekunder\n"
+#~ "  -m, --maximum MAX     ställ in maximalt antal misslyckade inloggningar "
+#~ "till MAX\n"
+#~ "  -r, --reset           återställ räknaren för misslyckade inloggningar\n"
+#~ "  -t, --time DAGAR      visa faillog information för senare än DAGAR\n"
+#~ "  -u, --user KONTO      visa faillog information eller hantera räknare "
+#~ "för\n"
+#~ "                        misslyckade inloggningar och begränsa\n"
+#~ "                        (om använd med -r, -m eller -l flaggor) endast\n"
+#~ "                        för användaren KONTO\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Användning: groupadd [flaggor] GRUPP\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ "  -f, --force                   tvinga avslut med lyckad status om den\n"
+#~ "                                angivna gruppen redan finns\n"
+#~ "  -g, --gid GID                 använd GID för den nya gruppen\n"
+#~ "  -h, --help                    visa detta hjälpmeddelandet och avsluta\n"
+#~ "  -K, --key KEY=VÄRDE           åsidosätter standardvärden från /etc/"
+#~ "login.defs\n"
+#~ "  -o, --non-unique              tillåter skapande av grupp med duplikat\n"
+#~ "                                (icke-unikt) GID\n"
+#~ "  -p, --password LÖSENORD       använd krypterat lösenord för nya "
+#~ "gruppen\n"
+#~ "  -r, --system                  skapa ett systemkonto\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Användning: groupmod [flaggor] GRUPP\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ "  -g, --gid GID             tvinga användning av nytt GID för GRUPP\n"
+#~ "  -h, --help                visa detta hjälpmeddelande och avsluta\n"
+#~ "  -n, --new-name NY_GRUPP   tvinga användning av namnet NY_GRUPP för "
+#~ "GRUPP\n"
+#~ "  -o, --non-unique          tillåt användning av dubblett (icke-unikt) "
+#~ "GID för GRUPP\n"
+#~ "  -p, --password LÖSENORD       använd krypterat lösenord för nya "
+#~ "lösenordet\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Usage: useradd [options] LOGIN\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~| "                                home directory\n"
+#~| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~| "account\n"
+#~| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~| "  -D, --defaults                print or save modified default useradd\n"
+#~| "                                configuration\n"
+#~| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -g, --gid GROUP               force use GROUP for the new user "
+#~| "account\n"
+#~| "  -G, --groups GROUPS           list of supplementary groups for the "
+#~| "new\n"
+#~| "                                user account\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~| "  -l,                           do not add the user to the lastlog and\n"
+#~| "                                faillog databases\n"
+#~| "  -m, --create-home             create home directory for the new user\n"
+#~| "                                account\n"
+#~| "  -N, --no-user-group           do not create a group with the same name "
+#~| "as\n"
+#~| "                                the user\n"
+#~| "  -o, --non-unique              allow create user with duplicate\n"
+#~| "                                (non-unique) UID\n"
+#~| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~| "                                account\n"
+#~| "  -r, --system                  create a system account\n"
+#~| "  -s, --shell SHELL             the login shell for the new user "
+#~| "account\n"
+#~| "  -u, --uid UID                 force use the UID for the new user "
+#~| "account\n"
+#~| "  -U, --user-group              create a group with the same name as the "
+#~| "user\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Användning: useradd [flaggor] KONTO\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ "  -b, --base-dir BAS_KATALOG    baskatalog för det nya användarkontots\n"
+#~ "                                hem-map\n"
+#~ "  -c, --comment KOMMENTAR       ställ in GECOS-fältet för det nya "
+#~ "användarkontot\n"
+#~ "  -d, --home-dir HEM_KATALOG    hemkatalog för det nya kontot\n"
+#~ "  -D, --defaults                skriv ut eller spara modifierad standard "
+#~ "för\n"
+#~ "                                useradd konfiguration\n"
+#~ "  -e, --expiredate UTLÖPSDATUM  ställ in kontots utgångsdatum till "
+#~ "UTLÖPSDATUM\n"
+#~ "  -f, --inactive INAKTIV        ställ in lösenordet till inaktivt efter "
+#~ "utlöpsdatum\n"
+#~ "                                till INAKTIV\n"
+#~ "  -g, --gid GRUPP               tvinga använda GRUPP för nya "
+#~ "användarkontot\n"
+#~ "  -G, --groups GRUPPER          lista över tilläggsgrupper för det nya\n"
+#~ "                                användarkontot\n"
+#~ "  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+#~ "  -k, --skel SKEL_KATALOG       ange en alternativ skelettkatalog\n"
+#~ "  -K, --key KEY=VÄRDE           åsidosätter standardvärden från /etc/"
+#~ "login.defs\n"
+#~ "  -l,                           lägg inte till användaren till "
+#~ "databaserna lastlog och\n"
+#~ "                                faillog\n"
+#~ "  -m, --create-home             skapa hem-katalog för det nya "
+#~ "användarkontot\n"
+#~ "  -N, --no-user-group           skapa inte en grupp med samma namn som\n"
+#~ "                                användaren\n"
+#~ "  -o, --non-unique              tillåt skapa användare med samma "
+#~ "dubblerat\n"
+#~ "                                (icke-unikt) UID\n"
+#~ "  -p, --password LÖSENORD       använd krypterat lösenord för det nya\n"
+#~ "                                användarkontot\n"
+#~ "  -r, --system                  skapa ett systemkonto\n"
+#~ "  -s, --shell SKAL              inloggningsskalet för det nya "
+#~ "användarkontot\n"
+#~ "  -u, --uid UID                 tvinga använda UID för det nya "
+#~ "användarkontot\n"
+#~ "  -U, --user-group              skapa en grupp med samma namn som "
+#~ "användaren\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/tl.po
===================================================================
--- upstream/trunk/po/tl.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/tl.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2007-11-26 21:34+0100\n"
 "Last-Translator: Eric Pareja <xenos at upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl at banwa.upm.edu.ph>\n"
@@ -122,6 +122,10 @@
 "Ang huli ay %s noong %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: hindi makakuha ng kakaibang UID\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: hindi makakuha ng kakaibang GID\n"
 
@@ -623,63 +627,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Pag-gamit: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Pag-gamit: faillog [mga opsiyon]\n"
-"\n"
-"Mga opsiyon:\n"
-"  -a, --all             ipakita ang mga record ng faillog para sa lahat\n"
-"  -h, --help            ipakita ang tulong na ito at lumabas\n"
-"  -l, --lock-time SEG   matapos mabigo sa pagpasok, i-lock ng SEG segundo\n"
-"                        ang account\n"
-"  -m, --maximum MAX     itakda ang maximum na bilang ng kabiguan sa "
-"pagpasok\n"
-"                        na hanggang MAX lamang\n"
-"  -r, --reset           ireset ang mga tagabilang ng kabiguan sa pagpasok\n"
-"  -t, --time ARAW       ipakita ang faillog records na hindi tatanda sa "
-"ARAW\n"
-"  -u, --user LOGIN      ipakita ang faillog record o pangasiwaan ang "
-"tagabilang\n"
-"                        ng pagkabigo at mga palugit (kung gamit ang -r, -m "
-"o\n"
-"                        -l na opsiyon) para sa gumagamit ng LOGIN lamang\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -792,33 +765,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Hindi tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Pag-gamit: %s [input]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Pag-gamit: groupadd [mga opsiyon] GRUPO\n"
-"\n"
-"Mga opsiyon:\n"
-"  -f, --force           ipilit ang paglabas na kalagayang matagumpay kung\n"
-"                        ang ibinigay na grupo ay mayroon na\n"
-"  -g, --gid GID         gamitin ang GID para sa bagong grupo\n"
-"  -h, --help            ipakita ang patalastas na ito at lumabas\n"
-"  -K, --key KEY=HALAGA  nangingibabaw sa mga default sa /etc/login.defs\n"
-"  -o, --non-unique      payagang gumawa ng grupo na may GID na kapareho\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -902,29 +881,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Pag-gamit: groupmod [mga opsiyon] GRUPO\n"
-"\n"
-"Mga opsiyon:\n"
-"  -g, --gid GID                 gamitin ang bagong GID ng GRUPO\n"
-"  -h, --help                    ipakita ang tulong na ito at lumabas\n"
-"  -n, --new-name BAGONG_GRUPO   ipilit na gamitin ang BAGONG_GRUPO ng GRUPO\n"
-"  -o, --non-unique              payagang gumawa ng grupo na may kaparehong\n"
-"                                GID ng GRUPO\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "hindi tanggap na pangalan ng grupo '%s'\n"
@@ -1410,6 +1381,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Pag-gamit: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s at -r ay hindi maaring magkasabay\n"
+
 msgid "invalid password file entry"
 msgstr "hindi tanggap na ipinasok sa talaksang password"
 
@@ -1614,77 +1590,87 @@
 msgstr "%s: sobrang dami ng grupo ang nakatakda (max %d).\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Pag-gamit: %s [input]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Pag-gamit: useradd [mga opsiyon] LOGIN\n"
-"\n"
-"Mga opsiyon:\n"
-"  -b, --base-dir BASE_DIR       punong directory para sa bagong mga "
-"tahanang\n"
-"                                directory ng account\n"
-"  -c, --comment KOMENTO         itakda ang GECOS field ng bagong account\n"
-"  -d, --home-dir HOME_DIR       ang tahanang directory ng bagong account\n"
-"  -D, --defaults                ipakita o imbakin ang binagong default na\n"
-"                                pagkaayos ng useradd\n"
-"  -e, --expiredate EXPIRE_DATE  itakda ang petsa ng expiration ng account\n"
-"                                sa EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       itakda ang password na inaktibo matapos ng\n"
-"                                pagkapaso na INACTIVE\n"
-"  -g, --gid GRUPO               ipilit na gamitin ang GRUPO para sa bagong\n"
-"                                account\n"
-"  -G, --groups MGAGRUPO         idagdag ang mga grupo sa MGAGRUPO sa bagong\n"
-"                                account\n"
-"  -h, --help                    ipakita itong tulong na ito at lumabas\n"
-"  -k, --skel SKEL_DIR           itakda ang alternatibong skel directory\n"
-"  -K, --key KEY=HALAGA          nangingibabaw sa default sa /etc/login.defs\n"
-"  -m, --create-home             likhain ang tahanang directory para sa\n"
-"                                bagong account\n"
-"  -o, --non-unique              payagang lumikha ng user na may kaparehong "
-"UID\n"
-"  -p, --password PASSWOWRD      gumamit ng encrypted password para sa "
-"bagong\n"
-"                                account\n"
-"  -s, --shell SHELL             itakda ang login shell para sa bagong "
-"account\n"
-"  -u, --uid UID                 gamitin ang UID para sa bagong account\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2035,6 +2021,203 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: hindi maibalik ang %s: %s (ang mga pagbabago ay nasa %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Pag-gamit: faillog [mga opsiyon]\n"
+#~ "\n"
+#~ "Mga opsiyon:\n"
+#~ "  -a, --all             ipakita ang mga record ng faillog para sa lahat\n"
+#~ "  -h, --help            ipakita ang tulong na ito at lumabas\n"
+#~ "  -l, --lock-time SEG   matapos mabigo sa pagpasok, i-lock ng SEG "
+#~ "segundo\n"
+#~ "                        ang account\n"
+#~ "  -m, --maximum MAX     itakda ang maximum na bilang ng kabiguan sa "
+#~ "pagpasok\n"
+#~ "                        na hanggang MAX lamang\n"
+#~ "  -r, --reset           ireset ang mga tagabilang ng kabiguan sa "
+#~ "pagpasok\n"
+#~ "  -t, --time ARAW       ipakita ang faillog records na hindi tatanda sa "
+#~ "ARAW\n"
+#~ "  -u, --user LOGIN      ipakita ang faillog record o pangasiwaan ang "
+#~ "tagabilang\n"
+#~ "                        ng pagkabigo at mga palugit (kung gamit ang -r, -"
+#~ "m o\n"
+#~ "                        -l na opsiyon) para sa gumagamit ng LOGIN lamang\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Pag-gamit: groupadd [mga opsiyon] GRUPO\n"
+#~ "\n"
+#~ "Mga opsiyon:\n"
+#~ "  -f, --force           ipilit ang paglabas na kalagayang matagumpay "
+#~ "kung\n"
+#~ "                        ang ibinigay na grupo ay mayroon na\n"
+#~ "  -g, --gid GID         gamitin ang GID para sa bagong grupo\n"
+#~ "  -h, --help            ipakita ang patalastas na ito at lumabas\n"
+#~ "  -K, --key KEY=HALAGA  nangingibabaw sa mga default sa /etc/login.defs\n"
+#~ "  -o, --non-unique      payagang gumawa ng grupo na may GID na kapareho\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Pag-gamit: groupmod [mga opsiyon] GRUPO\n"
+#~ "\n"
+#~ "Mga opsiyon:\n"
+#~ "  -g, --gid GID                 gamitin ang bagong GID ng GRUPO\n"
+#~ "  -h, --help                    ipakita ang tulong na ito at lumabas\n"
+#~ "  -n, --new-name BAGONG_GRUPO   ipilit na gamitin ang BAGONG_GRUPO ng "
+#~ "GRUPO\n"
+#~ "  -o, --non-unique              payagang gumawa ng grupo na may "
+#~ "kaparehong\n"
+#~ "                                GID ng GRUPO\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Pag-gamit: useradd [mga opsiyon] LOGIN\n"
+#~ "\n"
+#~ "Mga opsiyon:\n"
+#~ "  -b, --base-dir BASE_DIR       punong directory para sa bagong mga "
+#~ "tahanang\n"
+#~ "                                directory ng account\n"
+#~ "  -c, --comment KOMENTO         itakda ang GECOS field ng bagong account\n"
+#~ "  -d, --home-dir HOME_DIR       ang tahanang directory ng bagong account\n"
+#~ "  -D, --defaults                ipakita o imbakin ang binagong default "
+#~ "na\n"
+#~ "                                pagkaayos ng useradd\n"
+#~ "  -e, --expiredate EXPIRE_DATE  itakda ang petsa ng expiration ng "
+#~ "account\n"
+#~ "                                sa EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       itakda ang password na inaktibo matapos "
+#~ "ng\n"
+#~ "                                pagkapaso na INACTIVE\n"
+#~ "  -g, --gid GRUPO               ipilit na gamitin ang GRUPO para sa "
+#~ "bagong\n"
+#~ "                                account\n"
+#~ "  -G, --groups MGAGRUPO         idagdag ang mga grupo sa MGAGRUPO sa "
+#~ "bagong\n"
+#~ "                                account\n"
+#~ "  -h, --help                    ipakita itong tulong na ito at lumabas\n"
+#~ "  -k, --skel SKEL_DIR           itakda ang alternatibong skel directory\n"
+#~ "  -K, --key KEY=HALAGA          nangingibabaw sa default sa /etc/login."
+#~ "defs\n"
+#~ "  -m, --create-home             likhain ang tahanang directory para sa\n"
+#~ "                                bagong account\n"
+#~ "  -o, --non-unique              payagang lumikha ng user na may "
+#~ "kaparehong UID\n"
+#~ "  -p, --password PASSWOWRD      gumamit ng encrypted password para sa "
+#~ "bagong\n"
+#~ "                                account\n"
+#~ "  -s, --shell SHELL             itakda ang login shell para sa bagong "
+#~ "account\n"
+#~ "  -u, --uid UID                 gamitin ang UID para sa bagong account\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "Itinakdang lumampas sa taning ang password."
 

Modified: upstream/trunk/po/tr.po
===================================================================
--- upstream/trunk/po/tr.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/tr.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2008-03-29 20:31+0200\n"
 "Last-Translator: Mehmet Türker <mturker at innova.com.tr>\n"
 "Language-Team: Türkçe <tr at li.org>\n"
@@ -114,6 +114,11 @@
 "Son girişten beri %d başarısız girişim.  En sonuncusu %s üzerinde %s idi.\n"
 
 #, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "Benzersiz bir UID alınamıyor (mevcut UID yok)\n"
+
+#, fuzzy, c-format
 #| msgid "Can't get unique GID (no more available GIDs)\n"
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "Tek (benzersiz) bir GID alınamadı (kullanılabilecek mevcut GID yok)\n"
@@ -639,63 +644,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Kullanım: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Kullanım: faillog [seçenekler]\n"
-"\n"
-"Seçenekler:\n"
-"  -a, --all                     tüm kullanıcılar için faillog kayıtlarını\n"
-"                                gösterir\n"
-" -h, --help                     bu yardım dosyasını göster ve çık\n"
-"  -l, --lock-time SANİYE(SEC)   hatalı oturum açılımından sonra, hesabı\n"
-"                                SANİYE kadar saniye kilitler\n"
-"  -m, --maximum AZAMİ(MAX)      en fazla hatalı oturum açılış sayacını "
-"AZAMİ\n"
-"                                değerine ayarlar\n"
-"  -r, --reset                   oturum açılış sayacını sıfırlar\n"
-"  -t, --time GÜN_SAYISI(DAYS)   GÜN_SAYISI kadar günden daha güncel olan\n"
-"                                faillog kayıtlarını gösterir\n"
-"  -u, --user KULLANICI(LOGIN)   faillog kaydını gösterir veya hata\n"
-"                                sayacını onarır ve sadece KULLANICI ile\n"
-"                                belirtilen kullanıcıları sınırlar (-r, -m\n"
-"                                veya -l seçenekleri ile kullanıldıysa)\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -811,35 +785,51 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Bir tty değil\n"
 
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Kullanım: %s [girdi]\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Kullanım: groupadd [seçenekler] GRUP\n"
-"\n"
-"Seçenekler:\n"
-"  -f, --force                   belirtilen grub mevcutsa bile, çıkışta\n"
-"                                başarılı kodu verecek şekilde zorla\n"
-"  -g, --gid GID                 yeni grub için bu GID yi kullan\n"
-"  -h, --help                    bu yardım dosyasını göster ve çık\n"
-"  -K, --key ANAHTAR=DEĞER       /etc/login.defs dosyasındaki\n"
-"                                öntanımlı değerlerin üzerine yazar\n"
-"  -o, --non-unique              aynı GID ile grub oluşturulmasına izin ver\n"
-"  -p, --password PAROLA         yeni grup için şifreli olarak PAROLA kullan\n"
-"  -r, --system                  bir sistem hesabı yarat\n"
-"\n"
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -928,29 +918,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Usage: groupmod [seçenekler] GRUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 bu grubu yeni GID ile kullanıma zorla\n"
-"  -h, --help                    bu yardım dosyasını göster ve çık\n"
-"  -n, --new-name YENİ_GRUP      grubu YENİ_GRUP ismini kullanmaya zorla\n"
-"  -o, --non-unique              grubun aynı GID yi kullanmasına izin ver\n"
-"  -p, --password PAROLA         yani parola için şifreli olarak PAROLA "
-"kullan\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: invalid group name `%s'\n"
 msgid "%s: invalid group name '%s'\n"
@@ -1480,6 +1462,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Kullanım: %s [-q] [-r] [-s] [parola [gölge]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s ve -r uyumsuz\n"
+
 msgid "invalid password file entry"
 msgstr "geçersiz parola dosyası kaydı"
 
@@ -1683,126 +1670,123 @@
 msgstr "%s: çok fazla grup verildi (azami %d).\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: useradd [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-#| "                                home directory\n"
-#| "  -c, --comment COMMENT         set the GECOS field for the new user "
-#| "account\n"
-#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-#| "  -D, --defaults                print or save modified default useradd\n"
-#| "                                configuration\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
-#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
-#| "                                user account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-#| "  -l,                           do not add the user to the lastlog and\n"
-#| "                                faillog databases\n"
-#| "  -m, --create-home             create home directory for the new user\n"
-#| "                                account\n"
-#| "  -N, --no-user-group           do not create a group with the same name "
-#| "as\n"
-#| "                                the user\n"
-#| "  -o, --non-unique              allow create user with duplicate\n"
-#| "                                (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
-#| "                                account\n"
-#| "  -r, --system                  create a system account\n"
-#| "  -s, --shell SHELL             the login shell for the new user account\n"
-#| "  -u, --uid UID                 force use the UID for the new user "
-#| "account\n"
-#| "  -U, --user-group              create a group with the same name as the "
-#| "user\n"
-#| "\n"
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Kullanım: %s [girdi]\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+"  -s, --sha-rounds              SHA* kripto algoritmaları için kullanılacak\n"
+"                                SHA yuvarlamaları sayısı\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Kullanım: useradd [seçenekler] KULLANICI\n"
-"\n"
-"Seçenekler:\n"
-"  -b, --base-dir EV_DİZİNİ(BASE_DIR)\n"
-"                                yeni kullanıcı hesabının ev dizini için\n"
-"                                ana dizin\n"
-"  -c, --comment YORUM(COMMENT)\n"
-"                                yeni kullanıcı için GECOS alanını ayarlar\n"
-"  -d, --home-dir EV_DİZİNİ(HOME_DIR)\n"
-"                                yeni kullanıcı hesabı için ev dizini\n"
-"  -D, --defaults                değiştirilmiş öntanımlı "
-"useradd                                 yapılandırmasını görüntüle veya "
-"kaydet\n"
-"  -e, --expiredate TARIH  hesap süresi dolumunu TARIH olarak\n"
-"                                ayarla\n"
-"  -f, --inactive PASIF          şifre süresi dolduktan sonra şifreyi\n"
-"                                PASIF olarak ayarla\n"
-"  -g, --gid GRUP                yeni kullanıcı hesabı için GRUP kullanımını\n"
-"                                zorla\n"
-"  -G, --groups GRUPLAR          yeni kullanıcı hesabı için\n"
-"                                ilave grubları listesi\n"
-"  -h, --help                    bu yardım dosyasını göster ve çık\n"
-"  -k, --skel TEMEL_DİZİN        farklı bir temel dizin belirtir\n"
-"  -K, --key ANAHTAR=DEĞER       /etc/login.defs dosyasındaki öntanımlı\n"
-"                                değerlerin üzerine yazar\n"
-"  -l,                           kullanıcıyı lastlog ve faillog "
-"veritabanlarına\n"
-"                                ekleme\n"
-"  -m, --create-home             yeni kullanıcı hesabı için ev dizini yarat\n"
-"  -N, --non-user-group          kullanıcı adıyla aynı isimde bir grup "
-"yaratma\n"
-"  -o, --non-unique              aynı UID ile kullanıcı yaratılmasına izin "
-"ver\n"
-"  -p, --password PAROLA         yeni kullanıcı hesabı için şifrelenmiş "
-"parola\n"
-"  -r, --system                  bir sistem hesabı yarat\n"
-"  -s, --shell KABUK             yeni kullanıcı hesabı için oturum açma "
-"kabuğu\n"
-"  -u, --uid UID                 yeni kullanıcı hesabı için UID kullanımını\n"
-"                                zorla\n"
-"  -U, --user-group              kullanıcı ile aynı isimde bir grup yarat\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2192,7 +2176,255 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %s geri yüklenemiyor: %s (değişiklikleriniz %s içinde)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Kullanım: faillog [seçenekler]\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ "  -a, --all                     tüm kullanıcılar için faillog "
+#~ "kayıtlarını\n"
+#~ "                                gösterir\n"
+#~ " -h, --help                     bu yardım dosyasını göster ve çık\n"
+#~ "  -l, --lock-time SANİYE(SEC)   hatalı oturum açılımından sonra, hesabı\n"
+#~ "                                SANİYE kadar saniye kilitler\n"
+#~ "  -m, --maximum AZAMİ(MAX)      en fazla hatalı oturum açılış sayacını "
+#~ "AZAMİ\n"
+#~ "                                değerine ayarlar\n"
+#~ "  -r, --reset                   oturum açılış sayacını sıfırlar\n"
+#~ "  -t, --time GÜN_SAYISI(DAYS)   GÜN_SAYISI kadar günden daha güncel olan\n"
+#~ "                                faillog kayıtlarını gösterir\n"
+#~ "  -u, --user KULLANICI(LOGIN)   faillog kaydını gösterir veya hata\n"
+#~ "                                sayacını onarır ve sadece KULLANICI ile\n"
+#~ "                                belirtilen kullanıcıları sınırlar (-r, -"
+#~ "m\n"
+#~ "                                veya -l seçenekleri ile kullanıldıysa)\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Kullanım: groupadd [seçenekler] GRUP\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ "  -f, --force                   belirtilen grub mevcutsa bile, çıkışta\n"
+#~ "                                başarılı kodu verecek şekilde zorla\n"
+#~ "  -g, --gid GID                 yeni grub için bu GID yi kullan\n"
+#~ "  -h, --help                    bu yardım dosyasını göster ve çık\n"
+#~ "  -K, --key ANAHTAR=DEĞER       /etc/login.defs dosyasındaki\n"
+#~ "                                öntanımlı değerlerin üzerine yazar\n"
+#~ "  -o, --non-unique              aynı GID ile grub oluşturulmasına izin "
+#~ "ver\n"
+#~ "  -p, --password PAROLA         yeni grup için şifreli olarak PAROLA "
+#~ "kullan\n"
+#~ "  -r, --system                  bir sistem hesabı yarat\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Usage: groupmod [seçenekler] GRUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 bu grubu yeni GID ile kullanıma zorla\n"
+#~ "  -h, --help                    bu yardım dosyasını göster ve çık\n"
+#~ "  -n, --new-name YENİ_GRUP      grubu YENİ_GRUP ismini kullanmaya zorla\n"
+#~ "  -o, --non-unique              grubun aynı GID yi kullanmasına izin ver\n"
+#~ "  -p, --password PAROLA         yani parola için şifreli olarak PAROLA "
+#~ "kullan\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Usage: useradd [options] LOGIN\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~| "                                home directory\n"
+#~| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~| "account\n"
+#~| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~| "  -D, --defaults                print or save modified default useradd\n"
+#~| "                                configuration\n"
+#~| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -g, --gid GROUP               force use GROUP for the new user "
+#~| "account\n"
+#~| "  -G, --groups GROUPS           list of supplementary groups for the "
+#~| "new\n"
+#~| "                                user account\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~| "  -l,                           do not add the user to the lastlog and\n"
+#~| "                                faillog databases\n"
+#~| "  -m, --create-home             create home directory for the new user\n"
+#~| "                                account\n"
+#~| "  -N, --no-user-group           do not create a group with the same name "
+#~| "as\n"
+#~| "                                the user\n"
+#~| "  -o, --non-unique              allow create user with duplicate\n"
+#~| "                                (non-unique) UID\n"
+#~| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~| "                                account\n"
+#~| "  -r, --system                  create a system account\n"
+#~| "  -s, --shell SHELL             the login shell for the new user "
+#~| "account\n"
+#~| "  -u, --uid UID                 force use the UID for the new user "
+#~| "account\n"
+#~| "  -U, --user-group              create a group with the same name as the "
+#~| "user\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Kullanım: useradd [seçenekler] KULLANICI\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ "  -b, --base-dir EV_DİZİNİ(BASE_DIR)\n"
+#~ "                                yeni kullanıcı hesabının ev dizini için\n"
+#~ "                                ana dizin\n"
+#~ "  -c, --comment YORUM(COMMENT)\n"
+#~ "                                yeni kullanıcı için GECOS alanını "
+#~ "ayarlar\n"
+#~ "  -d, --home-dir EV_DİZİNİ(HOME_DIR)\n"
+#~ "                                yeni kullanıcı hesabı için ev dizini\n"
+#~ "  -D, --defaults                değiştirilmiş öntanımlı "
+#~ "useradd                                 yapılandırmasını görüntüle veya "
+#~ "kaydet\n"
+#~ "  -e, --expiredate TARIH  hesap süresi dolumunu TARIH olarak\n"
+#~ "                                ayarla\n"
+#~ "  -f, --inactive PASIF          şifre süresi dolduktan sonra şifreyi\n"
+#~ "                                PASIF olarak ayarla\n"
+#~ "  -g, --gid GRUP                yeni kullanıcı hesabı için GRUP "
+#~ "kullanımını\n"
+#~ "                                zorla\n"
+#~ "  -G, --groups GRUPLAR          yeni kullanıcı hesabı için\n"
+#~ "                                ilave grubları listesi\n"
+#~ "  -h, --help                    bu yardım dosyasını göster ve çık\n"
+#~ "  -k, --skel TEMEL_DİZİN        farklı bir temel dizin belirtir\n"
+#~ "  -K, --key ANAHTAR=DEĞER       /etc/login.defs dosyasındaki öntanımlı\n"
+#~ "                                değerlerin üzerine yazar\n"
+#~ "  -l,                           kullanıcıyı lastlog ve faillog "
+#~ "veritabanlarına\n"
+#~ "                                ekleme\n"
+#~ "  -m, --create-home             yeni kullanıcı hesabı için ev dizini "
+#~ "yarat\n"
+#~ "  -N, --non-user-group          kullanıcı adıyla aynı isimde bir grup "
+#~ "yaratma\n"
+#~ "  -o, --non-unique              aynı UID ile kullanıcı yaratılmasına izin "
+#~ "ver\n"
+#~ "  -p, --password PAROLA         yeni kullanıcı hesabı için şifrelenmiş "
+#~ "parola\n"
+#~ "  -r, --system                  bir sistem hesabı yarat\n"
+#~ "  -s, --shell KABUK             yeni kullanıcı hesabı için oturum açma "
+#~ "kabuğu\n"
+#~ "  -u, --uid UID                 yeni kullanıcı hesabı için UID "
+#~ "kullanımını\n"
+#~ "                                zorla\n"
+#~ "  -U, --user-group              kullanıcı ile aynı isimde bir grup yarat\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/uk.po
===================================================================
--- upstream/trunk/po/uk.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/uk.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2007-11-26 22:52+0100\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen at univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -116,6 +116,10 @@
 msgstr[2] "%d помилок з часу останнього входу. Останній вхід: %s з %s.\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s: не можу отримати унікальний UID\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: не можу отримати унікальний GID\n"
 
@@ -619,59 +623,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Використання: expiry {-f|-c}\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Використання: faillog [опції]\n"
-"\n"
-"Опції:\n"
-"  -a, --all             показати помилки входу для всіх користувачів\n"
-"  -h, --help            показати цю допомогу та вийти\n"
-"  -l, --lock-time СЕК   після помилки входу блокувати рахунок на СЕК\n"
-"                        секунд\n"
-" -m, --maximum МАКС     встановити максимальну кількість помилок входу до\n"
-"                        МАКС\n"
-"  -r, --reset           перезавантажити лічільник помилок входу\n"
-"  -t, --time ДНІВ       показати помилки входу новіші за ДНІВ\n"
-"  -u, --user ЛОГІН      показати помилки входу або вести лічільники помилок\n"
-"                        та ліміти (якщо використовується з -r, -m або -l\n"
-"                        опціями) лише для користувача з логіном ЛОГІН\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -784,35 +761,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Не є tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "Використання: %s [вхідні_данні]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Використання: groupadd [параметри] ГРУПА\n"
-"\n"
-"Параметри:\n"
-"  -f, --force               примусити не повертати помилку якщо вказана\n"
-"                            група вже існує\n"
-"  -g, --gid GID             використати GID для нової групи\n"
-"  -h, --help                показати це довідкове повідомлення та вийти\n"
-"  -K, --key КЛЮЧ=ЗНАЧЕННЯ   змінити значення за замовченням\n"
-"                            з /etc/login.defs\n"
-"  -o, --non-unique          дозволити створювати групи з GID що "
-"повторюються\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -896,29 +877,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Використання: groupmod [параметри] ГРУПА\n"
-"\n"
-"Параметри:\n"
-"  -g, --gid GID                 встановити GID для групи\n"
-"  -h, --help                    показати це довідкове повідомлення та вийти\n"
-"  -n, --new-name НОВА_ГРУПА     використовувати назву НОВА_ГРУПА для ГРУПИ\n"
-"  -o, --non-unique              дозволити створювати групи з GID що "
-"повторюються\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "невірна назва групи \"%s\"\n"
@@ -1428,6 +1401,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Використання: %s [-q] [-r] [-s] [пароль [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: -s та -r несумісні\n"
+
 msgid "invalid password file entry"
 msgstr "невірний запис у файлі паролів"
 
@@ -1630,77 +1608,87 @@
 msgstr "%s: вказано забагато груп (макс %d).\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "Використання: %s [вхідні_данні]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Використання: useradd [параметри] ЛОГІН\n"
-"\n"
-"Параметри:\n"
-"  -b, --base-dir БАЗОВА_ТЕКА    базова тека для домашніх тек нових\n"
-"                                користувацьких облікових записів\n"
-"  -c, --comment КОМЕНТАР        встановити поле GECOS для нового запису\n"
-"                                користувача\n"
-"  -d, --home-dir ДОМ_ТЕКА       домашня тека для нового запису користувача\n"
-"  -D, --defaults                друкувати або зберегти змінені налаштування\n"
-"                                useradd\n"
-"  -e, --expiredate ДАТА_ПРОСТР  встановити дату прострочення запису\n"
-"  -f, --inactive НЕАКТИВНИЙ     зробити пароль неактивним після "
-"прострочення\n"
-"  -g, --gid ГРУПА               використовувати ГРУПУ для нового запису\n"
-"                                користувача\n"
-"  -G, --groups ГРУПИ            список додаткових груп для нового запису\n"
-"                                користувача\n"
-"  -h, --help                    показати це довідкове повідомлення і вийти\n"
-"  -k, --skel ТЕКА_КІСТЯКА       вказати альтернативну теку для кістяка\n"
-"  -K, --key КЛЮЧ=ЗНАЧЕННЯ       переписати значення з /etc/login.defs\n"
-"  -m, --create-home             створити домашню теку для запису нового\n"
-"                                користувача\n"
-"  -o, --non-unique              дозволювати створювати користувачів з UID "
-"що\n"
-"                                повторюються\n"
-"  -p, --password ПАРОЛЬ         використовувати зашифрований пароль для\n"
-"                                нового запису користувача\n"
-"  -s, --shell ОБОЛОНКА          вхідна оболонка для нового запису\n"
-"                                користувача\n"
-"  -u, --uid UID                 використовувати UID для нового запису\n"
-"                                користувача\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2050,6 +2038,197 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: не можу відновити %s: %s (ваші зміни у %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Використання: faillog [опції]\n"
+#~ "\n"
+#~ "Опції:\n"
+#~ "  -a, --all             показати помилки входу для всіх користувачів\n"
+#~ "  -h, --help            показати цю допомогу та вийти\n"
+#~ "  -l, --lock-time СЕК   після помилки входу блокувати рахунок на СЕК\n"
+#~ "                        секунд\n"
+#~ " -m, --maximum МАКС     встановити максимальну кількість помилок входу "
+#~ "до\n"
+#~ "                        МАКС\n"
+#~ "  -r, --reset           перезавантажити лічільник помилок входу\n"
+#~ "  -t, --time ДНІВ       показати помилки входу новіші за ДНІВ\n"
+#~ "  -u, --user ЛОГІН      показати помилки входу або вести лічільники "
+#~ "помилок\n"
+#~ "                        та ліміти (якщо використовується з -r, -m або -l\n"
+#~ "                        опціями) лише для користувача з логіном ЛОГІН\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Використання: groupadd [параметри] ГРУПА\n"
+#~ "\n"
+#~ "Параметри:\n"
+#~ "  -f, --force               примусити не повертати помилку якщо вказана\n"
+#~ "                            група вже існує\n"
+#~ "  -g, --gid GID             використати GID для нової групи\n"
+#~ "  -h, --help                показати це довідкове повідомлення та вийти\n"
+#~ "  -K, --key КЛЮЧ=ЗНАЧЕННЯ   змінити значення за замовченням\n"
+#~ "                            з /etc/login.defs\n"
+#~ "  -o, --non-unique          дозволити створювати групи з GID що "
+#~ "повторюються\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Використання: groupmod [параметри] ГРУПА\n"
+#~ "\n"
+#~ "Параметри:\n"
+#~ "  -g, --gid GID                 встановити GID для групи\n"
+#~ "  -h, --help                    показати це довідкове повідомлення та "
+#~ "вийти\n"
+#~ "  -n, --new-name НОВА_ГРУПА     використовувати назву НОВА_ГРУПА для "
+#~ "ГРУПИ\n"
+#~ "  -o, --non-unique              дозволити створювати групи з GID що "
+#~ "повторюються\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Використання: useradd [параметри] ЛОГІН\n"
+#~ "\n"
+#~ "Параметри:\n"
+#~ "  -b, --base-dir БАЗОВА_ТЕКА    базова тека для домашніх тек нових\n"
+#~ "                                користувацьких облікових записів\n"
+#~ "  -c, --comment КОМЕНТАР        встановити поле GECOS для нового запису\n"
+#~ "                                користувача\n"
+#~ "  -d, --home-dir ДОМ_ТЕКА       домашня тека для нового запису "
+#~ "користувача\n"
+#~ "  -D, --defaults                друкувати або зберегти змінені "
+#~ "налаштування\n"
+#~ "                                useradd\n"
+#~ "  -e, --expiredate ДАТА_ПРОСТР  встановити дату прострочення запису\n"
+#~ "  -f, --inactive НЕАКТИВНИЙ     зробити пароль неактивним після "
+#~ "прострочення\n"
+#~ "  -g, --gid ГРУПА               використовувати ГРУПУ для нового запису\n"
+#~ "                                користувача\n"
+#~ "  -G, --groups ГРУПИ            список додаткових груп для нового запису\n"
+#~ "                                користувача\n"
+#~ "  -h, --help                    показати це довідкове повідомлення і "
+#~ "вийти\n"
+#~ "  -k, --skel ТЕКА_КІСТЯКА       вказати альтернативну теку для кістяка\n"
+#~ "  -K, --key КЛЮЧ=ЗНАЧЕННЯ       переписати значення з /etc/login.defs\n"
+#~ "  -m, --create-home             створити домашню теку для запису нового\n"
+#~ "                                користувача\n"
+#~ "  -o, --non-unique              дозволювати створювати користувачів з UID "
+#~ "що\n"
+#~ "                                повторюються\n"
+#~ "  -p, --password ПАРОЛЬ         використовувати зашифрований пароль для\n"
+#~ "                                нового запису користувача\n"
+#~ "  -s, --shell ОБОЛОНКА          вхідна оболонка для нового запису\n"
+#~ "                                користувача\n"
+#~ "  -u, --uid UID                 використовувати UID для нового запису\n"
+#~ "                                користувача\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "Пароль прострочений."
 

Modified: upstream/trunk/po/vi.po
===================================================================
--- upstream/trunk/po/vi.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/vi.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2008-03-30 19:53+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -112,6 +112,11 @@
 "Lần gần nhất là %s vào %s.\n"
 
 #, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "Không thể lấy UID duy nhất (không còn có UID sẵn sàng lại)\n"
+
+#, fuzzy, c-format
 #| msgid "Can't get unique GID (no more available GIDs)\n"
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "Không thể lấy GID duy nhất (không còn có GID sẵn sàng lại)\n"
@@ -628,63 +633,32 @@
 "Sử dụng: expiry {-f|-c}\n"
 "[expiry: mãn hạn]\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: faillog [options]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -a, --all                     display faillog records for all users\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#| "seconds\n"
-#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-#| "  -r, --reset                   reset the counters of login failures\n"
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
-#| "  -u, --user LOGIN              display faillog record or maintains "
-#| "failure\n"
-#| "                                counters and limits (if used with -r, -m "
-#| "or -l\n"
-#| "                                options) only for user with LOGIN\n"
-#| "\n"
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"Sử dụng: faillog [tùy_chọn...]\n"
-"\n"
-"[faillog: bản ghi việc bị lỗi]\n"
-"\n"
-"Tùy chọn:\n"
-"  -a, --all             hiển thị các mục ghi faillog cho _mọi_ người dùng\n"
-"  -h, --help            hiển thị _trợ giúp_ này rồi thoát\n"
-"  -l, --lock-time SỐ    sau việc đăng nhập bị lỗi\n"
-"                        thì khoá tài khoản tại số giây này (_thời gian "
-"khoá_)\n"
-"  -m, --maximum SỐ      lập số việc đăng nhập bị lỗi _tối đa_ thành số này\n"
-"  -r, --reset           _lập lại_ số đếm việc đăng nhập bị lỗi\n"
-"  -t, --time SỐ         hiển thị các mục ghi faillog mới hơn số ngày này\n"
-"                        (_thời gian_)\n"
-"  -u, --user ĐĂNG_NHẬP   hiển thị mục ghi faillog\n"
-"                        hoặc bảo quản số đếm việc bị lỗi và sự hạn chế\n"
-"                        (nếu dùng với tùy chọn -r, -m hay -l) chỉ cho người\n"
-"                        dùng này\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -800,35 +774,48 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: không phải là TTY\n"
 
+#, c-format
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"Sử dụng: groupadd [tùy_chọn] NHÓM\n"
-"\n"
-"Tùy chọn:\n"
-"  -f, --force                  ép buộc thoát với trạng thái thành công\n"
-"\t\t\t\t\tnếu nhóm đã ghi rõ đã có  -g, --gid GID                 dùng GID "
-"này cho nhóm mới\n"
-"  -h, --help                    hiển thị trạng thái này rồi thoát\n"
-"  -K, --key KHOÁ=GIÁ_TRỊ          ghi đè lên các giá trị mặc định\n"
-"\t\t\t\t\t\t\tcủa « /etc/login.defs »\n"
-"  -o, --non-unique        cho phép tạo nhóm có GID trùng (không duy nhất)\n"
-"  -p, --password MẬT_KHẨU       dùng mật khẩu đã mã hoá cho nhóm mới\n"
-"  -r, --system                  tạo một tài khoản hệ thống\n"
-"\n"
+"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -918,31 +905,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"Sử dụng: groupmod [tùy_chọn...] NHÓM\n"
-"\n"
-"[groupmod: sửa đổi nhóm]\n"
-"\n"
-"Tùy chọn:\n"
-"  -g, --gid GID                 ép buộc NHÓM dùng GID mới\n"
-"  -h, --help                    hiển thị trợ giúp này rồi thoát\n"
-"  -n, --new-name TÊN       ép buộc NHÓM dùng TÊN nhóm mới\n"
-"  -o, --non-unique              cho phép NHÓM dùng GID trùng\n"
-"                                (_không phải duy nhất_)\n"
-" -p, --password MẬT_KHẨU       mật khẩu mới cũng được má hoá\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: invalid group name `%s'\n"
 msgid "%s: invalid group name '%s'\n"
@@ -1479,6 +1456,11 @@
 "[passwd: mật khẩu\n"
 "shadow: bóng]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s: hai tùy chọn « -s » và « -r » không tương thích với nhau\n"
+
 msgid "invalid password file entry"
 msgstr "Mục nhập tập tin mật khẩu không hợp lệ"
 
@@ -1683,120 +1665,117 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: ghi rõ quá nhiều nhóm (tối đa %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: useradd [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
-#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-#| "                                home directory\n"
-#| "  -c, --comment COMMENT         set the GECOS field for the new user "
-#| "account\n"
-#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-#| "  -D, --defaults                print or save modified default useradd\n"
-#| "                                configuration\n"
-#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
-#| "EXPIRE_DATE\n"
-#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
-#| "                                to INACTIVE\n"
-#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
-#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
-#| "                                user account\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-#| "  -l,                           do not add the user to the lastlog and\n"
-#| "                                faillog databases\n"
-#| "  -m, --create-home             create home directory for the new user\n"
-#| "                                account\n"
-#| "  -N, --no-user-group           do not create a group with the same name "
-#| "as\n"
-#| "                                the user\n"
-#| "  -o, --non-unique              allow create user with duplicate\n"
-#| "                                (non-unique) UID\n"
-#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
-#| "                                account\n"
-#| "  -r, --system                  create a system account\n"
-#| "  -s, --shell SHELL             the login shell for the new user account\n"
-#| "  -u, --uid UID                 force use the UID for the new user "
-#| "account\n"
-#| "  -U, --user-group              create a group with the same name as the "
-#| "user\n"
-#| "\n"
+#, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+
+#, fuzzy
+#| msgid ""
+#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+#| "                                crypt algorithms\n"
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"Sử dụng: useradd [tùy_chon] ĐĂNG_NHẬP\n"
-"\n"
-"[useradd: thêm người dùng]\n"
-"\n"
-"Tùy chọn:\n"
-"  -b, --base-dir THƯ_MỤC    _thư mục cơ bản_ cho thư mục chính\n"
-"                            của tài khoản người dùng mới\n"
-"  -c, --comment CHUỖI       lập trường GECOS cho tài khoản người dùng mới\n"
-"                            (_chú thích_)\n"
-"  -d, --home-dir THƯ_MỤC    _thư mục chính_ cho tài khoản người dùng mới\n"
-"  -D, --defaults            hiển thị hoặc lưu cấu hình useradd _mặc định_\n"
-"                            đã sửa đổi\n"
-"  -e, --expiredate NGÀY     lập ngày hết hạn dùng tài khoản\n"
-"  -f, --inactive CHUỖI      lập mật khẩu mới _không hoạt động_ thành chuỗi "
-"này\n"
-"  -g, --gid NHÓM            buộc gán nhóm này cho tài khoản người dùng mới\n"
-"                            (_mã nhóm_)\n"
-"  -G, --groups NHÓM         danh sách _các nhóm_ phụ cho tài khoản người\n"
-"                            dùng mới\n"
-"  -h, --help                hiển thị _trợ giúp_ này rồi thoát\n"
-"  -k, --skel THƯ_MỤC        ghi rõ thư mục « skel » thay thế\n"
-"  -K, --key KHÓA=GIÁ_TRỊ    đè các mặc định của « /etc/login.defs » (_khóa_)\n"
-"  -m, --create-home     _tạo thư mục chính_ cho tài khoản người dùng mới\n"
-"  -N, --no-user-group   đừng tạo một nhóm có cùng một tên với người dùng\n"
-"  -o, --non-unique          cho phép tạo người dùng có UID trùng\n"
-"\t\t\t\t\t(_không duy nhất_)\n"
-"  -p, --password MẬT_KHẨU   sử dụng _mật khẩu_ đã mã hoá\n"
-"                            cho tài khoản người dùng mới\n"
-"  -r, --system                  tạo một tài khoản hệ thống\n"
-"  -s, --shell TRÌNH_BAO         _trình bao_ đăng nhập cho tài khoản người "
-"dùng mới\n"
-"  -u, --uid UID             buộc sử dụng UID này cho tài khoản người dùng "
-"mới\n"
-" -U, --user-group              tạo một nhóm có cùng một tên với người dùng\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -2190,7 +2169,251 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: không thể phục hồi %s: %s (các thay đổi của bạn nằm trong %s)\n"
 
+#, fuzzy
+#~| msgid ""
+#~| "Usage: faillog [options]\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -a, --all                     display faillog records for all users\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#~| "seconds\n"
+#~| "  -m, --maximum MAX             set maximum failed login counters to "
+#~| "MAX\n"
+#~| "  -r, --reset                   reset the counters of login failures\n"
+#~| "  -t, --time DAYS               display faillog records more recent than "
+#~| "DAYS\n"
+#~| "  -u, --user LOGIN              display faillog record or maintains "
+#~| "failure\n"
+#~| "                                counters and limits (if used with -r, -m "
+#~| "or -l\n"
+#~| "                                options) only for user with LOGIN\n"
+#~| "\n"
 #~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Sử dụng: faillog [tùy_chọn...]\n"
+#~ "\n"
+#~ "[faillog: bản ghi việc bị lỗi]\n"
+#~ "\n"
+#~ "Tùy chọn:\n"
+#~ "  -a, --all             hiển thị các mục ghi faillog cho _mọi_ người "
+#~ "dùng\n"
+#~ "  -h, --help            hiển thị _trợ giúp_ này rồi thoát\n"
+#~ "  -l, --lock-time SỐ    sau việc đăng nhập bị lỗi\n"
+#~ "                        thì khoá tài khoản tại số giây này (_thời gian "
+#~ "khoá_)\n"
+#~ "  -m, --maximum SỐ      lập số việc đăng nhập bị lỗi _tối đa_ thành số "
+#~ "này\n"
+#~ "  -r, --reset           _lập lại_ số đếm việc đăng nhập bị lỗi\n"
+#~ "  -t, --time SỐ         hiển thị các mục ghi faillog mới hơn số ngày này\n"
+#~ "                        (_thời gian_)\n"
+#~ "  -u, --user ĐĂNG_NHẬP   hiển thị mục ghi faillog\n"
+#~ "                        hoặc bảo quản số đếm việc bị lỗi và sự hạn chế\n"
+#~ "                        (nếu dùng với tùy chọn -r, -m hay -l) chỉ cho "
+#~ "người\n"
+#~ "                        dùng này\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Sử dụng: groupadd [tùy_chọn] NHÓM\n"
+#~ "\n"
+#~ "Tùy chọn:\n"
+#~ "  -f, --force                  ép buộc thoát với trạng thái thành công\n"
+#~ "\t\t\t\t\tnếu nhóm đã ghi rõ đã có  -g, --gid GID                 dùng "
+#~ "GID này cho nhóm mới\n"
+#~ "  -h, --help                    hiển thị trạng thái này rồi thoát\n"
+#~ "  -K, --key KHOÁ=GIÁ_TRỊ          ghi đè lên các giá trị mặc định\n"
+#~ "\t\t\t\t\t\t\tcủa « /etc/login.defs »\n"
+#~ "  -o, --non-unique        cho phép tạo nhóm có GID trùng (không duy "
+#~ "nhất)\n"
+#~ "  -p, --password MẬT_KHẨU       dùng mật khẩu đã mã hoá cho nhóm mới\n"
+#~ "  -r, --system                  tạo một tài khoản hệ thống\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Sử dụng: groupmod [tùy_chọn...] NHÓM\n"
+#~ "\n"
+#~ "[groupmod: sửa đổi nhóm]\n"
+#~ "\n"
+#~ "Tùy chọn:\n"
+#~ "  -g, --gid GID                 ép buộc NHÓM dùng GID mới\n"
+#~ "  -h, --help                    hiển thị trợ giúp này rồi thoát\n"
+#~ "  -n, --new-name TÊN       ép buộc NHÓM dùng TÊN nhóm mới\n"
+#~ "  -o, --non-unique              cho phép NHÓM dùng GID trùng\n"
+#~ "                                (_không phải duy nhất_)\n"
+#~ " -p, --password MẬT_KHẨU       mật khẩu mới cũng được má hoá\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Usage: useradd [options] LOGIN\n"
+#~| "\n"
+#~| "Options:\n"
+#~| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~| "                                home directory\n"
+#~| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~| "account\n"
+#~| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~| "  -D, --defaults                print or save modified default useradd\n"
+#~| "                                configuration\n"
+#~| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~| "EXPIRE_DATE\n"
+#~| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~| "                                to INACTIVE\n"
+#~| "  -g, --gid GROUP               force use GROUP for the new user "
+#~| "account\n"
+#~| "  -G, --groups GROUPS           list of supplementary groups for the "
+#~| "new\n"
+#~| "                                user account\n"
+#~| "  -h, --help                    display this help message and exit\n"
+#~| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~| "  -l,                           do not add the user to the lastlog and\n"
+#~| "                                faillog databases\n"
+#~| "  -m, --create-home             create home directory for the new user\n"
+#~| "                                account\n"
+#~| "  -N, --no-user-group           do not create a group with the same name "
+#~| "as\n"
+#~| "                                the user\n"
+#~| "  -o, --non-unique              allow create user with duplicate\n"
+#~| "                                (non-unique) UID\n"
+#~| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~| "                                account\n"
+#~| "  -r, --system                  create a system account\n"
+#~| "  -s, --shell SHELL             the login shell for the new user "
+#~| "account\n"
+#~| "  -u, --uid UID                 force use the UID for the new user "
+#~| "account\n"
+#~| "  -U, --user-group              create a group with the same name as the "
+#~| "user\n"
+#~| "\n"
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Sử dụng: useradd [tùy_chon] ĐĂNG_NHẬP\n"
+#~ "\n"
+#~ "[useradd: thêm người dùng]\n"
+#~ "\n"
+#~ "Tùy chọn:\n"
+#~ "  -b, --base-dir THƯ_MỤC    _thư mục cơ bản_ cho thư mục chính\n"
+#~ "                            của tài khoản người dùng mới\n"
+#~ "  -c, --comment CHUỖI       lập trường GECOS cho tài khoản người dùng "
+#~ "mới\n"
+#~ "                            (_chú thích_)\n"
+#~ "  -d, --home-dir THƯ_MỤC    _thư mục chính_ cho tài khoản người dùng mới\n"
+#~ "  -D, --defaults            hiển thị hoặc lưu cấu hình useradd _mặc "
+#~ "định_\n"
+#~ "                            đã sửa đổi\n"
+#~ "  -e, --expiredate NGÀY     lập ngày hết hạn dùng tài khoản\n"
+#~ "  -f, --inactive CHUỖI      lập mật khẩu mới _không hoạt động_ thành "
+#~ "chuỗi này\n"
+#~ "  -g, --gid NHÓM            buộc gán nhóm này cho tài khoản người dùng "
+#~ "mới\n"
+#~ "                            (_mã nhóm_)\n"
+#~ "  -G, --groups NHÓM         danh sách _các nhóm_ phụ cho tài khoản người\n"
+#~ "                            dùng mới\n"
+#~ "  -h, --help                hiển thị _trợ giúp_ này rồi thoát\n"
+#~ "  -k, --skel THƯ_MỤC        ghi rõ thư mục « skel » thay thế\n"
+#~ "  -K, --key KHÓA=GIÁ_TRỊ    đè các mặc định của « /etc/login.defs "
+#~ "» (_khóa_)\n"
+#~ "  -m, --create-home     _tạo thư mục chính_ cho tài khoản người dùng mới\n"
+#~ "  -N, --no-user-group   đừng tạo một nhóm có cùng một tên với người dùng\n"
+#~ "  -o, --non-unique          cho phép tạo người dùng có UID trùng\n"
+#~ "\t\t\t\t\t(_không duy nhất_)\n"
+#~ "  -p, --password MẬT_KHẨU   sử dụng _mật khẩu_ đã mã hoá\n"
+#~ "                            cho tài khoản người dùng mới\n"
+#~ "  -r, --system                  tạo một tài khoản hệ thống\n"
+#~ "  -s, --shell TRÌNH_BAO         _trình bao_ đăng nhập cho tài khoản người "
+#~ "dùng mới\n"
+#~ "  -u, --uid UID             buộc sử dụng UID này cho tài khoản người dùng "
+#~ "mới\n"
+#~ " -U, --user-group              tạo một nhóm có cùng một tên với người "
+#~ "dùng\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "Usage: %s [options] [input]\n"
 #~ "\n"
 #~ "  -c, --crypt-method            the crypt method (one of %s)\n"

Modified: upstream/trunk/po/zh_CN.po
===================================================================
--- upstream/trunk/po/zh_CN.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/zh_CN.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2007-07-01 06:36-0500\n"
 "Last-Translator: Ming Hua <minghua at ubuntu.com>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb at lists.debian.org>\n"
@@ -111,6 +111,10 @@
 "最后一次是 %s 在 %s 上。\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s:无法获取独有的 UID\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s:无法获取独有的 GID\n"
 
@@ -585,39 +589,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "用法:expiry {-f|-c}\n"
 
-#, fuzzy
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"用法:faillog [选项]\n"
-"\n"
-"选项:\n"
-"  -a, --all\t\t\t显示所有用户的登录失败记录\n"
-"  -h, --help\t\t\t显示本帮助信息并退出\n"
-"  -l, --lock-time 秒数\t\t在登录失败后锁定帐户“秒数”秒\n"
-"  -m, --maximum 最大值\t\t将最大登录失败次数设为“最大值”\n"
-"  -r, --reset\t\t\t将登录失败计数器归零\n"
-"  -t, --time 天数\t\t显示最近“天数”天以来的登录失败记录\n"
-"  -u, --user 登录\t\t仅显示用户“登录”的登录失败记录,或设置用户“登\n"
-"\t\t\t\t录”的登录失败计数器及限制(如果和 -r、-m 或 -l 选\n"
-"\t\t\t\t项合用)\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -730,32 +727,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s:不是 tty\n"
 
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "用法:%s [输入]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
-"用法:groupadd [选项] 组\n"
-"\n"
-"选项:\n"
-"  -f, --force\t\t如果指组已经存在,则强制以正常状态退出\n"
-"  -g, --gid GID\t\t新组使用 GID\n"
-"  -h, --help\t\t\t显示此帮助信息并退出\n"
-"  -K, --key KEY=VALUE\t\t覆盖 /etc/login.defs 默认值\n"
-"  -o, --non-unique\t\t允许使用重复的(非唯一的) GID 创建组\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -840,29 +844,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, fuzzy
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"用法:groupadd [选项] 组\n"
-"\n"
-"选项:\n"
-"  -f, --force\t\t如果指组已经存在,则强制以正常状态退出\n"
-"  -g, --gid GID\t\t新组使用 GID\n"
-"  -h, --help\t\t\t显示此帮助信息并退出\n"
-"  -K, --key KEY=VALUE\t\t覆盖 /etc/login.defs 默认值\n"
-"  -o, --non-unique\t\t允许使用重复的(非唯一的) GID 创建组\n"
-"\n"
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "无效的组名“%s”\n"
@@ -1340,6 +1336,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "用法:%s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s:-s 和 -r 是互不兼容的\n"
+
 msgid "invalid password file entry"
 msgstr "无效的密码文件项"
 
@@ -1542,65 +1543,87 @@
 msgstr "%s:指定了过多组(最多 %d)。\n"
 
 #, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "用法:%s [输入]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
-"用法:useradd [选项] 用户名\n"
-"\n"
-"Options:\n"
-"  -b, --base-dir BASE_DIR\t新用户帐号家目录的主目录(base directory)\n"
-"  -c, --comment 注释\t\t为新用户帐号设置“注释”栏\n"
-"  -d, --home-dir HOME_DIR\t新用户帐号的家目录\n"
-"  -D, --defaults\t\t打印或保存修改过的 useradd 默认设置\n"
-"  -e, --expiredate EXPIRE_DATE\t设定帐户过期的日期为 EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\t过期 INACTIVE 天数后,设定密码为失效状态\n"
-"  -g, --gid GROUP\t\t强制将新用户帐号的组设置为 GROUP\n"
-"  -G, --groups GROUPS\t\t新用户帐号的补充组列表\n"
-"  -h, --help\t\t\t显示此帮助信息并退出\n"
-"  -k, --skel SKEL_DIR\t\t指定另一替代的 skel 目录\n"
-"  -K, --key KEY=VALUE\t\t覆盖 /etc/login.defs 默认值\n"
-"  -m, --create-home\t\t为新用户帐号创建家目录\n"
-"  -o, --non-unique\t\t允许以重复的(非唯一的) UID 创建用户\n"
-"  -p, --password PASSWORD\t为新用户帐号设定加密过的密码 (PASSWORD)\n"
-"  -s, --shell SHELL\t\t新用户帐号的登录 shell\n"
-"  -u, --uid UID\t\t\t强制将新用户帐号的 id 设为 UID\n"
-"\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
@@ -1927,6 +1950,154 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s:无法恢复 %s:%s (您的修改在 %s 中)\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "用法:faillog [选项]\n"
+#~ "\n"
+#~ "选项:\n"
+#~ "  -a, --all\t\t\t显示所有用户的登录失败记录\n"
+#~ "  -h, --help\t\t\t显示本帮助信息并退出\n"
+#~ "  -l, --lock-time 秒数\t\t在登录失败后锁定帐户“秒数”秒\n"
+#~ "  -m, --maximum 最大值\t\t将最大登录失败次数设为“最大值”\n"
+#~ "  -r, --reset\t\t\t将登录失败计数器归零\n"
+#~ "  -t, --time 天数\t\t显示最近“天数”天以来的登录失败记录\n"
+#~ "  -u, --user 登录\t\t仅显示用户“登录”的登录失败记录,或设置用户“登\n"
+#~ "\t\t\t\t录”的登录失败计数器及限制(如果和 -r、-m 或 -l 选\n"
+#~ "\t\t\t\t项合用)\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupadd [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -f, --force                   force exit with success status if the\n"
+#~ "                                specified group already exists\n"
+#~ "  -g, --gid GID                 use GID for the new group\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -o, --non-unique              allow create group with duplicate\n"
+#~ "                                (non-unique) GID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new group\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "\n"
+#~ msgstr ""
+#~ "用法:groupadd [选项] 组\n"
+#~ "\n"
+#~ "选项:\n"
+#~ "  -f, --force\t\t如果指组已经存在,则强制以正常状态退出\n"
+#~ "  -g, --gid GID\t\t新组使用 GID\n"
+#~ "  -h, --help\t\t\t显示此帮助信息并退出\n"
+#~ "  -K, --key KEY=VALUE\t\t覆盖 /etc/login.defs 默认值\n"
+#~ "  -o, --non-unique\t\t允许使用重复的(非唯一的) GID 创建组\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: groupmod [options] GROUP\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -g, --gid GID                 force use new GID by GROUP\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+#~ "  -o, --non-unique              allow using duplicate (non-unique) GID by "
+#~ "GROUP\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new "
+#~ "password\n"
+#~ "\n"
+#~ msgstr ""
+#~ "用法:groupadd [选项] 组\n"
+#~ "\n"
+#~ "选项:\n"
+#~ "  -f, --force\t\t如果指组已经存在,则强制以正常状态退出\n"
+#~ "  -g, --gid GID\t\t新组使用 GID\n"
+#~ "  -h, --help\t\t\t显示此帮助信息并退出\n"
+#~ "  -K, --key KEY=VALUE\t\t覆盖 /etc/login.defs 默认值\n"
+#~ "  -o, --non-unique\t\t允许使用重复的(非唯一的) GID 创建组\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: useradd [options] LOGIN\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#~ "                                home directory\n"
+#~ "  -c, --comment COMMENT         set the GECOS field for the new user "
+#~ "account\n"
+#~ "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#~ "  -D, --defaults                print or save modified default useradd\n"
+#~ "                                configuration\n"
+#~ "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#~ "EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#~ "                                to INACTIVE\n"
+#~ "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#~ "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#~ "                                user account\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#~ "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#~ "  -l, --no-log-init             do not add the user to the lastlog and\n"
+#~ "                                faillog databases\n"
+#~ "  -m, --create-home             create home directory for the new user\n"
+#~ "                                account\n"
+#~ "  -M, --no-create-home          do not create user's home directory\n"
+#~ "                                (overrides /etc/login.defs)\n"
+#~ "  -N, --no-user-group           do not create a group with the same name "
+#~ "as\n"
+#~ "                                the user\n"
+#~ "  -o, --non-unique              allow create user with duplicate\n"
+#~ "                                (non-unique) UID\n"
+#~ "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#~ "                                account\n"
+#~ "  -r, --system                  create a system account\n"
+#~ "  -s, --shell SHELL             the login shell for the new user account\n"
+#~ "  -u, --uid UID                 force use the UID for the new user "
+#~ "account\n"
+#~ "  -U, --user-group              create a group with the same name as the "
+#~ "user\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "用法:useradd [选项] 用户名\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -b, --base-dir BASE_DIR\t新用户帐号家目录的主目录(base directory)\n"
+#~ "  -c, --comment 注释\t\t为新用户帐号设置“注释”栏\n"
+#~ "  -d, --home-dir HOME_DIR\t新用户帐号的家目录\n"
+#~ "  -D, --defaults\t\t打印或保存修改过的 useradd 默认设置\n"
+#~ "  -e, --expiredate EXPIRE_DATE\t设定帐户过期的日期为 EXPIRE_DATE\n"
+#~ "  -f, --inactive INACTIVE\t过期 INACTIVE 天数后,设定密码为失效状态\n"
+#~ "  -g, --gid GROUP\t\t强制将新用户帐号的组设置为 GROUP\n"
+#~ "  -G, --groups GROUPS\t\t新用户帐号的补充组列表\n"
+#~ "  -h, --help\t\t\t显示此帮助信息并退出\n"
+#~ "  -k, --skel SKEL_DIR\t\t指定另一替代的 skel 目录\n"
+#~ "  -K, --key KEY=VALUE\t\t覆盖 /etc/login.defs 默认值\n"
+#~ "  -m, --create-home\t\t为新用户帐号创建家目录\n"
+#~ "  -o, --non-unique\t\t允许以重复的(非唯一的) UID 创建用户\n"
+#~ "  -p, --password PASSWORD\t为新用户帐号设定加密过的密码 (PASSWORD)\n"
+#~ "  -s, --shell SHELL\t\t新用户帐号的登录 shell\n"
+#~ "  -u, --uid UID\t\t\t强制将新用户帐号的 id 设为 UID\n"
+#~ "\n"
+
 #~ msgid "Password set to expire."
 #~ msgstr "已设定密码过期时间。"
 

Modified: upstream/trunk/po/zh_TW.po
===================================================================
--- upstream/trunk/po/zh_TW.po	2009-07-23 21:02:03 UTC (rev 3041)
+++ upstream/trunk/po/zh_TW.po	2009-07-24 01:13:21 UTC (rev 3042)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.9\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2009-05-22 13:14+0200\n"
+"POT-Creation-Date: 2009-07-24 03:02+0200\n"
 "PO-Revision-Date: 2005-06-02 22:20+0800\n"
 "Last-Translator: Asho Yeh <asho at debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -113,6 +113,10 @@
 "最後一次是 %s 在 %s 上。\n"
 
 #, fuzzy, c-format
+msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+msgstr "%s:無法獲取獨有的 gid\n"
+
+#, fuzzy, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s:無法獲取獨有的 gid\n"
 
@@ -578,38 +582,32 @@
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "用法:expiry {-f|-c}\n"
 
-#, fuzzy
+msgid "  -a, --all                     display faillog records for all users\n"
+msgstr ""
+
 msgid ""
-"Usage: faillog [options]\n"
-"\n"
-"Options:\n"
-"  -a, --all                     display faillog records for all users\n"
-"  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock account to SEC "
+"  -l, --lock-time SEC           after failed login lock account for SEC "
 "seconds\n"
+msgstr ""
+
+msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
-"  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid "  -r, --reset                   reset the counters of login failures\n"
+msgstr ""
+
+msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
-"  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -"
-"l\n"
-"                                options) only for user with LOGIN\n"
-"\n"
 msgstr ""
-"用法:faillog [選項]\n"
-"\n"
-"選項:\n"
-"  -a, --all\t\t\t顯示所有的使用者的失敗記錄\n"
-"  -h, --help\t\t\t顯示這份說明文字然後結束\n"
-"  -l, --lock-time SEC\t\t在登入失敗後,關閉帳號 SEC 秒\n"
-"  -m, --maximum MAX\t\t設定最多能登入失敗 MAX 次\n"
-"  -r, --reset\t\t\t重新設定登入失敗計數\n"
-"  -t, --time DAYS\t\t顯示最近 DAYS 內的失敗記錄。\n"
-"  -u, --user LOGIN\t\t根據指定的 LOGIN 顯示其失敗記錄及目前的失敗計數\n"
-"\t\t\t\t及限制(當和 -r、-m 或 -l 選項搭配使用時)\n"
-"\n"
 
+msgid ""
+"  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m,\n"
+"                                or -l) only for the specified LOGIN(s)\n"
+msgstr ""
+
 #, c-format
 msgid "faillog: Failed to get the entry for UID %lu\n"
 msgstr ""
@@ -722,22 +720,39 @@
 msgid "%s: Not a tty\n"
 msgstr "%s:不是 tty\n"
 
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
-"Usage: groupadd [options] GROUP\n"
+"Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force                   force exit with success status if the\n"
-"                                specified group already exists\n"
-"  -g, --gid GID                 use GID for the new group\n"
-"  -h, --help                    display this help message and exit\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
-"  -o, --non-unique              allow create group with duplicate\n"
+msgstr "用法:%s [輸入]\n"
+
+msgid ""
+"  -f, --force                   exit successfully if the group already "
+"exists,\n"
+"                                and cancel -g if the GID is already used\n"
+msgstr ""
+
+msgid "  -g, --gid GID                 use GID for the new group\n"
+msgstr ""
+
+msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
-"  -p, --password PASSWORD       use encrypted password for the new group\n"
-"  -r, --system                  create a system account\n"
-"\n"
 msgstr ""
 
+msgid ""
+"  -p, --password PASSWORD       use this encrypted password for the new "
+"group\n"
+msgstr ""
+
+msgid "  -r, --system                  create a system account\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "%s: %s is not a valid group name\n"
 msgid "%s: '%s' is not a valid group name\n"
@@ -819,19 +834,21 @@
 msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
+msgid "  -g, --gid GID                 change the group ID to GID\n"
+msgstr ""
+
+msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
+msgstr ""
+
 msgid ""
-"Usage: groupmod [options] GROUP\n"
-"\n"
-"Options:\n"
-"  -g, --gid GID                 force use new GID by GROUP\n"
-"  -h, --help                    display this help message and exit\n"
-"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by "
-"GROUP\n"
-"  -p, --password PASSWORD       use encrypted password for the new password\n"
-"\n"
+"  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
 
+msgid ""
+"  -p, --password PASSWORD       change the password to this (encrypted)\n"
+"                                PASSWORD\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: invalid group name '%s'\n"
 msgstr "無效的群組名“%s”\n"
@@ -1301,6 +1318,11 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "用法:%s [-q] [-r] [-s] [passwd [shadow]]\n"
 
+#, fuzzy, c-format
+#| msgid "%s: -s and -r are incompatibile\n"
+msgid "%s: -s and -r are incompatible\n"
+msgstr "%s:-s 和 -r 是互不相容的\n"
+
 msgid "invalid password file entry"
 msgstr "無效的密碼檔案項目"
 
@@ -1491,45 +1513,87 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s:指定了過多群組(最多 %d)。\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
-"                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user "
+msgstr "用法:%s [輸入]\n"
+
+msgid ""
+"  -b, --base-dir BASE_DIR       base directory for the home directory of "
+"the\n"
+"                                new account\n"
+msgstr ""
+
+msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
+msgstr ""
+
+msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
+msgstr ""
+
+msgid ""
+"  -D, --defaults                print or change default useradd "
+"configuration\n"
+msgstr ""
+
+msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
+msgstr ""
+
+msgid ""
+"  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
-"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
-"  -D, --defaults                print or save modified default useradd\n"
-"                                configuration\n"
-"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE       set password inactive after expiration\n"
-"                                to INACTIVE\n"
-"  -g, --gid GROUP               force use GROUP for the new user account\n"
-"  -G, --groups GROUPS           list of supplementary groups for the new\n"
-"                                user account\n"
-"  -h, --help                    display this help message and exit\n"
-"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
-"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+msgstr ""
+
+msgid ""
+"  -g, --gid GROUP               name or ID of the primary group of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -G, --groups GROUPS           list of supplementary groups of the new\n"
+"                                account\n"
+msgstr ""
+
+msgid ""
+"  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
+msgstr ""
+
+msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
-"  -m, --create-home             create home directory for the new user\n"
-"                                account\n"
-"  -M, --no-create-home          do not create user's home directory\n"
-"                                (overrides /etc/login.defs)\n"
+msgstr ""
+
+msgid "  -m, --create-home             create the user's home directory\n"
+msgstr ""
+
+msgid ""
+"  -M, --no-create-home          do not create the user's home directory\n"
+msgstr ""
+
+msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
-"  -o, --non-unique              allow create user with duplicate\n"
+msgstr ""
+
+msgid ""
+"  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
-"  -p, --password PASSWORD       use encrypted password for the new user\n"
-"                                account\n"
-"  -r, --system                  create a system account\n"
-"  -s, --shell SHELL             the login shell for the new user account\n"
-"  -u, --uid UID                 force use the UID for the new user account\n"
+msgstr ""
+
+msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
+msgstr ""
+
+msgid "  -s, --shell SHELL             login shell of the new account\n"
+msgstr ""
+
+msgid "  -u, --uid UID                 user ID of the new account\n"
+msgstr ""
+
+msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-"%s\n"
 msgstr ""
 
 msgid ""
@@ -1821,6 +1885,39 @@
 msgstr "%s:無法復原 %s:%s (您的修改在 %s 中)\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "Usage: faillog [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -a, --all                     display faillog records for all users\n"
+#~ "  -h, --help                    display this help message and exit\n"
+#~ "  -l, --lock-time SEC           after failed login lock account to SEC "
+#~ "seconds\n"
+#~ "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#~ "  -r, --reset                   reset the counters of login failures\n"
+#~ "  -t, --time DAYS               display faillog records more recent than "
+#~ "DAYS\n"
+#~ "  -u, --user LOGIN              display faillog record or maintains "
+#~ "failure\n"
+#~ "                                counters and limits (if used with -r, -m "
+#~ "or -l\n"
+#~ "                                options) only for user with LOGIN\n"
+#~ "\n"
+#~ msgstr ""
+#~ "用法:faillog [選項]\n"
+#~ "\n"
+#~ "選項:\n"
+#~ "  -a, --all\t\t\t顯示所有的使用者的失敗記錄\n"
+#~ "  -h, --help\t\t\t顯示這份說明文字然後結束\n"
+#~ "  -l, --lock-time SEC\t\t在登入失敗後,關閉帳號 SEC 秒\n"
+#~ "  -m, --maximum MAX\t\t設定最多能登入失敗 MAX 次\n"
+#~ "  -r, --reset\t\t\t重新設定登入失敗計數\n"
+#~ "  -t, --time DAYS\t\t顯示最近 DAYS 內的失敗記錄。\n"
+#~ "  -u, --user LOGIN\t\t根據指定的 LOGIN 顯示其失敗記錄及目前的失敗計數\n"
+#~ "\t\t\t\t及限制(當和 -r、-m 或 -l 選項搭配使用時)\n"
+#~ "\n"
+
+#, fuzzy
 #~ msgid "Password set to expire."
 #~ msgstr "您的密碼已過期。"
 




More information about the Pkg-shadow-commits mailing list